X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=170d010f601625c04679276c6062f8c3a9a803b3;hb=9528592ff8d7ff361da430285deba8196e8984d5;hp=09a7311b85b84d6fc8896cc620c05f8aa38a80e9;hpb=5aded369782f28255bc6b494ca905d7acaea7a56;p=elogind.git

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 09a7311b8..170d010f6 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -487,6 +487,32 @@
                                 <option>false</option>.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>NoDelay=</varname></term>
+                                <listitem><para>Takes a boolean
+                                argument. TCP Nagle's algorithm works by combining a number of
+                                small outgoing messages, and sending them all at once.
+                                This controls the TCP_NODELAY socket option (see
+                                <citerefentry><refentrytitle>tcp</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                Defaults to
+                                <option>false</option>.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>FastOpen=</varname></term>
+                                <listitem><para>Takes a boolean
+                                argument. It works by using a TFO cookie (a TCP option) in the initial
+                                SYN packet to authenticate a previously connected client. If successful,
+                                it may start sending data to the client before the receipt of the final
+                                ACK packet of the three way handshake is received, skipping a round trip
+                                and lowering the latency in the start of transmission of data.
+                                This controls the TCP_FASTOPEN socket option (see
+                                the <ulink url="http://lwn.net/Articles/508865/">TCP
+                                Fast Open: expediting web services</ulink> for details.)
+                                Defaults to
+                                <option>false</option>.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>Priority=</varname></term>
                                 <listitem><para>Takes an integer
@@ -722,16 +748,18 @@
                                 finish. If a command does not exit
                                 within the configured time, the socket
                                 will be considered failed and be shut
-                                down again. All commands still running,
+                                down again. All commands still running
                                 will be terminated forcibly via
                                 <constant>SIGTERM</constant>, and after another delay of
                                 this time with <constant>SIGKILL</constant>. (See
                                 <option>KillMode=</option> in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.)
                                 Takes a unit-less value in seconds, or
                                 a time span value such as "5min
-                                20s". Pass 0 to disable the timeout
-                                logic. Defaults to <varname>TimeoutStartSec=</varname> from the
-                                manager configuration file.</para></listitem>
+                                20s". Pass <literal>0</literal> to disable the timeout
+                                logic. Defaults to <varname>DefaultTimeoutStartSec=</varname> from the
+                                manager configuration file
+                                (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>