man: various man page updates

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

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index b61cabc3e9ef537f8ba94981930a66b1dbfc38b1..ef89693f14632c30b7d505c0adc5bbb5bf94f642 100644 (file)
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -68,14 +68,25 @@
                 timer specific configuration options are configured in
                 the [Timer] section.</para>
 
                 timer specific configuration options are configured in
                 the [Timer] section.</para>
 

-                <para>For each timer file a matching unit file must
+                <para>For each timer file, a matching unit file must

                 exist, describing the unit to activate when the timer
                 exist, describing the unit to activate when the timer

-                elapses. By default a service by the same name as the
+                elapses. By default, a service by the same name as the

                 timer (except for the suffix) is activated. Example: a
                 timer file <filename>foo.timer</filename> activates a
                 matching service <filename>foo.service</filename>. The
                 unit to activate may be controlled by
                 <varname>Unit=</varname> (see below).</para>
                 timer (except for the suffix) is activated. Example: a
                 timer file <filename>foo.timer</filename> activates a
                 matching service <filename>foo.service</filename>. The
                 unit to activate may be controlled by
                 <varname>Unit=</varname> (see below).</para>

+
+                <para>Unless <varname>DefaultDependencies=</varname>
+                is set to <option>false</option>, timer units will
+                implicitly have dependencies of type
+                <varname>Conflicts=</varname> and
+                <varname>Before=</varname> on
+                <filename>shutdown.target</filename>. These ensure
+                that timer units are stopped cleanly prior to system
+                shutdown. Only timer units involved with early boot or
+                late system shutdown should disable this
+                option.</para>

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


@@ -114,7 +125,7 @@
                                 deactivated.</para>
 
                                 <para>Multiple directives may be
                                 deactivated.</para>
 
                                 <para>Multiple directives may be

-                                combined, of the same and of different
+                                combined of the same and of different

                                 types. For example, by combining
                                 <varname>OnBoot=</varname> and
                                 <varname>OnUnitActive=</varname> it is
                                 types. For example, by combining
                                 <varname>OnBoot=</varname> and
                                 <varname>OnUnitActive=</varname> it is


@@ -144,7 +155,7 @@
                                 directives.</para></listitem>
 
                                 <para>These are monotonic timers,
                                 directives.</para></listitem>
 
                                 <para>These are monotonic timers,

-                                independant of wall-clock time and timezones. If the
+                                independent of wall-clock time and timezones. If the

                                 computer is temporarily suspended, the
                                 monotonic clock stops too.</para>
 
                                 computer is temporarily suspended, the
                                 monotonic clock stops too.</para>
 


@@ -153,16 +164,16 @@
                                 <term><varname>Unit=</varname></term>
 
                                 <listitem><para>The unit to activate
                                 <term><varname>Unit=</varname></term>
 
                                 <listitem><para>The unit to activate

-                                when this timer elapses. Argument is a
+                                when this timer elapses. The argument is a

                                 unit name, whose suffix is not
                                 <filename>.timer</filename>. If not
                                 unit name, whose suffix is not
                                 <filename>.timer</filename>. If not

-                                specified this value defaults to a
+                                specified, this value defaults to a

                                 service that has the same name as the
                                 timer unit, except for the
                                 service that has the same name as the
                                 timer unit, except for the

-                                suffix. (See above.) It is recommended
+                                suffix. (See above.) It is recommended,

                                 that the unit name that is activated
                                 and the unit name of the timer unit
                                 that the unit name that is activated
                                 and the unit name of the timer unit

-                                is chosen identical except for the
+                                are named identical, except for the

                                 suffix.</para></listitem>
                         </varlistentry>
                 </variablelist>
                                 suffix.</para></listitem>
                         </varlistentry>
                 </variablelist>