X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.timer.xml;h=9fcf5ccb978d2ed139e56fa34cb7866019b7b61f;hb=a6082d778ee4b97ec3eb6d3266cefc024c5d60f7;hp=b60199c2f7fb696ca4607fdec8e40b35d3125096;hpb=06642d1795382a4849aa750ee54238f91e2f3126;p=elogind.git

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index b60199c2f..9fcf5ccb9 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -78,15 +78,20 @@
                 <varname>Unit=</varname> (see below).</para>
 
                 <para>Unless <varname>DefaultDependencies=</varname>
-                is set to <option>false</option>, timer units will
+                is set to <option>false</option>, all 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>
+                <filename>shutdown.target</filename> to ensure that
+                they are stopped cleanly prior to system shutdown.
+                Timer units with at least one
+                <varname>OnCalendar=</varname> directive will have an
+                additional <varname>After=</varname> dependency on
+                <filename>timer-sync.target</filename> to avoid
+                being started before the system clock has been
+                correctly set. Only timer units involved with early
+                boot or late system shutdown should disable the
+                <varname>DefaultDependencies=</varname> option.</para>
         </refsect1>
 
         <refsect1>
@@ -255,22 +260,37 @@
                                 <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>.
+                                argument. If true, the time when the
+                                service unit was last triggered is
+                                stored on disk. When the timer is
+                                activated, the service unit is
+                                triggered immediately if it would have
+                                been triggered at least once during
+                                the time when the timer was inactive.
+                                This is useful to catch up on missed
+                                runs of the service when the machine
+                                was off. 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>