summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-12-04 17:43:16 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-12-04 17:43:16 +0100
commit94cab477f5f308e3e8f24a58c381c1c92377c697 (patch)
tree07b627ab7ee52e405870bce9262e82efdde99aab /doc
parenta453c7d858779736621c336bc1973bbaf6d6d87a (diff)
parentafdccceefa30306cf720a27efd5a29bcc5a916c9 (diff)
downloadrsyslog-94cab477f5f308e3e8f24a58c381c1c92377c697.tar.gz
rsyslog-94cab477f5f308e3e8f24a58c381c1c92377c697.tar.xz
rsyslog-94cab477f5f308e3e8f24a58c381c1c92377c697.zip
Merge branch 'v3-stable' into betav3.21.9
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imudp/imudp.c
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 5de125e3..c36faebd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the
novice user. And as we know what enterprise users really need, there is
also <a href="professional_support.html">professional
rsyslog support</a> available directly from the source!</p>
-<p><b>This documentation is for version 3.21.8 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.21.9 (beta 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