diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-06-28 10:30:15 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-06-28 10:30:15 +0000 |
| commit | daba2f7416861898b2c01926ae6a2ef19fecfaab (patch) | |
| tree | 6b159c5e7d612368e6bbb8e138ae3db15005c201 /man/systemd.timer.xml | |
| parent | 9a332ba261bea9e9f3c0915bc6f0c6a0d45a1d5d (diff) | |
| parent | 606c24e3bd41207c395f24a56bcfcad791e265a5 (diff) | |
| download | systemd-daba2f7416861898b2c01926ae6a2ef19fecfaab.tar.gz | |
Merge tag 'v204' into new-systemd
systemd 204
Diffstat (limited to 'man/systemd.timer.xml')
| -rw-r--r-- | man/systemd.timer.xml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml index 5cc543e453..2b9d91a60f 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -48,7 +48,7 @@ </refnamediv> <refsynopsisdiv> - <para><filename>systemd.timer</filename></para> + <para><filename><replaceable>timer</replaceable>.timer</filename></para> </refsynopsisdiv> <refsect1> @@ -97,7 +97,7 @@ defines. The options specific to the [Timer] section of timer units are the following:</para> - <variablelist> + <variablelist class='unit-directives'> <varlistentry> <term><varname>OnActiveSec=</varname></term> <term><varname>OnBootSec=</varname></term> @@ -115,7 +115,7 @@ machine was booted up. <varname>OnStartupSec=</varname> defines a timer relative to when - systemd was + systemd was first started. <varname>OnUnitActiveSec=</varname> defines a timer relative to when the unit the timer is activating was last @@ -157,7 +157,13 @@ <para>These are monotonic timers, independent of wall-clock time and timezones. If the computer is temporarily suspended, the - monotonic clock stops too.</para></listitem> + monotonic clock stops too.</para> + + <para>If the empty string is assigned + to any of these options the list of + timers is reset, and all prior + assignments will have no + effect.</para></listitem> </varlistentry> @@ -169,8 +175,10 @@ event expressions. See <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more information on the syntax of - calendar event - expressions.</para></listitem> + calendar event expressions. Otherwise + the semantics are similar to + <varname>OnActiveSec=</varname> and + related settings.</para></listitem> </varlistentry> <varlistentry> @@ -199,7 +207,8 @@ <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>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> + <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> |