diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
| commit | 76684243dcf8e48db6dda99eff7ea2c3a9f26a91 (patch) | |
| tree | b886dac91e9f70647a882ea3cf8b850ea83fb5e1 /doc/manual.html | |
| parent | a924cfe6c2da54829f4729d6d56f8a1cc402475e (diff) | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| download | rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.gz rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.bz2 rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/manual.html b/doc/manual.html index bf7c0bcd..1131fb7a 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,15 @@ 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.3.1 (devel branch) of rsyslog.</b> +======= +<<<<<<< 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 +>>>>>>> 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a 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 |