update fixme

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

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 7a4cd348877cf7e00bb778bf551a58ca7c459b80..9b6b486bf43f353dac6f52af7a0ec111a55f7c57 100644 (file)
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -76,6 +76,17 @@
                 matching service <filename>foo.service</filename>. The
                 unit to activate may be controlled by
                 <varname>Unit=</varname> (see below).</para>
                 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>


@@ -88,27 +99,27 @@
 
                 <variablelist>
                         <varlistentry>
 
                 <variablelist>
                         <varlistentry>

-                                <term><varname>OnActive=</varname></term>
-                                <term><varname>OnBootup=</varname></term>
-                                <term><varname>OnStartup=</varname></term>
-                                <term><varname>OnUnitActive=</varname></term>
-                                <term><varname>OnUnitInactive=</varname></term>
+                                <term><varname>OnActiveSec=</varname></term>
+                                <term><varname>OnBootSec=</varname></term>
+                                <term><varname>OnStartupSec=</varname></term>
+                                <term><varname>OnUnitActiveSec=</varname></term>
+                                <term><varname>OnUnitInactiveSec=</varname></term>

 
                                 <listitem><para>Defines timers
                                 relative to different starting points:
 
                                 <listitem><para>Defines timers
                                 relative to different starting points:

-                                <varname>OnActive=</varname> defines a
+                                <varname>OnActiveSec=</varname> defines a

                                 timer relative to the moment the timer
                                 itself is
                                 timer relative to the moment the timer
                                 itself is

-                                activated. <varname>OnBootup=</varname>
+                                activated. <varname>OnBootSec=</varname>

                                 defines a timer relative to when the
                                 machine was booted
                                 defines a timer relative to when the
                                 machine was booted

-                                up. <varname>OnStartup=</varname>
+                                up. <varname>OnStartupSec=</varname>

                                 defines a timer relative to when
                                 systemd was
                                 defines a timer relative to when
                                 systemd was

-                                started. <varname>OnUnitActive=</varname>
+                                started. <varname>OnUnitActiveSec=</varname>

                                 defines a timer relative to when the
                                 unit the timer is activating was last
                                 defines a timer relative to when the
                                 unit the timer is activating was last

-                                activated. <varname>OnUnitInactive=</varname>
+                                activated. <varname>OnUnitInactiveSec=</varname>

                                 defines a timer relative to when the
                                 unit the timer is activating was last
                                 deactivated.</para>
                                 defines a timer relative to when the
                                 unit the timer is activating was last
                                 deactivated.</para>


@@ -116,8 +127,8 @@
                                 <para>Multiple directives may be
                                 combined of the same and of different
                                 types. For example, by combining
                                 <para>Multiple directives may be
                                 combined of the same and of different
                                 types. For example, by combining

-                                <varname>OnBoot=</varname> and
-                                <varname>OnUnitActive=</varname> it is
+                                <varname>OnBootSec=</varname> and
+                                <varname>OnUnitActiveSec=</varname> it is

                                 possible to define a timer that
                                 elapses in regular intervals and
                                 activates a specific service each
                                 possible to define a timer that
                                 elapses in regular intervals and
                                 activates a specific service each


@@ -125,17 +136,17 @@
 
                                 <para>The arguments to the directives
                                 are time spans configured in
 
                                 <para>The arguments to the directives
                                 are time spans configured in

-                                seconds. Example: "OnBoot=50" means
+                                seconds. Example: "OnBootSec=50" means

                                 50s after boot-up. The argument may
                                 also include time units. Example:
                                 50s after boot-up. The argument may
                                 also include time units. Example:

-                                "OnBoot=5h 30min" means 5 hours and 30
+                                "OnBootSec=5h 30min" means 5 hours and 30

                                 minutes after boot-up. For details
                                 about the syntax of time spans see
                                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
                                 <para>If a timer configured with
                                 minutes after boot-up. For details
                                 about the syntax of time spans see
                                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
                                 <para>If a timer configured with

-                                <varname>OnBootup=</varname> or
-                                <varname>OnStartup=</varname> is
+                                <varname>OnBootSec=</varname> or
+                                <varname>OnStartupSec=</varname> is

                                 already in the past when the timer
                                 unit is activated, it will immediately
                                 elapse and the configured unit is
                                 already in the past when the timer
                                 unit is activated, it will immediately
                                 elapse and the configured unit is


@@ -159,10 +170,10 @@
                                 specified, this value defaults to a
                                 service that has the same name as the
                                 timer unit, except for the
                                 specified, this value defaults to a
                                 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

-                                are named identical, except for the
+                                are named identically, except for the

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


@@ -171,7 +182,7 @@
         <refsect1>
                   <title>See Also</title>
                   <para>
         <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>