summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:55:31 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:55:31 +0200
commit9812a2af8c308c1b29bc0b5604593595a66dd25d (patch)
tree2b556403f1a495f695fa125d34c2c5819e13f2b6 /doc/manual.html
parent75d8becf10cf83c984590ce9ba666d86b382e7e6 (diff)
parent223c1e48610c27270fdb8532f5e4a920eb9874f3 (diff)
downloadrsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.gz
rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.xz
rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.zip
Merge branch 'v3-stable' into beta
Conflicts: runtime/net.c
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 75b521fd..4490f653 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -50,6 +50,7 @@ modules</a></li><li><a href="man_rsyslogd.html">rsyslogd man page</a>
<p><b>We have some in-depth papers on</b></p>
<ul>
<li><a href="install.html">installing rsyslog</a></li>
+<li><a href="build_from_repo.html">obtaining rsyslog from the source repository</a></li>
<li><a href="ipv6.html">rsyslog and IPv6</a> (which is fully supported)</li>
<li><a href="rsyslog_tls.html">native TLS encryption for syslog</a></li>
<li><a href="rsyslog_stunnel.html">ssl-encrypting syslog with stunnel</a></li>