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

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6e9051db7..a47a62dae 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -374,13 +374,13 @@
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><varname>StandardOutput=</varname></term>
+                                <term><varname>StandardError=</varname></term>
                                 <listitem><para>Controls where file
                                 descriptor 2 (STDERR) of the executed
                                 processes is connected to. The
                                 available options are identical to
                                 those of
-                                <varname>StandardError=</varname>,
+                                <varname>StandardOutput=</varname>,
                                 whith one exception: if set to
                                 <option>inherit</option> the file
                                 descriptor used for standard output is
@@ -468,7 +468,7 @@
                                 the default log level specified
                                 here. The interpretation of these
                                 prefixes may be disabled with
-                                <varname>SyslogNoPrefix=</varname>,
+                                <varname>SyslogLevelPrefix=</varname>,
                                 see below. For details see
                                 <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
 
@@ -477,9 +477,9 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>SyslogNoPrefix=</varname></term>
+                                <term><varname>SyslogLevelPrefix=</varname></term>
                                 <listitem><para>Takes a boolean
-                                argument. If false and
+                                argument. If true and
                                 <varname>StandardOutput=</varname> or
                                 <varname>StandardError=</varname> are
                                 set to <option>syslog</option> or
@@ -488,22 +488,28 @@
                                 are prefixed with a log level will be
                                 passed on to syslog with this log
                                 level set but the prefix removed. If
-                                set to true, the interpretation of
+                                set to false, the interpretation of
                                 these prefixes is disabled and the
                                 logged lines are passed on as-is. For
                                 details about this prefixing see
                                 <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
-                                Defaults to false.</para></listitem>
+                                Defaults to true.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>TimerSlackNS=</varname></term>
+                                <term><varname>TimerSlackNSec=</varname></term>
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for the executed
-                                processes The timer slack controls the accuracy
-                                of wake-ups triggered by timers. See
+                                processes The timer slack controls the
+                                accuracy of wake-ups triggered by
+                                timers. See
                                 <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                                for more information.</para></listitem>
+                                for more information. Note that in
+                                contrast to most other time span
+                                definitions this value is takes a
+                                nano-seconds integer and does not
+                                understand any other
+                                units.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -611,7 +617,7 @@
 
                                 <listitem><para>Controls the control
                                 groups the executed processes shall be
-                                made member of. Takes a
+                                made members of. Takes a
                                 space-seperated list of cgroup
                                 identifiers. A cgroup identifier has a
                                 format like
@@ -728,7 +734,7 @@
         <refsect1>
                   <title>See Also</title>
                   <para>
-                          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,