summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:03:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-15 11:03:07 +0200
commitb7fec51ba7b1042313b51dc27102fa0a9cebafb5 (patch)
treeebe76258f2aecbe771ea8fe2dab633f8e7e278f9 /doc/manual.html
parentbcd2661167998b7a986f31e5f6f3b691ab0a662a (diff)
parentf4b26f77ab03a1bacf2c49a1982fabe2a58ccb9d (diff)
downloadrsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.gz
rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.tar.xz
rsyslog-b7fec51ba7b1042313b51dc27102fa0a9cebafb5.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog doc/manual.html
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 2e0c22ac..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>
@@ -20,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<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>