summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:07:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:07:59 +0200
commit61ba5ff5955742b68a24d7b135ad07c29b48fa2f (patch)
treeda96436375c623133fef91bb6cb9185e735bb8d4 /doc/manual.html
parent63d4de81ec485425231676d53813ff465249e800 (diff)
parentb7fec51ba7b1042313b51dc27102fa0a9cebafb5 (diff)
downloadrsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.gz
rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.xz
rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/ommail.html queue.c
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html18
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 9d4dbefd..9c906497 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>
+<html><head><title>rsyslog documentation</title></head>
<body>
<h1>RSyslog - Documentation</h1>
<p><b><a href="http://www.rsyslog.com/">Rsyslog</a>
@@ -17,10 +16,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>This documentation is for version 3.14.2 of rsyslog.</b>
+<p><b>This documentation is for version 3.15.1 (beta branch) 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
+</p><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
@@ -64,10 +63,9 @@ php-syslog-ng with rsyslog</a></li>
<li><a href="rsyslog_recording_pri.html">recording
the syslog priority (severity and facility) to the log file</a></li>
<li><a href="http://www.rsyslog.com/Article19.phtml">preserving
-syslog sender over NAT</a> (online only)</li>
+syslog sender over NAT</a> (online only)</li><li><a href="gssapi.html">an overview and howto of rsyslog gssapi support</a></li>
<li><a href="debug.html">debug support in rsyslog</a></li>
-<li><a href="dev_queue.html">the rsyslog message
-queue object</a></li>
+<li><a href="dev_queue.html">the rsyslog message queue object</a></li>
</ul>
<p>Our <a href="history.html">rsyslog history</a>
page is for you if you would like to learn a little more
@@ -99,5 +97,9 @@ mailing list</a>. If you are interested in the "backstage", you
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>
+interesting read (filter on syslog and rsyslog tags).
+If you would like to use rsyslog source code inside your open source project, you can do that without
+any restriction as long as your license is GPLv3 compatible. If your license is incompatible to GPLv3,
+you may even be still permitted to use rsyslog source code. However, then you need to look at the way
+<a href="licensing.html">rsyslog is licensed</a>.</p>
</body></html>