man: explain a couple of default dependencies

3 files changed, 31 insertions, 11 deletions

diff --git a/TODO b/TODO
index 11b9dbb9f..0db681b76 100644
--- a/TODO
+++ b/TODO
@@ -25,12 +25,14 @@ F15:
 
 * NM should pull in network.target, ntpd should pull in rtc-set.target.
 
-* fix sysv parser to add right wants dependencies
-
 * document default dependencies
 
+* remove KillMode=process-group
+
 Features:
 
+* when key file cannot be found, read it from kbd in cryptsetup
+
 * hide passwords on TAB
 
 * get rid of random file name in generator directory?
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 45f8f40ae..d95e39ed8 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -68,13 +68,23 @@
                 specific configuration options are configured in the
                 [Swap] section.</para>
 
-                <para>Swap units must be named after the devices they
-                control. Example: the swap device
+                <para>Swap units must be named after the devices
+                (resp. files) they control. Example: the swap device
                 <filename>/dev/sda5</filename> must be configured in a
                 unit file <filename>dev-sda5.swap</filename>. For
                 details about the escaping logic used to convert a
                 file system path to a unit name see
                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+                <para>All swap units automatically get the appropriate
+                dependencies on the devices (resp. on the mount points
+                of the files) they are actived from.</para>
+
+                <para>Swap units with
+                <varname>DefaultDependencies=</varname> enabled
+                implicitly acquire a conflicting dependency to
+                <filename>umount.target</filename> so that they are
+                deactivated at shutdown.</para>
         </refsect1>
 
         <refsect1>
@@ -88,6 +98,13 @@
                 <para>If a swap device or file is configured in both
                 <filename>/etc/fstab</filename> and a unit file the
                 configuration in the latter takes precedence.</para>
+
+                <para>Unless the <option>noauto</option> option is set
+                for them all swap units configured in
+                <filename>/etc/fstab</filename> are also added as
+                requirements to <filename>swap.target</filename>, so
+                that they are waited for and activated during
+                boot.</para>
         </refsect1>
 
         <refsect1>
@@ -149,7 +166,7 @@
                                 a time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                60s.</para></listitem>
+                                3min.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 5c2642759..6b1dbfbde 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -83,14 +83,15 @@
                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 for details).</para>
 
-                <para>Unless
-                <varname>DefaultDependencies=</varname> is set to
-                <option>false</option>, target units will
-                implicitly complement all configured dependencies of type
-                <varname>Wants=</varname>,
+                <para>Unless <varname>DefaultDependencies=</varname>
+                is set to <option>false</option>, target units will
+                implicitly complement all configured dependencies of
+                type <varname>Wants=</varname>,
                 <varname>Requires=</varname>,
                 <varname>RequiresOverridable=</varname> with
-                dependencies of type <varname>After=</varname>.
+                dependencies of type <varname>After=</varname> if the
+                units in question also have
+                <varname>DefaultDependencies=true</varname>.
                 </para>
         </refsect1>