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/v3compatibility.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/v3compatibility.html')
| -rw-r--r-- | doc/v3compatibility.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html index f4eef3a1..51619947 100644 --- a/doc/v3compatibility.html +++ b/doc/v3compatibility.html @@ -32,11 +32,11 @@ are available by which modules.</p> <p>It is suggested that input modules be loaded in the top part of the config file. Here is an example, also highlighting the most important modules:</p> -<p><b>$ModLoad immark # provides --MARK-- +<p><b>$ModLoad immark # provides --MARK-- message capability<br> -$ModLoad imudp # provides UDP syslog reception<br> -$ModLoad imtcp # provides TCP syslog reception<br> -</b><b>$ModLoad imgssapi # provides GSSAPI syslog +$ModLoad imudp # provides UDP syslog reception<br> +$ModLoad imtcp # provides TCP syslog reception<br> +</b><b>$ModLoad imgssapi # provides GSSAPI syslog reception<br> </b><b>$ModLoad imuxsock # provides support for local system logging (e.g. @@ -94,7 +94,7 @@ set the local address the server should listen to via <b>$UDPServerAddress <ip></b> config directive.</p> <p>The following example configures an UDP syslog server at the local address 192.0.2.1 on port 514:</p> -<p><b>$ModLoad imudp.so<br> +<p><b>$ModLoad imudp<br> $UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun directive!<br> $UDPServerRun 514</b></p> @@ -102,7 +102,7 @@ $UDPServerRun 514</b></p> This is the default if no directive is specified.</p> <p>Please note that now multiple listeners are supported. For example, you can do the following:</p> -<p><b>$ModLoad imudp.so<br> +<p><b>$ModLoad imudp<br> $UDPSeverAddress 192.0.2.1 # this MUST be before the $UDPServerRun directive!<br> $UDPServerRun 514<br> @@ -122,7 +122,7 @@ the "Run" directive, e.g. "<i>$UDPServerRun syslog</i>".</p> <h2>klogd</h2> <p>klogd has (finally) been replaced by a loadable input module. To enable klogd functionality, do</p> -<p><b>$ModLoad imklog.so</b></p> +<p><b>$ModLoad imklog</b></p> <p>Note that this can not be handled by the compatibility layer, as klogd was a separate binary.A limited set of klogd command line settings is now supported |