summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-02 09:21:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-02 09:21:25 +0200
commitf771764fab64ff1a31d73fadd9934f4316bb099c (patch)
tree076ce25d384286684ed4c7ac6c4ccd07803612a1 /doc
parentd33a48656094bde5f190abb15588a6e5b930b6eb (diff)
parent724ba2b27f4a2c583b3e257e33a2f0b4b9649ef1 (diff)
downloadrsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.gz
rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.xz
rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.zip
Merge branch 'aaron' into v4-beta
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'doc')
-rw-r--r--doc/imtcp.html4
-rw-r--r--doc/manual.html2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/imtcp.html b/doc/imtcp.html
index 5217634e..0ccdecc7 100644
--- a/doc/imtcp.html
+++ b/doc/imtcp.html
@@ -41,6 +41,10 @@ very limited interest in fixing this issue. This directive <b>can not</b> fix th
That would require much more code changes, which I was unable to do so far. Full details
can be found at the <a href="http://www.rsyslog.com/Article321.phtml">Cisco tcp syslog anomaly</a>
page.
+<li>$InputTCPServerNotifyOnConnectionClose [on/<b>off</b>] (available since 4.5.5)<br>
+instructs imtcp to emit a message if the remote peer closes a connection.<br>
+<b>Important:</b> This directive is global to all listeners and must be given right
+after loading imtcp, otherwise it may have no effect.</li>
<li>$InputTCPServerRun &lt;port&gt;<br>
Starts a TCP server on selected port</li>
<li>$InputTCPMaxListeners &lt;number&gt;<br>
diff --git a/doc/manual.html b/doc/manual.html
index ed0048bb..2d4b4390 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 4.5.4 (v4-beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 4.5.5 (v4-beta branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might