summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-09 18:10:56 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-09 18:10:56 +0200
commit38f875c582eacce25594daf0b41655f2ee677f24 (patch)
tree541f6c5cc84015ef42ecf97cd15d5803cffe2124 /doc
parent79e5decff290722f3e8de742f82ef6fe8bb63eb4 (diff)
parent0f3dbecb867bc8ed852389ae9642be5d0f3636aa (diff)
downloadrsyslog-38f875c582eacce25594daf0b41655f2ee677f24.tar.gz
rsyslog-38f875c582eacce25594daf0b41655f2ee677f24.tar.xz
rsyslog-38f875c582eacce25594daf0b41655f2ee677f24.zip
Merge branch 'beta'
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.html10
-rw-r--r--doc/v3compatibility.html4
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 135d2fa0..9d4dbefd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1,6 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><title>rsyslog documentation</title>
-
</head>
<body>
<h1>RSyslog - Documentation</h1>
@@ -18,9 +17,10 @@ relay chains while at the same time being very easy to setup for the
novice user. And as we know what enterprise users really need, there is
also <a href="professional_support.html">professional
rsyslog support</a> available directly from the source!</p>
-<p><b>Visit the <i> <a href="status.html">rsyslog
-status page</a></i></b> to obtain current
-version information and ports. <b>If you like rsyslog, you might
+<p><b>This documentation is for version 3.14.2 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><b>If you like rsyslog, you might
want to lend us a helping hand. </b>It doesn't require a lot of
time - even a single mouse click helps. Learn <a href="how2help.html">how to help the rsyslog project</a>.
Due to popular demand, there is now a <a href="rsyslog_ng_comparison.html">side-by-side comparison
@@ -100,4 +100,4 @@ may find
<a href="http://www.gerhards.net/rainer">Rainer</a>'s
<a href="http://rgerhards.blogspot.com/">blog</a> an
interesting read (filter on syslog and rsyslog tags).</p>
-</body></html> \ No newline at end of file
+</body></html>
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html
index c6e4fec2..f4eef3a1 100644
--- a/doc/v3compatibility.html
+++ b/doc/v3compatibility.html
@@ -3,7 +3,7 @@
<meta name="KEYWORDS" content="syslog, mysql, syslog to mysql, howto"></head>
<body>
-<h1>Compatibility Notes for rsyslog v4</h1>
+<h1>Compatibility Notes for rsyslog v3</h1>
<p><small><i>Written by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a>
(2008-03-28)</i></small></p>
<p>Rsyslog aims to be a drop-in replacement for sysklogd.
@@ -193,4 +193,4 @@ format with care. </p><h2>Queue Modes for the Main Message Queue</h2>
is available, but should not be used except for a very good reason
("Direct" disables queueing and will potentially lead to message loss
on the input side).</p>
-</body></html> \ No newline at end of file
+</body></html>