diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:02:55 +0200 |
| commit | 4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420 (patch) | |
| tree | 5fbce194ca939a2999ad944647dc67e5913b68ff /doc/manual.html | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| parent | a9933094b20d70da1641d80bb723e2570b937c36 (diff) | |
| download | rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.gz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.tar.xz rsyslog-4e6a10161ba592a9e72c7585fa4cfcb5d0f8d420.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/manual.html b/doc/manual.html index 3ae3754a..6dc025ef 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,11 +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> -<<<<<<< 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 |