X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=57f769f23a177b66a87be63d8623ee807a2ba276;hp=f376f725c9afbbdfa58158f318357f83fea32d34;hb=e45fc5e738b0b7700e8b4f3c4b25c58a49b44b27;hpb=cf8bd44339b00330fdbc91041d6731ba8aba9fec;ds=sidebyside

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index f376f725c..57f769f23 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -488,7 +488,7 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>KeepAliveTime=</varname></term>
+                                <term><varname>KeepAliveTimeSec=</varname></term>
                                 <listitem><para>Takes time (in seconds) as argument . The connection needs to remain
                                 idle before TCP starts sending keepalive probes. This controls the TCP_KEEPIDLE
                                 socket option (see
@@ -500,7 +500,7 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>KeepAliveInterval=</varname></term>
+                                <term><varname>KeepAliveIntervalSec=</varname></term>
                                 <listitem><para>Takes time (in seconds) as argument between individual keepalive probes,
                                 if the socket option SO_KEEPALIVE has  been set on this socket seconds as argument.
                                 This controls the TCP_KEEPINTVL socket option (see
@@ -513,7 +513,7 @@
 
                         <varlistentry>
                                 <term><varname>KeepAliveProbes=</varname></term>
-                                <listitem><para>Takes interger as argument. It's the number of unacknowledged probes to
+                                <listitem><para>Takes integer as argument. It's the number of unacknowledged probes to
                                 send before considering the connection dead and notifying the application layer.
                                 This controls the TCP_KEEPCNT socket option (see
                                 <citerefentry><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@@ -546,7 +546,7 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>DeferAccept=</varname></term>
+                                <term><varname>DeferAcceptSec=</varname></term>
 
                                 <listitem><para>Takes time (in
                                 seconds) as argument. If set, the
@@ -676,14 +676,29 @@
                         </varlistentry>
 
                         <varlistentry>
-                          <term><varname>SELinuxLabelViaNet=</varname></term>
-                          <listitem><para>Takes a boolean
-                          value. Controls whether systemd attempts to figure out
-                          SELinux label used for instantiated service from
-                          information handed by peer over the
-                          network. Configuration option has effect only
-                          on sockets with <literal>Accept=</literal>
-                          mode set to <literal>yes</literal>.</para></listitem>
+                          <term><varname>SELinuxContextFromNet=</varname></term>
+                                 <listitem><para>Takes a boolean
+                                 argument. When true, systemd will attempt
+                                 to figure out the SELinux label used
+                                 for the instantiated service from the
+                                 information handed by the peer over the
+                                 network. Note that only the security
+                                 level is used from the information
+                                 provided by the peer. Other parts of
+                                 the resulting SELinux context originate
+                                 from either the target binary that is
+                                 effectively triggered by socket unit
+                                 or from the value of the
+                                 <varname>SELinuxContext=</varname>
+                                 option. This configuration option only
+                                 affects sockets with
+                                 <varname>Accept=</varname> mode set to
+                                 <literal>true</literal>. Also note that
+                                 this option is useful only when
+                                 MLS/MCS SELinux policy is
+                                 deployed. Defaults to
+                                 <literal>false</literal>.
+                                 </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -831,7 +846,7 @@
                                 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>).
+                                (see <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
                                 </para></listitem>
                         </varlistentry>
 
@@ -900,7 +915,7 @@
                   <title>See Also</title>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,