diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
| commit | 8fbefa688fc18dd1936158318ec92a108303d2e8 (patch) | |
| tree | 5090afbc864526b9d381b365dfc6365c0ffe408d /doc/manual.html | |
| parent | 44609ec259fdd321520111049ace194a0941a157 (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/manual.html b/doc/manual.html index 6dc025ef..3ae3754a 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,11 @@ 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> +<<<<<<< HEAD <p><b>This documentation is for version 6.1.10 (beta branch) of rsyslog.</b> +======= +<p><b>This documentation is for version 5.8.2 (v5-stable branch) of rsyslog.</b> +>>>>>>> 68a01594000b788e530ee8f716545dafccf85982 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 |