Revert "timesyncd: remove retry_timer logic which is covered by the server timeout"

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

diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 44f55e05e3ae2aeecf69cf8ffe1eed92bf717520..9fcf5ccb978d2ed139e56fa34cb7866019b7b61f 100644 (file)
--- 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>
                 <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
                 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>
         </refsect1>
 
         <refsect1>


@@ -274,7 +279,7 @@
                                 <term><varname>WakeSystem=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>WakeSystem=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If true an elapsing timer
+                                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
                                 will cause the system to resume from
                                 suspend, should it be suspended and if
                                 the system supports this. Note that