summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-07-24 12:48:39 +0200
commitcf100be58c69e34f42b15c03b6104139d37eb47b (patch)
treec6ea5b5eb7e6b6080498ef03882aa54cda417c9b /doc
parent87311d12771fc94e2d324e73922bd5e0b07de64e (diff)
parent686270440c601d5a4e3eac246397f60248889f5f (diff)
downloadrsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.gz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.tar.xz
rsyslog-cf100be58c69e34f42b15c03b6104139d37eb47b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac
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 1bc8f1f7..12667161 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 6.3.11 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.12 (beta 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