X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=aeeb97fccdccaa0063aaa6445af8f315ef796943;hp=f65704d67b68be3dd6d269cbe649ec47d5e43108;hb=6e81b5b9dc10dd0b47102afe42457e4a314cb01f;hpb=811ba7a0e292eda0f2f470613cc28a97bda7ee66

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index f65704d67..aeeb97fcc 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -372,16 +372,21 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>DirectoryMode=</varname></term>
-                                <listitem><para>If listening on a file
-                                system socket or FIFO, the parent
-                                directories are automatically created
-                                if needed. This option specifies the
-                                file system access mode used when
-                                creating these directories. Takes an
-                                access mode in octal
-                                notation. Defaults to
-                                0755.</para></listitem>
+                                <term><varname>SocketUser=</varname></term>
+                                <term><varname>SocketGroup=</varname></term>
+
+                                <listitem><para>Takes a UNIX
+                                user/group name. When specified,
+                                all AF_UNIX sockets and FIFO nodes in
+                                the file system are owned by the
+                                specified user and group. If unset
+                                (the default), the nodes are owned by
+                                the root user/group (if run in system
+                                context) or the invoking user/group
+                                (if run in user context). If only a
+                                user is specified but no group, then
+                                the group is derived from the user's
+                                default group.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -395,6 +400,19 @@
                                 0666.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>DirectoryMode=</varname></term>
+                                <listitem><para>If listening on a file
+                                system socket or FIFO, the parent
+                                directories are automatically created
+                                if needed. This option specifies the
+                                file system access mode used when
+                                creating these directories. Takes an
+                                access mode in octal
+                                notation. Defaults to
+                                0755.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>Accept=</varname></term>
                                 <listitem><para>Takes a boolean
@@ -733,14 +751,14 @@
                         <varlistentry>
                                 <term><varname>RemoveOnStop=</varname></term>
                                 <listitem><para>Takes a boolean
-                                argument. If enabled any file nodes
+                                argument. If enabled, any file nodes
                                 created by this socket unit are
                                 removed when it is stopped. This
                                 applies to AF_UNIX sockets in the file
-                                system, POSIX message queues as well
-                                as FIFOs, as well as any symlinks to
+                                system, POSIX message queues, FIFOs,
+                                as well as any symlinks to
                                 them configured with
-                                <varname>Symlinks=</varname>. Normally
+                                <varname>Symlinks=</varname>. Normally,
                                 it should not be necessary to use this
                                 option, and is not recommended as
                                 services might continue to run after
@@ -757,7 +775,7 @@
                                 system paths. The specified paths will
                                 be created as symlinks to the AF_UNIX
                                 socket path or FIFO path of this
-                                socket unit.  If this setting is used
+                                socket unit.  If this setting is used,
                                 only one AF_UNIX socket in the file
                                 system or one FIFO may be configured
                                 for the socket unit. Use this option