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

[elogind.git] / man / systemctl.xml

diff --git a/man/systemctl.xml b/man/systemctl.xml
index c5fae825aa1e80ce3a918bab70e7b6a14a8b8692..786c2bdfcfa40df7cf264d660d00a830dbc364aa 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -178,7 +178,7 @@
                                 execute it immediately. If passed no
                                 required units of the unit passed will
                                 be pulled in, and no ordering
                                 execute it immediately. If passed no
                                 required units of the unit passed will
                                 be pulled in, and no ordering

-                                dependencies will be honoured. This is
+                                dependencies will be honored. This is

                                 mostly a debugging and rescue tool for
                                 the administrator and should not be
                                 used by
                                 mostly a debugging and rescue tool for
                                 the administrator and should not be
                                 used by


@@ -442,17 +442,6 @@
                                 10.</para></listitem>
                         </varlistentry>
 
                                 10.</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><option>--follow</option></term>
-                                <term><option>-f</option></term>
-
-                                <listitem><para>When used with
-                                <command>status</command> continuously
-                                prints new journal entries as they are
-                                appended to the
-                                journal.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--output=</option></term>
                                 <term><option>-o</option></term>
                         <varlistentry>
                                 <term><option>--output=</option></term>
                                 <term><option>-o</option></term>


@@ -777,7 +766,7 @@
                                 configuration after completing the
                                 disabling of the units. Note that this
                                 command does not implicitly stop the
                                 configuration after completing the
                                 disabling of the units. Note that this
                                 command does not implicitly stop the

-                                units that is being disabled. If this
+                                units that are being disabled. If this

                                 is desired an additional
                                 <command>stop</command> command should
                                 be executed afterwards.</para>
                                 is desired an additional
                                 <command>stop</command> command should
                                 be executed afterwards.</para>


@@ -800,7 +789,7 @@
                                 <term><command>is-enabled [NAME...]</command></term>
 
                                 <listitem><para>Checks whether any of
                                 <term><command>is-enabled [NAME...]</command></term>
 
                                 <listitem><para>Checks whether any of

-                                the specified unit files is enabled
+                                the specified unit files are enabled

                                 (as with
                                 <command>enable</command>). Returns an
                                 exit code of 0 if at least one is
                                 (as with
                                 <command>enable</command>). Returns an
                                 exit code of 0 if at least one is


@@ -1107,7 +1096,7 @@
                                 mounted read-only, immediately
                                 followed by the system halt.  If
                                 <option>--force</option> is specified
                                 mounted read-only, immediately
                                 followed by the system halt.  If
                                 <option>--force</option> is specified

-                                twice the the operation is immediately
+                                twice the operation is immediately

                                 executed without terminating any
                                 processes or unmounting any file
                                 systems. This may result in data
                                 executed without terminating any
                                 processes or unmounting any file
                                 systems. This may result in data


@@ -1128,7 +1117,7 @@
                                 unmounted or mounted read-only,
                                 immediately followed by the powering
                                 off. If <option>--force</option> is
                                 unmounted or mounted read-only,
                                 immediately followed by the powering
                                 off. If <option>--force</option> is

-                                specified twice the the operation is
+                                specified twice the operation is

                                 immediately executed without
                                 terminating any processes or
                                 unmounting any file systems. This may
                                 immediately executed without
                                 terminating any processes or
                                 unmounting any file systems. This may


@@ -1149,7 +1138,7 @@
                                 unmounted or mounted read-only,
                                 immediately followed by the reboot. If
                                 <option>--force</option> is specified
                                 unmounted or mounted read-only,
                                 immediately followed by the reboot. If
                                 <option>--force</option> is specified

-                                twice the the operation is immediately
+                                twice the operation is immediately

                                 executed without terminating any
                                 processes or unmounting any file
                                 systems. This may result in data
                                 executed without terminating any
                                 processes or unmounting any file
                                 systems. This may result in data


@@ -1191,6 +1180,11 @@
 
                                 <listitem><para>Hibernate the system.</para></listitem>
                         </varlistentry>
 
                                 <listitem><para>Hibernate the system.</para></listitem>
                         </varlistentry>

+                        <varlistentry>
+                                <term><command>hybrid-sleep</command></term>
+
+                                <listitem><para>Hibernate and suspend the system.</para></listitem>
+                        </varlistentry>

                         <varlistentry>
                                 <term><command>switch-root [ROOT] [INIT]</command></term>
 
                         <varlistentry>
                                 <term><command>switch-root [ROOT] [INIT]</command></term>