bus: make sd_bus_request_name() and sd_bus_release_name() behave more like other...

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

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5e1ddf718844ad09e946a28a85992fb271f742fe..22c0d5ae9fc33e212b8b35307f9c554f38955b11 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -369,7 +369,7 @@
                                 case it will be replaced by the value
                                 of the environment variable split up
                                 at whitespace, resulting in zero or
                                 case it will be replaced by the value
                                 of the environment variable split up
                                 at whitespace, resulting in zero or

-                                more arguments. To pass literal dollar sign
+                                more arguments. To pass a literal dollar sign,

                                 use <literal>$$</literal>. Note that the first
                                 argument (i.e. the program to execute)
                                 may not be a variable, since it must
                                 use <literal>$$</literal>. Note that the first
                                 argument (i.e. the program to execute)
                                 may not be a variable, since it must


@@ -524,9 +524,10 @@
                                 Takes a unit-less value in seconds, or a
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 Takes a unit-less value in seconds, or a
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout

-                                logic. Defaults to 90s, except when
+                                logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file, except when

                                 <varname>Type=oneshot</varname> is
                                 <varname>Type=oneshot</varname> is

-                                used in which case the timeout
+                                used, in which case the timeout

                                 is disabled by default.
                                 </para></listitem>
                         </varlistentry>
                                 is disabled by default.
                                 </para></listitem>
                         </varlistentry>


@@ -545,7 +546,8 @@
                                 Takes a unit-less value in seconds, or a
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 Takes a unit-less value in seconds, or a
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout

-                                logic. Defaults to 90s.
+                                logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file.

                                 </para></listitem>
                         </varlistentry>
 
                                 </para></listitem>
                         </varlistentry>
 


@@ -861,12 +863,15 @@
                                 these two options, this rate limiting
                                 may be modified. Use
                                 <varname>StartLimitInterval=</varname>
                                 these two options, this rate limiting
                                 may be modified. Use
                                 <varname>StartLimitInterval=</varname>

-                                to configure the checking interval
-                                (defaults to 10s, set to 0 to disable
+                                to configure the checking interval (defaults to
+                                <varname>DefaultStartLimitInterval=</varname> in
+                                manager configuration file, set to 0 to disable

                                 any kind of rate limiting). Use
                                 <varname>StartLimitBurst=</varname> to
                                 configure how many starts per interval
                                 any kind of rate limiting). Use
                                 <varname>StartLimitBurst=</varname> to
                                 configure how many starts per interval

-                                are allowed (defaults to 5). These
+                                are allowed (defaults to
+                                <varname>DefaultStartLimitBurst=</varname> in
+                                manager configuration file). These

                                 configuration options are particularly
                                 useful in conjunction with
                                 <varname>Restart=</varname>, however
                                 configuration options are particularly
                                 useful in conjunction with
                                 <varname>Restart=</varname>, however


@@ -970,33 +975,6 @@
                                 range 0-99.</para></listitem>
                         </varlistentry>
 
                                 range 0-99.</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><varname>FsckPassNo=</varname></term>
-                                <listitem><para>Set the fsck passno
-                                priority to use to order this service
-                                in relation to other file system
-                                checking services. This option is only
-                                necessary to fix ordering in relation
-                                to fsck jobs automatically created for
-                                all <filename>/etc/fstab</filename>
-                                entries with a value in the fs_passno
-                                column > 0. As such it should only be
-                                used as option for fsck
-                                services. Almost always it is a better
-                                choice to add explicit ordering
-                                directives via
-                                <varname>After=</varname> or
-                                <varname>Before=</varname>,
-                                instead. For more details see
-                                <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
-                                used, pass an integer value in the
-                                same range as
-                                <filename>/etc/fstab</filename>'s
-                                fs_passno column. See
-                                <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                                for details.</para></listitem>
-                        </varlistentry>
-

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>