diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 12:40:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 12:40:48 +0200 |
| commit | bad4228f846d18bd721266931efbbf0b21375a92 (patch) | |
| tree | 8d1a94582c8a16463f63bcb1f7be0c8db6174d07 /doc | |
| parent | 434e404a6c7181a2b7efa9840506e8963665bdd6 (diff) | |
| parent | 2493915cfedae899e66dbb3a2f139bf386fac5e1 (diff) | |
| download | rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.gz rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.xz rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.zip | |
Merge branch 'beta'
Conflicts:
plugins/imklog/linux.c
runtime/cfsysline.c
runtime/ctok.c
runtime/linkedlist.c
runtime/sysvar.c
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 |