diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-11 12:58:53 +0100 |
| commit | c9078c722003ac87e8b39363ed9b8b70d2812dd9 (patch) | |
| tree | 51b44e6eab1a7cb5f80547252468e3c351c8cb36 /doc/manual.html | |
| parent | 05bd696ebb7766f33b3ae176b841bcecb0bfedfc (diff) | |
| parent | 4cfbf894fd0caebaf65e1b7ffcb5725a530cf67d (diff) | |
| download | rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.gz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.tar.xz rsyslog-c9078c722003ac87e8b39363ed9b8b70d2812dd9.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 3e9d57a8..352d5257 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -34,7 +34,8 @@ the links below for the</b><br></p><ul> <li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li> <li><a href="rsyslog_conf.html">configuration file syntax (rsyslog.conf)</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="http://www.rsyslog.com/tool-regex">a regular expression checker/generator tool for rsyslog</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="rsyslog_packages.html"> rsyslog packages</a></li> <li><a href="generic_design.html">backgrounder on |