X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=d1f4a2d7d76c9f73b9b9dad540e1ec9da90a16cd;hb=86198b2788e56fd05959c2dce670d1646bf99bcd;hp=5e1ddf718844ad09e946a28a85992fb271f742fe;hpb=3fde5f30bda2a70d97f3dc8fa918e42e1c07cc2c;p=elogind.git

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5e1ddf718..d1f4a2d7d 100644
--- 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
-                                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
@@ -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
-                                logic. Defaults to 90s, except when
+                                logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file, except when
                                 <varname>Type=oneshot</varname> is
-                                used in which case the timeout
+                                used, in which case the timeout
                                 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
-                                logic. Defaults to 90s.
+                                logic. Defaults to <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file.
                                 </para></listitem>
                         </varlistentry>
 
@@ -970,33 +972,6 @@
                                 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>