summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-28 17:48:45 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-28 17:48:45 +0200
commitcdbeb9d75a9a79c1f5941f748af540ab13425cf1 (patch)
tree66c3e07e4c62e0ffc8fba8402e196823e92467d1 /doc/manual.html
parente3a611ac6204e785d8f85ff54156dac5a722968f (diff)
parentcdd6328d1f2265f552e02502d75b6ed29846dd7b (diff)
downloadrsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.gz
rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.tar.bz2
rsyslog-cdbeb9d75a9a79c1f5941f748af540ab13425cf1.zip
Merge branch 'master' into master-newruleset
Conflicts: ChangeLog
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 4e786bd9..340219fa 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 7.1.5 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.1.6 (devel 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