1 files changed, 7 insertions, 2 deletions
diff --git a/doc/manual.html b/doc/manual.html
index a5a26e75..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
@@ -32,13 +36,14 @@ between rsyslog and syslog-ng</a>.</p>
 and if you are upgrading from v3, read the
 <a href="v4compatibility.html">rsyslog v4 compatibility notes</a> and
 if you upgrade from v4, read the
-<a href="v5compatibility.html">rsyslog v5 compatibility notes</a>.
+<a href="v5compatibility.html">rsyslog v5 compatibility notes</a>. Ther currently is
+no compatibility mode document for v6, as none is required right now.
 <p>Rsyslog will work even
 if you do not read the doc, but doing so will definitely improve your experience.</p>
 <p><b>Follow the links below for the</b></p>
 <ul>
 <li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
-<li><a href="rsyslog_conf.html">configuration file syntax (rsyslog.conf)</a></li>
+<li><a href="rsyslog_conf.html">configuration file format (rsyslog.conf)</a></li>
 <li><a href="http://www.rsyslog.com/tool-regex">a regular expression checker/generator tool for rsyslog</a></li>
 <li> <a href="property_replacer.html">property replacer, an important core component</a></li>
 <li><a href="bugs.html">rsyslog bug list</a></li>