X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Floginctl.xml;h=80563105121edb8acb95c9a5ced617362a524239;hb=3909ba34ec9b2c63d9938b6ba37af54a214fcff3;hp=749db92ed13f57308ba4316c826484222ca500ec;hpb=4f50d2efbac87aba0505b9f998bf3e4bde64c214;p=elogind.git

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 749db92ed..805631051 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -157,6 +157,35 @@
                                 <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" />
 
@@ -164,10 +193,15 @@
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />
                 </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Commands</title>
 
                 <para>The following commands are understood:</para>
 
-                <variablelist>
+                <refsect2><title>Session Commands</title><variablelist>
+
                         <varlistentry>
                                 <term><command>list-sessions</command></term>
 
@@ -175,14 +209,19 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><command>session-status</command> <replaceable>ID</replaceable>...</term>
+                                <term><command>session-status</command> <optional><replaceable>ID</replaceable>...</optional></term>
 
                                 <listitem><para>Show terse runtime
                                 status information about one or more
-                                sessions. This function is intended to
-                                generate human-readable output. If you
-                                are looking for computer-parsable
-                                output, use
+                                sessions, followed by the most recent
+                                log data from the journal. 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
+                                computer-parsable output, use
                                 <command>show-session</command>
                                 instead.</para></listitem>
                         </varlistentry>
@@ -211,14 +250,13 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><command>activate</command> <replaceable>ID</replaceable>...</term>
-
-                                <listitem><para>Activate one or more
-                                sessions. This brings one or more
-                                sessions into the foreground, if
-                                another session is currently in the
-                                foreground on the respective
-                                seat.</para></listitem>
+                                <term><command>activate</command> <replaceable>ID</replaceable></term>
+
+                                <listitem><para>Activate a
+                                session. This brings a session into
+                                the foreground, if another session is
+                                currently in the foreground on the
+                                respective seat.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -261,7 +299,9 @@
                                 <option>--signal=</option> to select
                                 the signal to send.</para></listitem>
                         </varlistentry>
+                </variablelist></refsect2>
 
+                <refsect2><title>User Commands</title><variablelist>
                         <varlistentry>
                                 <term><command>list-users</command></term>
 
@@ -270,17 +310,22 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><command>user-status</command> <replaceable>USER</replaceable>...</term>
+                                <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. This function is
-                                intended to generate human-readable
-                                output. If you are looking for
-                                computer-parsable output, use
-                                <command>show-user</command> instead.
-                                Users may be specified by their
-                                usernames or numeric user IDs.
+                                logged in users, followed by the most
+                                recent log data from the
+                                journal. 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 computer-parsable output,
+                                use <command>show-user</command>
+                                instead.  Users may be specified by
+                                their usernames or numeric user IDs.
                                 </para></listitem>
                         </varlistentry>
 
@@ -340,7 +385,9 @@
                                 <option>--signal=</option> to select
                                 the signal to send.</para></listitem>
                         </varlistentry>
+                </variablelist></refsect2>
 
+                <refsect2><title>Seat Commands</title><variablelist>
                         <varlistentry>
                                 <term><command>list-seats</command></term>
 
@@ -350,12 +397,15 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><command>seat-status</command> <replaceable>NAME</replaceable>...</term>
+                                <term><command>seat-status</command> <optional><replaceable>NAME</replaceable>...</optional></term>
 
                                 <listitem><para>Show terse runtime
                                 status information about one or more
-                                seats. This function is
-                                intended to generate human-readable
+                                seats. Takes one or more seat names as
+                                parameters. If no seat names are
+                                passed the status of the caller's
+                                session's seat is shown. This function
+                                is intended to generate human-readable
                                 output. If you are looking for
                                 computer-parsable output, use
                                 <command>show-seat</command>
@@ -427,7 +477,7 @@
                                 and deallocates all runtime resources
                                 attached to them.</para></listitem>
                         </varlistentry>
-                </variablelist>
+                </variablelist></refsect2>
 
         </refsect1>