summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-09-07 15:38:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-09-07 15:38:57 +0200
commit11ee5cbdfb08ba3e42a853c08144fa24cd55d6da (patch)
treeeb981082bfe83c80b74149a1927ff0470b70db62 /doc/manual.html
parent76c9616612a23796349a42d9b236a1cb0b836133 (diff)
parent156d3f64e7ce50a570c1f8f95f51406c4853aad8 (diff)
downloadrsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.gz
rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.bz2
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/manual.html')
-rw-r--r--doc/manual.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 5a7ac444..27d7a24b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 4.6.8 (v4-stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.8.0 (v4-stable branch) of rsyslog.</b>
Visit the <i> <a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b> to obtain current
version information and project status.
</p><p><b>If you like rsyslog, you might