diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-28 16:23:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-28 16:23:18 +0100 |
| commit | c0f92325c634fd3d0482f5d8bdc6650ab725cce1 (patch) | |
| tree | 87073391e08087a17d2088b14523cdb63e57b524 /doc/manual.html | |
| parent | bf088c5c2ed06db1c765a96df3762a00ae44db9c (diff) | |
| parent | 74a71e798efd58e20cc150b04de2613bf518eed4 (diff) | |
| download | rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.tar.gz rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.tar.xz rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.zip | |
Merge branch 'master' into master-tcpsrv-mt
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/manual.html b/doc/manual.html index 49a4300b..e82d4cba 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ 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> -<p><b>This documentation is for version 6.1.2 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 6.1.5 (devel branch) of rsyslog.</b> 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 @@ -41,7 +41,6 @@ if you do not read the doc, but doing so will definitely improve your experience <li><a href="rsyslog_conf.html">configuration file syntax (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 commented <a href="sample.conf.html">sample rsyslog.conf</a> </li> <li><a href="bugs.html">rsyslog bug list</a></li> <li><a href="messageparser.html">understanding rsyslog message parsers</a></li> <li><a href="generic_design.html">backgrounder on generic syslog application design</a></li> |