diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-25 13:51:46 +0200 |
commit | b829284f37add946ac810b125e3bededa1206c96 (patch) | |
tree | 823089ac6fcd92ef11957ac89d9ccfc998fd768a /doc/rsyslog_conf.html | |
parent | d45a286f2dee3c3d5aefef1ac16a02578c95f574 (diff) | |
parent | e39f202c75af187f96a1af07e60892a63e45cd3f (diff) | |
download | rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.gz rsyslog-b829284f37add946ac810b125e3bededa1206c96.tar.xz rsyslog-b829284f37add946ac810b125e3bededa1206c96.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/rsyslog_conf.html')
-rw-r--r-- | doc/rsyslog_conf.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index 3946a2d3..d78f616b 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -927,7 +927,7 @@ template name can follow the connect information. This is as follows:<br> <p><b>Important: to use the database functionality, the MySQL output module must be loaded in the config file</b> BEFORE the first database table action is used. This is done by placing the</p> -<p><code><b>$ModLoad MySQL</b></code></p> +<p><code><b>$ModLoad ommysql</b></code></p> <p>directive some place above the first use of the database write (we recommend doing at the the beginning of the config file).</p> <h3>Discard</h3> |