diff options
author | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:47 +0100 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2008-03-29 12:14:47 +0100 |
commit | 9a7c5b2414911cfe8919b9f376cfc047259081b7 (patch) | |
tree | 11052b804d3eb489bab2c90c94c41fdd90732eda /doc | |
parent | 12e8c69354614a03f06a8617f25d145ab091f504 (diff) | |
download | rsyslog-9a7c5b2414911cfe8919b9f376cfc047259081b7.tar.gz |
Imported Upstream version 1.21.0upstream/1.21.0
Diffstat (limited to 'doc')
-rw-r--r-- | doc/features.html | 1 | ||||
-rw-r--r-- | doc/rsconf1_includeconfig.html | 3 | ||||
-rw-r--r-- | doc/status.html | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/features.html b/doc/features.html index e3685d1..2899cd7 100644 --- a/doc/features.html +++ b/doc/features.html @@ -46,6 +46,7 @@ is going on, you can also subscribe to the <a href="http://lists.adiscon.net/mai directories. Includes are specified in the main configuration file<li> supports multiple actions per selector/filter condition<li> MySQL and Postgres SQL functionality as a dynamically loadable plug-in<li> + support for GSS-API<li> modular design for outputs - easily extensible</ul> <p> </p> <h2>Upcoming Features</h2> diff --git a/doc/rsconf1_includeconfig.html b/doc/rsconf1_includeconfig.html index 155dcd4..cd8d8a5 100644 --- a/doc/rsconf1_includeconfig.html +++ b/doc/rsconf1_includeconfig.html @@ -32,6 +32,9 @@ with the /etc/rsyslog.conf file directly.</i></p> <p><code><b>$IncludeConfig /etc/some-included-file.conf</b></code></p> <p>Directories can also be included. To do so, the name must end on a slash:</p> <p><code><b>$IncludeConfig /etc/rsyslog.d/</b></code></p> +<p><code><b>And finally, only specific files matching a wildcard my be included +from a directory:</b></code></p> +<p><code><b>$IncludeConfig /etc/rsyslog.d/*.conf</b></code></p> <p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> diff --git a/doc/status.html b/doc/status.html index b401a1e..f56422e 100644 --- a/doc/status.html +++ b/doc/status.html @@ -4,11 +4,11 @@ </head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2007-12-07.</p> +<p>This page reflects the status as of 2007-12-19.</p> <h2>Current Releases</h2> -<p><b>development:</b> 1.20.0 - -<a href="http://www.rsyslog.com/Article145.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-65.phtml">download</a></p> +<p><b>development:</b> 1.21.0 - +<a href="http://www.rsyslog.com/Article149.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-67.phtml">download</a></p> <p><b>stable:</b> 1.0.5 - <a href="http://www.rsyslog.com/Article85.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-39.phtml">download</a></p> <p> (<a href="version_naming.html">How are versions named?</a>)</p> |