X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=57f769f23a177b66a87be63d8623ee807a2ba276;hp=238029a2516dc651556cf7396815f5b9e9562109;hb=281a92f80c215d6e07526d33563adb6d37c531c6;hpb=3cd761e4df278cdef6fda9d7f50be512d3c1d7ae

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 238029a25..57f769f23 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -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>
@@ -675,6 +675,32 @@
                                 for details.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                          <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>
                                 <term><varname>PipeSize=</varname></term>
                                 <listitem><para>Takes a size in
@@ -820,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>
 
@@ -889,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>,