diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
| commit | ae7a01e137f14055f9472408d0cf3ebf9893afba (patch) | |
| tree | 37af475499d6dd82b986f34c4a53db2ecbd071bd /doc/Makefile.am | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| parent | 7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff) | |
| download | rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.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 22d368e0..d38d4d0b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -31,6 +31,7 @@ html_files = \ contributors.html \ dev_queue.html \ omsnmp.html \ + ommysql.html \ omlibdbi.html \ imfile.html \ imtcp.html \ @@ -96,7 +97,7 @@ html_files = \ licensing.html \ ommail.html \ omrelp.html \ - status.html \ + syslog_parsing.html \ troubleshoot.html \ src/classes.dia |