X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=a15dfb2cb69876dec403fb4fa9fea087bc578f1d;hb=1361a3e33a1a43a3ea0563df6e4fbb26fe4bb1ab;hp=09d1d5ff7d98a00a9a1edf999f00a0bd441209c9;hpb=a827e37371be78ba7eda63fa6edca1074c431524;p=elogind.git

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 09d1d5ff7..a15dfb2cb 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -73,9 +73,12 @@
                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 which define the execution environment the commands
                 are executed in, and in
-                <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 which define the way the processes of the service are
-                terminated.</para>
+                terminated, and in
+                <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                which configure control group settings for the
+                processes of the service.</para>
 
                 <para>Unless <varname>DefaultDependencies=</varname>
                 is set to <option>false</option>, service units will
@@ -214,7 +217,11 @@
                                 systemd. If
                                 <varname>NotifyAccess=</varname> is
                                 not set, it will be implicitly set to
-                                <option>main</option>.</para>
+                                <option>main</option>. Note that
+                                currently
+                                <varname>Type=</varname><option>notify</option>
+                                won't work if used in combination with
+                                <varname>PrivateNetwork=</varname><option>yes</option>.</para>
 
                                 <para>Behavior of
                                 <option>idle</option> is very similar
@@ -319,7 +326,7 @@
                                 suitable for XDG
                                 <filename>.desktop</filename> files.
                                 Lone semicolons may be escaped as
-                                '<literal>\;</literal>'. If the empty
+                                <literal>\;</literal>. If the empty
                                 string is assigned to this option the
                                 list of commands to start is reset,
                                 prior assignments of this option will
@@ -330,7 +337,7 @@
                                 one by one sequentially in the order
                                 they appear in the unit file. If one
                                 of the commands fails (and is not
-                                prefixed with '<literal>-</literal>'),
+                                prefixed with <literal>-</literal>),
                                 other lines are not executed and the
                                 unit is considered failed.</para>
 
@@ -341,7 +348,7 @@
                                 main process of the daemon.</para>
 
                                 <para>The command line accepts
-                                '<literal>%</literal>' specifiers as
+                                <literal>%</literal> specifiers as
                                 described in
                                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
                                 that the first argument of the command
@@ -370,19 +377,19 @@
 
                                 <para>Optionally, if the absolute file
                                 name is prefixed with
-                                '<literal>@</literal>', the second token
+                                <literal>@</literal>, the second token
                                 will be passed as
                                 <literal>argv[0]</literal> to the
                                 executed process, followed by the
                                 further arguments specified. If the
-                                absolute file name is prefixed with
-                                '<literal>-</literal>' an exit code of
+                                absolute filename is prefixed with
+                                <literal>-</literal> an exit code of
                                 the command normally considered a
                                 failure (i.e. non-zero exit status or
                                 abnormal exit due to signal) is ignored
                                 and considered success. If both
-                                '<literal>-</literal>' and
-                                '<literal>@</literal>' are used they
+                                <literal>-</literal> and
+                                <literal>@</literal> are used they
                                 can appear in either order.</para>
 
                                 <para>Note that this setting does not
@@ -417,7 +424,7 @@
                                 after the other, serially.</para>
 
                                 <para>If any of those commands (not
-                                prefixed with '<literal>-</literal>')
+                                prefixed with <literal>-</literal>)
                                 fail, the rest are not executed and
                                 the unit is considered failed.</para>
                                 </listitem>
@@ -480,7 +487,7 @@
                                 was stopped. This includes cases where
                                 the commands configured in
                                 <varname>ExecStop=</varname> were used,
-                                where the service doesn't have any
+                                where the service does not have any
                                 <varname>ExecStop=</varname> defined, or
                                 where the service exited unexpectedly. This
                                 argument takes multiple command lines,
@@ -529,9 +536,9 @@
                                 wait for stop. If a service is asked
                                 to stop but does not terminate in the
                                 specified time, it will be terminated
-                                forcibly via SIGTERM, and after
+                                forcibly via <constant>SIGTERM</constant>, and after
                                 another delay of this time with
-                                SIGKILL (See
+                                <constant>SIGKILL</constant> (See
                                 <varname>KillMode=</varname>
                                 in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
                                 Takes a unit-less value in seconds, or a
@@ -620,8 +627,8 @@
                                 exits cleanly.
                                 In this context, a clean exit means
                                 an exit code of 0, or one of the signals
-                                SIGHUP, SIGINT, SIGTERM, or SIGPIPE, and
-                                additonally, exit statuses and signals
+                                <constant>SIGHUP</constant>, <constant>SIGINT</constant>, <constant>SIGTERM</constant>, or <constant>SIGPIPE</constant>, and
+                                additionally, exit statuses and signals
                                 specified in <varname>SuccessExitStatus=</varname>.
                                 If set to <option>on-failure</option>
                                 the service will be restarted when the
@@ -657,15 +664,15 @@
                                 by the main service process will be
                                 considered successful termination, in
                                 addition to the normal successful exit
-                                code 0 and the signals SIGHUP, SIGINT,
-                                SIGTERM and SIGPIPE. Exit status
+                                code 0 and the signals <constant>SIGHUP</constant>, <constant>SIGINT</constant>,
+                                <constant>SIGTERM</constant> and <constant>SIGPIPE</constant>. Exit status
                                 definitions can either be numeric exit
                                 codes or termination signal names,
                                 separated by spaces. Example:
-                                "<literal>SuccessExitStatus=1 2 8
-                                SIGKILL</literal>", ensures that exit
+                                <literal>SuccessExitStatus=1 2 8
+                                <constant>SIGKILL</constant></literal>, ensures that exit
                                 codes 1, 2, 8 and the termination
-                                signal SIGKILL are considered clean
+                                signal <constant>SIGKILL</constant> are considered clean
                                 service terminations. This option may
                                 appear more than once in which case
                                 the list of successful exit statuses
@@ -692,8 +699,8 @@
                                 that by default no exit status is
                                 excluded from the configured restart
                                 logic. Example:
-                                "<literal>RestartPreventExitStatus=1 6
-                                SIGABRT</literal>", ensures that exit
+                                <literal>RestartPreventExitStatus=1 6
+                                SIGABRT</literal>, ensures that exit
                                 codes 1 and 6 and the termination
                                 signal SIGABRT will not result in
                                 automatic service restarting. This
@@ -820,7 +827,7 @@
                                 in other words: the
                                 <varname>Service=</varname> setting of
                                 <filename>.socket</filename> units
-                                doesn't have to match the inverse of
+                                does not have to match the inverse of
                                 the <varname>Sockets=</varname>
                                 setting of the
                                 <filename>.service</filename> it
@@ -994,6 +1001,7 @@
                           <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                   </para>