summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:09:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:09:08 +0200
commit00fc38c96fc56af2d9ab3445b23c9fbb03c127ab (patch)
tree5e539979ee9dda446e5b1a78bc92875c2fe6fb8d /doc
parentaef0aba9cd00fb225d2803210586b86a13547ce0 (diff)
parent053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8 (diff)
downloadrsyslog-00fc38c96fc56af2d9ab3445b23c9fbb03c127ab.tar.gz
rsyslog-00fc38c96fc56af2d9ab3445b23c9fbb03c127ab.tar.xz
rsyslog-00fc38c96fc56af2d9ab3445b23c9fbb03c127ab.zip
Merge branch 'v4-devel' into v5-devel
Diffstat (limited to 'doc')
-rw-r--r--doc/imptcp.html6
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/imptcp.html b/doc/imptcp.html
index 913563a5..d4228185 100644
--- a/doc/imptcp.html
+++ b/doc/imptcp.html
@@ -7,7 +7,7 @@
<h1>Plain TCP Syslog Input Module</h1>
<p><b>Module Name:&nbsp;&nbsp;&nbsp; imptcp</b></p>
-<p><b>Available since: </b>4.7.3+, 5.5.8+?
+<p><b>Available since: </b>4.7.3+, 5.5.8+
<p><b>Author: </b>Rainer Gerhards
&lt;rgerhards@adiscon.com&gt;</p>
<p><b>Description</b>:</p>
@@ -24,7 +24,6 @@ specifying $InputPTCPServerRun multiple times.
their name instead of just TCP. Note that only a subset of the parameters are supported.
<ul>
<li>$InputPTCPServerAddtlFrameDelimiter &lt;Delimiter&gt;<br>
-<b>CURRENTLY DISABLED</b><br>
This directive permits to specify an additional frame delimiter for plain tcp syslog.
The industry-standard specifies using the LF character as frame delimiter. Some vendors,
notable Juniper in their NetScreen products, use an invalid frame delimiter, in Juniper's
@@ -45,10 +44,7 @@ That would require much more code changes, which I was unable to do so far. Full
can be found at the <a href="http://www.rsyslog.com/Article321.phtml">Cisco tcp syslog anomaly</a>
page.
<li>$InputPTCPServerNotifyOnConnectionClose [on/<b>off</b>]<br>
-<b>CURRENTLY DISABLED</b><br>
instructs imptcp 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 imptcp, otherwise it may have no effect.</li>
<li>$InputPTCPServerRun &lt;port&gt;<br>
Starts a TCP server on selected port</li>
<li>$InputPTCPServerInputName &lt;name&gt;<br>