diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:05:51 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-11-18 12:05:51 +0100 |
commit | 599133164d93afb0dab792dadb8f5d6bc3d68a3f (patch) | |
tree | 9a8f791fa21386d3620fb8297e14e1c5eb231a62 /doc/manual.html | |
parent | a5417f16044d7d56dbceeea09e25ba3e8c47cc01 (diff) | |
parent | 49dcad849e93551d90cd6298a576b67c4ad0c7ef (diff) | |
download | rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.gz rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.xz rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/property_replacer.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 1d09d460..e208755d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -35,7 +35,8 @@ the links below for the</b><br></p><ul> <li><a href="rsyslog_conf.html">configuration file syntax (rsyslog.conf)</a></li> <li><a href="/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="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 |