X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml;h=6acba91428f8dd719af5da266e6873c644df81a4;hp=3e5f653494fb862456992709a3e786a201a0ecc7;hb=64abe9aa3f7dc7d755a4d3d1783fe3f0285edaea;hpb=eac223e1348917ac8eb0ddba740f330c3e550c5b

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 3e5f65349..6acba9142 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -61,14 +61,13 @@
                 <filename>final.target</filename>,
                 <filename>getty.target</filename>,
                 <filename>graphical.target</filename>,
-                <filename>hibernate.target</filename>,
-                <filename>http-daemon.target</filename>,
                 <filename>halt.target</filename>,
+                <filename>hibernate.target</filename>,
+                <filename>hybrid-sleep.target</filename>,
                 <filename>kbrequest.target</filename>,
                 <filename>kexec.target</filename>,
                 <filename>local-fs.target</filename>,
                 <filename>local-fs-pre.target</filename>,
-                <filename>mail-transfer-agent.target</filename>,
                 <filename>multi-user.target</filename>,
                 <filename>network.target</filename>,
                 <filename>nss-lookup.target</filename>,
@@ -94,7 +93,6 @@
                 <filename>swap.target</filename>,
                 <filename>sysinit.target</filename>,
                 <filename>syslog.socket</filename>,
-                <filename>syslog.target</filename>,
                 <filename>system-update.target</filename>,
                 <filename>time-sync.target</filename>,
                 <filename>umount.target</filename></para>
@@ -214,15 +212,6 @@
                                         <filename>gdm.service</filename>
                                         or a similar display manager
                                         service.</para>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with a LSB header
-                                        referring to the
-                                        <literal>$x-display-manager</literal>
-                                        facility, for compatibility
-                                        with Debian.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -287,19 +276,12 @@
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><filename>http-daemon.target</filename></term>
+                                <term><filename>hybrid-sleep.target</filename></term>
                                 <listitem>
-                                        <para>A target for pulling in
-                                        an HTTP server if there is
-                                        any.</para>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with a LSB header
-                                        referring to the
-                                        <literal>$httpd</literal>
-                                        facility.</para>
+                                        <para>A special target unit
+                                        for hibernating and suspending the
+                                        system at the same time. This pulls in
+                                        <filename>sleep.target</filename>.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -352,15 +334,6 @@
                                         <option>auto</option> and
                                         <option>comment=systemd.mount</option>
                                         mount options set.</para>
-
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$local_fs</literal>
-                                        facility.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -375,29 +348,6 @@
                                         all local mounts.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>mail-transfer-agent.target</filename></term>
-                                <listitem>
-                                        <para>The mail transfer agent
-                                        (MTA) service. Usually this
-                                        should pull-in all units
-                                        necessary for
-                                        sending/receiving mails on the
-                                        local host.</para>
-
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$mail-transfer-agent</literal>
-                                        or
-                                        <literal>$mail-transport-agent</literal>
-                                        facilities, for compatibility
-                                        with Debian.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>multi-user.target</filename></term>
                                 <listitem>
@@ -425,6 +375,16 @@
                                         referring to the
                                         <literal>$network</literal>
                                         facility.</para>
+
+                                        <para>This unit is supposed to
+                                        indicate when the network is
+                                        "up", but it is only very
+                                        loosely defined what that is
+                                        supposed to mean. Also see <ulink
+                                        url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running
+                                        Services After the Network is
+                                        up</ulink> for more
+                                        information.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -559,56 +519,21 @@
                         </varlistentry>
                         <varlistentry>
                                 <term><filename>runlevel2.target</filename></term>
-                                <listitem>
-                                        <para>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 2. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <filename>multi-user.target</filename>.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
                                 <term><filename>runlevel3.target</filename></term>
-                                <listitem>
-                                        <para>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 3. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <filename>multi-user.target</filename>
-                                        or
-                                        <filename>graphical.target</filename>.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
                                 <term><filename>runlevel4.target</filename></term>
-                                <listitem>
-                                        <para>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 4. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <filename>multi-user.target</filename>
-                                        or
-                                        <filename>graphical.target</filename>.</para>
-                                </listitem>
-                        </varlistentry>
-                        <varlistentry>
                                 <term><filename>runlevel5.target</filename></term>
                                 <listitem>
-                                        <para>This is a target that is
-                                        called whenever the SysV
+                                        <para>These are targets that
+                                        are called whenever the SysV
                                         compatibility code asks for
-                                        runlevel 5. It is a good idea
-                                        to make this an alias for
+                                        runlevel 2, 3, 4, 5,
+                                        respectively. It is a good
+                                        idea to make this an alias for
                                         (i.e. symlink to)
                                         <filename>multi-user.target</filename>
-                                        or
-                                        <filename>graphical.target</filename>.</para>
+                                        (for runlevel 2) or
+                                        <filename>graphical.target</filename>
+                                        (the others).</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -652,9 +577,8 @@
                                 <listitem>
                                         <para>A special target unit
                                         that is pulled in by
-                                        <filename>suspend.target</filename>
-                                        and
-                                        <filename>hibernate.target</filename>
+                                        <filename>suspend.target</filename>,
+                                        <filename>hibernate.target</filename> and <filename>hybrid-sleep.target</filename>
                                         and may be used to hook units
                                         into the sleep state
                                         logic.</para>
@@ -732,7 +656,7 @@
                         <varlistentry>
                                 <term><filename>syslog.socket</filename></term>
                                 <listitem>
-                                        <para>The socket unit where
+                                        <para>The socket unit
                                         syslog implementations should
                                         listen on. All userspace log
                                         messages will be made
@@ -745,19 +669,6 @@
                                         document.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>syslog.target</filename></term>
-                                <listitem>
-                                        <para>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <literal>$syslog</literal>
-                                        facility.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>system-update.target</filename></term>
                                 <listitem>