build-sys: fix 'make fedora'

[elogind.git] / man / systemd.exec.xml

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 6e9051db7446184bc7cc03a9493992456b70883f..51dcdcd94708ca2cd2f0087c5957b77248cc714c 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -122,7 +122,7 @@
 
                                 <listitem><para>Sets the supplementary
                                 Unix groups the processes are executed
 
                                 <listitem><para>Sets the supplementary
                                 Unix groups the processes are executed

-                                as. This takes a space seperated list
+                                as. This takes a space separated list

                                 of group names or IDs. This option may
                                 be specified more than once in which
                                 case all listed groups are set as
                                 of group names or IDs. This option may
                                 be specified more than once in which
                                 case all listed groups are set as


@@ -146,13 +146,13 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

-                                <term><varname>OOMAdjust=</varname></term>
+                                <term><varname>OOMScoreAdjust=</varname></term>

 
                                 <listitem><para>Sets the adjustment
                                 level for the Out-Of-Memory killer for
                                 executed processes. Takes an integer
 
                                 <listitem><para>Sets the adjustment
                                 level for the Out-Of-Memory killer for
                                 executed processes. Takes an integer

-                                between -17 (to disable OOM killing
-                                for this process) and 15 (to make
+                                between -1000 (to disable OOM killing
+                                for this process) and 1000 (to make

                                 killing of this process under memory
                                 pressure very likely). See <ulink
                                 url="http://www.kernel.org/doc/Documentation/filesystems/proc.txt">proc.txt</ulink>
                                 killing of this process under memory
                                 pressure very likely). See <ulink
                                 url="http://www.kernel.org/doc/Documentation/filesystems/proc.txt">proc.txt</ulink>


@@ -234,7 +234,7 @@
 
                                 <listitem><para>Controls the CPU
                                 affinity of the executed
 
                                 <listitem><para>Controls the CPU
                                 affinity of the executed

-                                processes. Takes a space-seperated
+                                processes. Takes a space-separated

                                 list of CPU indexes. See
                                 <citerefentry><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                                 for details.</para></listitem>
                                 list of CPU indexes. See
                                 <citerefentry><refentrytitle>sched_setaffinity</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                                 for details.</para></listitem>


@@ -256,7 +256,7 @@
 
                                 <listitem><para>Sets environment
                                 variables for executed
 
                                 <listitem><para>Sets environment
                                 variables for executed

-                                processes. Takes a space-seperated
+                                processes. Takes a space-separated

                                 list of variable assignments. This
                                 option may be specified more than once
                                 in which case all listed variables
                                 list of variable assignments. This
                                 option may be specified more than once
                                 in which case all listed variables


@@ -272,7 +272,7 @@
                                 <varname>Environment=</varname> but
                                 reads the environment variables from a
                                 text file. The text file should
                                 <varname>Environment=</varname> but
                                 reads the environment variables from a
                                 text file. The text file should

-                                contain new-line seperated variable
+                                contain new-line separated variable

                                 assignments. Empty lines and lines
                                 starting with ; or # will be ignored,
                                 which may be used for
                                 assignments. Empty lines and lines
                                 starting with ; or # will be ignored,
                                 which may be used for


@@ -374,13 +374,13 @@
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <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
                                 <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
                                 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
                                 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>.
 
                                 see below. For details see
                                 <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
 


@@ -477,9 +477,9 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

-                                <term><varname>SyslogNoPrefix=</varname></term>
+                                <term><varname>SyslogLevelPrefix=</varname></term>

                                 <listitem><para>Takes a boolean
                                 <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
                                 <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
                                 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>.
                                 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>
                         </varlistentry>
 
                         <varlistentry>

-                                <term><varname>TimerSlackNS=</varname></term>
+                                <term><varname>TimerSlackNSec=</varname></term>

                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for the executed
                                 <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>
                                 <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>
                         </varlistentry>
 
                         <varlistentry>


@@ -611,8 +617,8 @@
 
                                 <listitem><para>Controls the control
                                 groups the executed processes shall be
 
                                 <listitem><para>Controls the control
                                 groups the executed processes shall be

-                                made member of. Takes a
-                                space-seperated list of cgroup
+                                made members of. Takes a
+                                space-separated list of cgroup

                                 identifiers. A cgroup identifier has a
                                 format like
                                 <filename>cpu:/foo/bar</filename>,
                                 identifiers. A cgroup identifier has a
                                 format like
                                 <filename>cpu:/foo/bar</filename>,


@@ -631,7 +637,7 @@
                                 arbitrary hierachies -- which can be
                                 configured externally with additional execution limits. By default
                                 systemd will place all executed
                                 arbitrary hierachies -- which can be
                                 configured externally with additional execution limits. By default
                                 systemd will place all executed

-                                processes in seperate per-unit control
+                                processes in separate per-unit control

                                 groups (named after the unit) in the
                                 systemd named hierarchy. Since every
                                 process can be in one group per
                                 groups (named after the unit) in the
                                 systemd named hierarchy. Since every
                                 process can be in one group per


@@ -654,7 +660,7 @@
                                 to limit access a process might have
                                 to the main file-system
                                 hierarchy. Each setting takes a
                                 to limit access a process might have
                                 to the main file-system
                                 hierarchy. Each setting takes a

-                                space-seperated list of absolute
+                                space-separated list of absolute

                                 directory paths. Directories listed in
                                 <varname>ReadWriteDirectories=</varname>
                                 are accessible from within the
                                 directory paths. Directories listed in
                                 <varname>ReadWriteDirectories=</varname>
                                 are accessible from within the


@@ -671,7 +677,7 @@
                                 restricting access with these options
                                 does not extend to submounts of a
                                 directory. You must list submounts
                                 restricting access with these options
                                 does not extend to submounts of a
                                 directory. You must list submounts

-                                seperately in these setttings to
+                                separately in these setttings to

                                 ensure the same limited access. These
                                 options may be specified more than
                                 once in which case all directories
                                 ensure the same limited access. These
                                 options may be specified more than
                                 once in which case all directories


@@ -722,13 +728,34 @@
                                 it.</para></listitem>
                         </varlistentry>
 
                                 it.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>UtmpIdentifier=</varname></term>
+
+                                <listitem><para>Takes a a four
+                                character identifier string for an
+                                utmp/wtmp entry for this service. This
+                                should only be set for services such
+                                as <command>getty</command>
+                                implementations where utmp/wtmp
+                                entries must be created and cleared
+                                before and after execution. If the
+                                configured string is longer than four
+                                characters it is truncated and the
+                                terminal four characters are
+                                used. This setting interprets %I style
+                                string replacements. This setting is
+                                unset by default, i.e. no utmp/wtmp
+                                entries are created or cleaned up for
+                                this service.</para></listitem>
+                        </varlistentry>
+

                 </variablelist>
         </refsect1>
 
         <refsect1>
                   <title>See Also</title>
                   <para>
                 </variablelist>
         </refsect1>
 
         <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>,
                           <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>,