X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.special.xml;h=dc04ee325cf71f6aff33de690ff4dbe7df594969;hp=4321f546987b34fcd629929b7a1f550749707215;hb=669b04a492e33601e6c34a40bc96ad9ffa11c5a2;hpb=013d8a39a6178179080bcfee9122b29cf9d29259

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 4321f5469..dc04ee325 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -57,13 +57,13 @@
                 <filename>default.target</filename>,
                 <filename>display-manager.service</filename>,
                 <filename>emergency.target</filename>,
-                <filename>exit.service</filename>,
-                <filename>final.service</filename>,
+                <filename>exit.target</filename>,
+                <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>,
@@ -93,9 +93,9 @@
                 <filename>suspend.target</filename>,
                 <filename>swap.target</filename>,
                 <filename>sysinit.target</filename>,
-                <filename>syslog.service</filename>,
                 <filename>syslog.socket</filename>,
                 <filename>syslog.target</filename>,
+                <filename>system-update.target</filename>,
                 <filename>time-sync.target</filename>,
                 <filename>umount.target</filename></para>
         </refsynopsisdiv>
@@ -221,8 +221,7 @@
                                         units with a LSB header
                                         referring to the
                                         <literal>$x-display-manager</literal>
-                                        facility, for compatibility
-                                        with Debian.</para>
+                                        facility.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -287,19 +286,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>
@@ -391,11 +383,7 @@
                                         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>
+                                        <literal>$mail-transfer-agent</literal>.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -553,62 +541,27 @@
                                         all SysV init script service
                                         units with an LSB header
                                         referring to the
-                                        <literal>$rpcbind</literal>
+                                        <literal>$portmap</literal>
                                         facility.</para>
                                 </listitem>
                         </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 +605,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>
@@ -729,17 +681,6 @@
                                         or b.</para>
                                 </listitem>
                         </varlistentry>
-                        <varlistentry>
-                                <term><filename>syslog.service</filename></term>
-                                <listitem>
-                                        <para>The syslog service if
-                                        any. Implementations should
-                                        create a symlink from the
-                                        actual syslog implementation
-                                        to this generic name for
-                                        activating it.</para>
-                                </listitem>
-                        </varlistentry>
                         <varlistentry>
                                 <term><filename>syslog.socket</filename></term>
                                 <listitem>
@@ -747,8 +688,13 @@
                                         syslog implementations should
                                         listen on. All userspace log
                                         messages will be made
-                                        available on this
-                                        socket.</para>
+                                        available on this socket. For
+                                        more information about syslog
+                                        integration, please consult
+                                        the <ulink
+                                        url="http://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog
+                                        Interface</ulink>
+                                        document.</para>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>
@@ -764,6 +710,23 @@
                                         facility.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><filename>system-update.target</filename></term>
+                                <listitem>
+                                        <para>A special target unit
+                                        that is used for off-line
+                                        system updates.
+                                        <citerefentry><refentrytitle>systemd-system-update-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                                        will redirect the boot process
+                                        to this target if
+                                        <filename>/system-update</filename>
+                                        exists. For more information
+                                        see the <ulink
+                                        url="http://freedesktop.org/wiki/Software/systemd/SystemUpdates">System
+                                        Updates
+                                        Specification</ulink>.</para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><filename>time-sync.target</filename></term>
                                 <listitem>
@@ -795,6 +758,7 @@
                                         is set (the default).</para>
                                 </listitem>
                         </varlistentry>
+
                 </variablelist>
         </refsect1>
 
@@ -813,7 +777,7 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><filename>exit.service</filename></term>
+                                <term><filename>exit.target</filename></term>
                                 <listitem>
                                         <para>A special service unit
                                         for shutting down the