diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 10:54:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 10:54:28 +0200 |
| commit | bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a (patch) | |
| tree | 7006b192e0e6f0559eca6b8227c5ac525d02da2f /doc | |
| parent | ca14951cd3caece93a0ad9d678c5dce8e26fd869 (diff) | |
| parent | b7c93404312849c35abe8a708fa2c0f2c4aabbbf (diff) | |
| download | rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.gz rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.tar.xz rsyslog-bc38a8cfb7ac8e4429cf934dc044fb8fdab4568a.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 894a7876..1719ef5e 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.17.1 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 3.17.2 (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 |