X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.exec.xml;h=e9af4abd6d565797c3ebef271d91f9cf3d3b04f5;hb=e95c98378ac2d34df864de4a9b785fd17defb77b;hp=6d0113f5cceef5f8766ff17f3a9feee375df5119;hpb=67826132adfdf626413f08fb664debd4a7ec35b7;p=elogind.git

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6d0113f5c..e9af4abd6 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -572,15 +572,19 @@
                         <varlistentry>
                                 <term><varname>SyslogIdentifier=</varname></term>
                                 <listitem><para>Sets the process name
-                                to prefix log lines sent to syslog or
-                                the kernel log buffer with. If not set,
-                                defaults to the process name of the
-                                executed process. This option is only
-                                useful when
+                                to prefix log lines sent to the
+                                logging system or the kernel log
+                                buffer with. If not set, defaults to
+                                the process name of the executed
+                                process. This option is only useful
+                                when
                                 <varname>StandardOutput=</varname> or
                                 <varname>StandardError=</varname> are
-                                set to <option>syslog</option> or
-                                <option>kmsg</option>.</para></listitem>
+                                set to <option>syslog</option>,
+                                <option>journal</option> or
+                                <option>kmsg</option> (or to the same
+                                settings in combination with
+                                <option>+console</option>).</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>SyslogFacility=</varname></term>
@@ -776,20 +780,22 @@
                         <varlistentry>
                                 <term><varname>SecureBits=</varname></term>
                                 <listitem><para>Controls the secure
-                                bits set for the executed process. See
-                                <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-                                for details. Takes a list of strings:
+                                bits set for the executed process.
+                                Takes a space-separated combination of
+                                options from the following list:
                                 <option>keep-caps</option>,
                                 <option>keep-caps-locked</option>,
                                 <option>no-setuid-fixup</option>,
                                 <option>no-setuid-fixup-locked</option>,
-                                <option>noroot</option> and/or
+                                <option>noroot</option>, and
                                 <option>noroot-locked</option>. This
                                 option may appear more than once in
-                                which case the secure bits are
-                                ORed. If the empty string is assigned
-                                to this option, the bits are reset to
-                                0.</para></listitem>
+                                which case the secure bits are ORed.
+                                If the empty string is assigned to
+                                this option, the bits are reset to 0.
+                                See <citerefentry
+                                project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                                for details.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -806,7 +812,7 @@
                                 attached to the executed file. Due to
                                 that
                                 <varname>CapabilityBoundingSet=</varname>
-                                is probably the much more useful
+                                is probably a much more useful
                                 setting.</para></listitem>
                         </varlistentry>