diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-12 09:36:15 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-12 09:36:15 +0100 |
| commit | f3ff6a6cd661b911214c33b27b38401a88e1c990 (patch) | |
| tree | 804122a83b4543c3f22f1d390b0bec6dc62a182d /doc | |
| parent | 272f0a5b3d285a1ecff01d216254c95863b0d444 (diff) | |
| parent | d98ac49d24ca7c0d2766aadbbb962b25373df0b2 (diff) | |
| download | rsyslog-f3ff6a6cd661b911214c33b27b38401a88e1c990.tar.gz rsyslog-f3ff6a6cd661b911214c33b27b38401a88e1c990.tar.xz rsyslog-f3ff6a6cd661b911214c33b27b38401a88e1c990.zip | |
Merge branch 'beta'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/imfile.html | 4 | ||||
| -rw-r--r-- | doc/imgssapi.html | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/imfile.html b/doc/imfile.html index 60bbbeea..7961729b 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -15,7 +15,9 @@ text file is a file consisting of printable characters with lines being delimited by LF.</p> <p>The file is read line-by-line and any line read is passed to rsyslog's rule engine. The rule engine applies filter conditons and -selects which actions needs to be carried out.</p> +selects which actions needs to be carried out. Empty lines are <b>not</b> +processed, as they would result in empty syslog records. They are simply +ignored.</p> <p>As new lines are written they are taken from the file and processed. Please note that this happens based on a polling interval and not immediately. The file monitor support file rotation. To fully diff --git a/doc/imgssapi.html b/doc/imgssapi.html index ec183fe7..dd90fec7 100644 --- a/doc/imgssapi.html +++ b/doc/imgssapi.html @@ -38,7 +38,7 @@ Sets the maximum number of sessions supported</li> <p>This sets up a GSS server on port 1514 that also permits to receive plain tcp syslog messages (on the same port):<br> </p> -<textarea rows="15" cols="60">$ModLoad imtcp # needs to be done just once +<textarea rows="15" cols="60">$ModLoad imgssapi # needs to be done just once $InputGSSServerRun 1514 $InputGSSServerPermitPlainTCP on </textarea> @@ -47,8 +47,7 @@ $InputGSSServerPermitPlainTCP on <p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> project.<br> -Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer -Gerhards</a> and +Copyright © 2008-2011 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 3 or higher.</font></p> </body></html> |