X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.timer.xml;h=58eaab09f84625cbb20d109067a5b5aa625bcb5b;hb=2ad7561f9f658f8dee168a76654c7d918e2260c7;hp=7143f9f931990e8bd269450f6ff2a7d8c5126b59;hpb=b040723ea412209e0edf54647fa5aa4287411507;p=elogind.git

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 7143f9f93..58eaab09f 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -165,8 +165,8 @@
                                 assignments will have no
                                 effect.</para>
 
-                                <para>Note that timers are not
-                                necessarily expired at the precise
+                                <para>Note that timers do not
+                                necessarily expire at the precise
                                 time configured with these settings,
                                 as they are subject to the
                                 <varname>AccuracySec=</varname>
@@ -187,8 +187,8 @@
                                 <varname>OnActiveSec=</varname> and
                                 related settings.</para>
 
-                                <para>Note that timers are not
-                                necessarily expired at the precise
+                                <para>Note that timers do not
+                                necessarily expire at the precise
                                 time configured with this setting,
                                 as it is subject to the
                                 <varname>AccuracySec=</varname>
@@ -201,7 +201,7 @@
                                 <listitem><para>Specify the accuracy
                                 the timer shall elapse with. Defaults
                                 to 1min. The timer is scheduled to
-                                expire within a time window starting
+                                elapse within a time window starting
                                 with the time specified in
                                 <varname>OnCalendar=</varname>,
                                 <varname>OnActiveSec=</varname>,
@@ -214,7 +214,7 @@
                                 later. Within this time window, the
                                 expiry time will be placed at a
                                 host-specific, randomized but stable
-                                position, that is synchronized between
+                                position that is synchronized between
                                 all local timer units. This is done in
                                 order to distribute the wake-up time
                                 in networked installations, as well as
@@ -249,6 +249,45 @@
                                 are named identically, except for the
                                 suffix.</para></listitem>
                         </varlistentry>
+
+
+                        <varlistentry>
+                                <term><varname>Persistent=</varname></term>
+
+                                <listitem><para>Takes a boolean
+                                argument. If true the service unit is
+                                immediately triggered when the timer
+                                unit is activated and the timer
+                                elapsed at least once since the last
+                                time the service unit has been
+                                triggered by the timer unit. The time
+                                when the service unit was last
+                                triggered is stored on disk. This is
+                                useful to catch up for missed timers
+                                when a machine is shutdown temporarily
+                                and then is powered up again. Note
+                                that this setting only has an effect
+                                on timers configured with
+                                <varname>OnCalendar=</varname>.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>WakeSystem=</varname></term>
+
+                                <listitem><para>Takes a boolean
+                                argument. If true an elapsing timer
+                                will cause the system to resume from
+                                suspend, should it be suspended and if
+                                the system supports this. Note that
+                                this option will only make sure the
+                                system resumes on the appropriate
+                                times, it will not take care of
+                                suspending it again after any work
+                                that is to be done is
+                                finished. Defaults to
+                                <varname>false</varname>.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>