diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:16:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:16:57 +0100 |
| commit | 4df8bb4e6b6c8183c504fdb31d667717bf7584e5 (patch) | |
| tree | a707a3ea82a3bdefd91ecea44ed7e119b43d496f /doc/Makefile.am | |
| parent | dd19c937c1bfbe16063c9d633a79810944ac7eba (diff) | |
| parent | ae7a01e137f14055f9472408d0cf3ebf9893afba (diff) | |
| download | rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.gz rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.xz rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.zip | |
Merge branch 'beta'
Conflicts:
doc/omrelp.html
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index b58f813b..3015d6b5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -32,6 +32,7 @@ html_files = \ contributors.html \ dev_queue.html \ omsnmp.html \ + ommysql.html \ omlibdbi.html \ imfile.html \ imtcp.html \ @@ -97,7 +98,7 @@ html_files = \ licensing.html \ ommail.html \ omrelp.html \ - status.html \ + syslog_parsing.html \ troubleshoot.html \ rsyslog_conf_actions.html \ rsyslog_conf_examples.html \ |