summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-03 12:05:50 +0200
commit22328c72aef2df73741afefe0e8b53d3ad83f15d (patch)
tree4a0b311508ebb28a0dc72e12993f704c2709d46a /doc/manual.html
parentda933a7e105acf814d5e7955d39d29eab3a96613 (diff)
parent7c0ca7553738161c681c0d0600de99e9fabee81d (diff)
downloadrsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.xz
rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog runtime/datetime.c
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 6770ce7e..2af2e564 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.5.0 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.1.1 (devel branch) of rsyslog.</b>
Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current
version information and project status.
</p><p><b>If you like rsyslog, you might