diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
| commit | fec2041e037426ac227ee619b59629e059099d05 (patch) | |
| tree | af59860c7b037b2ca0d7ce85a2384ab1b5ca3e04 /doc | |
| parent | 6511278082a7e1e9602385cd24cdb5e363cb702f (diff) | |
| parent | ef9722ec87c8a7ddb2d499c1e7863475d8790a94 (diff) | |
| download | rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.gz rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.xz rsyslog-fec2041e037426ac227ee619b59629e059099d05.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
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 a1657c05..9628d4c1 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 4.2.0 (v4-stable) of rsyslog.</b> +<p><b>This documentation is for version 4.2.1 (v4-stable) 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 |