diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
| commit | 11ee5cbdfb08ba3e42a853c08144fa24cd55d6da (patch) | |
| tree | eb981082bfe83c80b74149a1927ff0470b70db62 /doc/Makefile.am | |
| parent | 76c9616612a23796349a42d9b236a1cb0b836133 (diff) | |
| parent | 156d3f64e7ce50a570c1f8f95f51406c4853aad8 (diff) | |
| download | rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.gz rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.xz rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.zip | |
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0
There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ca2ee71c..72954e9c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -37,8 +37,10 @@ html_files = \ omlibdbi.html \ imfile.html \ imtcp.html \ + imptcp.html \ imgssapi.html \ imrelp.html \ + imsolaris.html \ imuxsock.html \ imklog.html \ queues.html \ @@ -99,6 +101,7 @@ html_files = \ gssapi.html \ licensing.html \ ommail.html \ + omuxsock.html \ omrelp.html \ syslog_parsing.html \ troubleshoot.html \ |