X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Floginctl.xml;h=fd2f15c0ac61beb68320d969922d6c8a9e8a644a;hb=bfd22ee3909a67c139aa2fd9b9a4cecba3dd124d;hp=1c2d9132e48e0964287b3e4400d4889799f95f27;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927;p=elogind.git

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 1c2d9132e..fd2f15c0a 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -3,22 +3,22 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  This file is part of systemd.
+  This file is part of elogind.
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it and/or modify it
+  elogind is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
-  systemd is distributed in the hope that it will be useful, but
+  elogind is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+  along with elogind; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="loginctl" xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -60,7 +60,9 @@
     <title>Description</title>
 
     <para><command>loginctl</command> may be used to introspect and
-        control the state of the elogind login manager</para>
+    control the state of the
+    <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    login manager.</para>
   </refsect1>
 
   <refsect1>
@@ -89,6 +91,16 @@
         shown.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>--value</option></term>
+
+        <listitem>
+          <para>When printing properties with <command>show</command>,
+          only print the value, and skip the property name and
+          <literal>=</literal>.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>-a</option></term>
         <term><option>--all</option></term>
@@ -130,29 +142,6 @@
         <constant>SIGTERM</constant>.</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>-n</option></term>
-        <term><option>--lines=</option></term>
-
-        <listitem><para>When used with <command>user-status</command>
-        and <command>session-status</command>, controls the number of
-        journal lines to show, counting from the most recent ones.
-        Takes a positive integer argument. Defaults to 10.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-o</option></term>
-        <term><option>--output=</option></term>
-
-        <listitem><para>When used with <command>user-status</command>
-        and <command>session-status</command>, controls the formatting
-        of the journal entries that are shown. For the available
-        choices, see
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
-        Defaults to <literal>short</literal>.</para></listitem>
-      </varlistentry>
-
       <xi:include href="user-system-options.xml" xpointer="host" />
       <xi:include href="user-system-options.xml" xpointer="machine" />
 
@@ -180,8 +169,7 @@
         <term><command>session-status</command> <optional><replaceable>ID</replaceable>...</optional></term>
 
         <listitem><para>Show terse runtime status information about
-        one or more sessions, followed by the most recent log data
-        from the journal. Takes one or more session identifiers as
+        one or more sessions. Takes one or more session identifiers as
         parameters. If no session identifiers are passed the status of
         the caller's session is shown. This function is intended to
         generate human-readable output. If you are looking for
@@ -263,8 +251,7 @@
         <term><command>user-status</command> <optional><replaceable>USER</replaceable>...</optional></term>
 
         <listitem><para>Show terse runtime status information about
-        one or more logged in users, followed by the most recent log
-        data from the journal. Takes one or more user names or numeric
+        one or more logged in users. Takes one or more user names or numeric
         user IDs as parameters. If no parameters are passed the status
         of the caller's user is shown. This function is intended to
         generate human-readable output. If you are looking for
@@ -387,8 +374,61 @@
       </varlistentry>
     </variablelist></refsect2>
 
+    <refsect2><title>System Commands</title><variablelist>
+    </variablelist></refsect2>
+    <varlistentry>
+      <term><command>poweroff</command></term>
+
+      <listitem>
+        <para>Print a wall message to all users, shut down and
+          power-off the system.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><command>reboot <optional><replaceable>arg</replaceable></optional></command></term>
+
+      <listitem>
+        <para>Print a wall message to all users, shut down and
+          reboot the system.</para>
+
+        <para>If the optional argument
+        <replaceable>arg</replaceable> is given, it will be passed
+        as the optional argument to the
+        <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+        system call. The value is architecture and firmware
+        specific. As an example, <literal>recovery</literal> might
+        be used to trigger system recovery, and
+        <literal>fota</literal> might be used to trigger a
+        <quote>firmware over the air</quote> update.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><command>suspend</command></term>
+
+      <listitem>
+        <para>Suspend the system.
+        </para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><command>hibernate</command></term>
+
+      <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>
   </refsect1>
-
   <refsect1>
     <title>Exit status</title>
 
@@ -401,7 +441,9 @@
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>elogind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     </para>
   </refsect1>