logind: support for hybrid sleep (i.e. suspend+hibernate at the same time)

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

diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 396697be9bd1ef25eeae8b3d08a8210ceec1dd56..6b8e0ec7f0b8fe7cedc9a95ada2622a690dc0940 100644 (file)
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -63,6 +63,7 @@
                 <filename>graphical.target</filename>,
                 <filename>hibernate.target</filename>,
                 <filename>http-daemon.target</filename>,
                 <filename>graphical.target</filename>,
                 <filename>hibernate.target</filename>,
                 <filename>http-daemon.target</filename>,

+                <filename>hybrid-sleep.target</filename>,

                 <filename>halt.target</filename>,
                 <filename>kbrequest.target</filename>,
                 <filename>kexec.target</filename>,
                 <filename>halt.target</filename>,
                 <filename>kbrequest.target</filename>,
                 <filename>kexec.target</filename>,


@@ -93,7 +94,6 @@
                 <filename>suspend.target</filename>,
                 <filename>swap.target</filename>,
                 <filename>sysinit.target</filename>,
                 <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>syslog.socket</filename>,
                 <filename>syslog.target</filename>,
                 <filename>system-update.target</filename>,


@@ -303,6 +303,15 @@
                                         facility.</para>
                                 </listitem>
                         </varlistentry>
                                         facility.</para>
                                 </listitem>
                         </varlistentry>

+                        <varlistentry>
+                                <term><filename>hybrid-sleep.target</filename></term>
+                                <listitem>
+                                        <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>
                                 <term><filename>halt.target</filename></term>
                                 <listitem>
                         <varlistentry>
                                 <term><filename>halt.target</filename></term>
                                 <listitem>


@@ -554,7 +563,7 @@
                                         all SysV init script service
                                         units with an LSB header
                                         referring to the
                                         all SysV init script service
                                         units with an LSB header
                                         referring to the

-                                        <literal>$rpcbind</literal>
+                                        <literal>$portmap</literal>

                                         facility.</para>
                                 </listitem>
                         </varlistentry>
                                         facility.</para>
                                 </listitem>
                         </varlistentry>


@@ -653,9 +662,8 @@
                                 <listitem>
                                         <para>A special target unit
                                         that is pulled in by
                                 <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>
                                         and may be used to hook units
                                         into the sleep state
                                         logic.</para>


@@ -730,17 +738,6 @@
                                         or b.</para>
                                 </listitem>
                         </varlistentry>
                                         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>
                         <varlistentry>
                                 <term><filename>syslog.socket</filename></term>
                                 <listitem>


@@ -748,8 +745,13 @@
                                         syslog implementations should
                                         listen on. All userspace log
                                         messages will be made
                                         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>
                                 </listitem>
                         </varlistentry>
                         <varlistentry>