diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:48:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-11 11:48:29 +0100 |
| commit | b941f68aaeec4bd458328e09121b623ac63f6dd6 (patch) | |
| tree | 3bd6490dbcb77ad72bdb186a02f3bf297607964a /doc | |
| parent | 819ac126e2cc85916bee32575c85b3c8d7317325 (diff) | |
| parent | 2d67035d1b851bdfb430e6980ca217c1807b3a9c (diff) | |
| download | rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.gz rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.tar.xz rsyslog-b941f68aaeec4bd458328e09121b623ac63f6dd6.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 2536290c..29813f5e 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -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> |