diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:47:58 +0200 |
| commit | 9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch) | |
| tree | 10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /doc/Makefile.am | |
| parent | 5416a94bbe9a24ad9236755a9e21944685fc231b (diff) | |
| parent | f7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff) | |
| download | rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip | |
Merge branch '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 f950f122..a447cddf 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -13,7 +13,6 @@ html_files = \ ipv6.html \ log_rotation_fix_size.html \ manual.html \ - man_rsyslogd.html \ modules.html \ property_replacer.html \ rsyslog_ng_comparison.html \ @@ -93,6 +92,8 @@ html_files = \ rsconf1_resetconfigvariables.html \ rsconf1_umask.html \ v3compatibility.html \ + v4compatibility.html \ + v5compatibility.html \ im3195.html \ netstream.html \ ns_gtls.html \ |