diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:17:14 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 11:17:14 +0200 |
commit | ff6f2b1cc0d0ce5b9e3fa4e28407be20d26f2004 (patch) | |
tree | b9346cc89d980becc74492eae60c480b42621c44 /doc/Makefile.am | |
parent | 095a20360ab547f37bf4fd8b099fdf0b03a5c86f (diff) | |
parent | a8b583669a74dc053b0073531d8d3076779416a6 (diff) | |
download | rsyslog-ff6f2b1cc0d0ce5b9e3fa4e28407be20d26f2004.tar.gz rsyslog-ff6f2b1cc0d0ce5b9e3fa4e28407be20d26f2004.tar.xz rsyslog-ff6f2b1cc0d0ce5b9e3fa4e28407be20d26f2004.zip |
Merge branch 'v4-beta' into v4-devel
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r-- | doc/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 62ec7500..3dfc8d3a 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 \ @@ -91,6 +90,7 @@ html_files = \ rsconf1_resetconfigvariables.html \ rsconf1_umask.html \ v3compatibility.html \ + v4compatibility.html \ im3195.html \ netstream.html \ ns_gtls.html \ |