X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Floginctl.xml;h=790a3e4bf8360975ff4cae8ad048b5d74d900d80;hb=a0f9c810faa022c264bf534ab9495e0e9f617962;hp=33a369e0da2aaddb80a7de583db6c5198419c32c;hpb=af3bccd6d87759f0b146bf5980bdd56144d70c7e;p=elogind.git

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 33a369e0d..790a3e4bf 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="loginctl">
+<refentry id="loginctl" conditional='HAVE_PAM'>
 
         <refentryinfo>
                 <title>loginctl</title>
@@ -69,8 +69,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -84,11 +84,11 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--property=</option></term>
                                 <term><option>-p</option></term>
+                                <term><option>--property=</option></term>
 
                                 <listitem><para>When showing
-                                session/user/ properties, limit
+                                session/user properties, limit
                                 display to certain properties as
                                 specified as argument. If not
                                 specified all set properties are
@@ -101,8 +101,8 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--all</option></term>
                                 <term><option>-a</option></term>
+                                <term><option>--all</option></term>
 
                                 <listitem><para>When showing
                                 unit/job/manager properties, show all
@@ -110,13 +110,21 @@
                                 set or not.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>-l</option></term>
+                                <term><option>--full</option></term>
+
+                                <listitem><para>Do not ellipsize cgroup
+                                members.</para>
+                                </listitem>
+                        </varlistentry>
 
                         <varlistentry>
                                 <term><option>--no-pager</option></term>
 
-				<listitem><para>Do not pipe output into a
-				pager.</para></listitem>
-			</varlistentry>
+                                <listitem><para>Do not pipe output into a
+                                pager.</para></listitem>
+                        </varlistentry>
 
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
@@ -136,23 +144,25 @@
                                 <option>all</option> to select whether
                                 to kill only the leader process of the
                                 session or all processes of the
-                                session. If omitted defaults to
+                                session. If omitted, defaults to
                                 <option>all</option>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--signal=</option></term>
                                 <term><option>-s</option></term>
+                                <term><option>--signal=</option></term>
 
                                 <listitem><para>When used with
                                 <command>kill-session</command> or
                                 <command>kill-user</command>, choose
                                 which signal to send to selected
                                 processes. Must be one of the well
-                                known signal specifiers such as
-                                SIGTERM, SIGINT or SIGSTOP. If omitted
-                                defaults to
-                                <option>SIGTERM</option>.</para></listitem>
+                                known signal specifiers, such as
+                                <constant>SIGTERM</constant>,
+                                <constant>SIGINT</constant> or
+                                <constant>SIGSTOP</constant>. If
+                                omitted defaults to
+                                <constant>SIGTERM</constant>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -161,7 +171,7 @@
 
                                 <listitem><para>Execute operation
                                 remotely. Specify a hostname, or
-                                username and hostname separated by @,
+                                username and hostname separated by <literal>@</literal>,
                                 to connect to. This will use SSH to
                                 talk to the remote login manager
                                 instance.</para></listitem>
@@ -242,6 +252,16 @@
                                 sessions, if the session supports it.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><command>lock-sessions</command></term>
+                                <term><command>unlock-sessions</command></term>
+
+                                <listitem><para>Activates/deactivates
+                                the screen lock on all current
+                                sessions supporting
+                                it.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><command>terminate-session [ID...]</command></term>
 
@@ -290,10 +310,10 @@
 
                                 <listitem><para>Show properties of one
                                 or more users or the manager
-                                itself. If no argument is specified
+                                itself. If no argument is specified,
                                 properties of the manager will be
-                                shown. If a user is specified
-                                properties of the user is shown. By
+                                shown. If a user is specified,
+                                properties of the user are shown. By
                                 default, empty properties are
                                 suppressed. Use <option>--all</option>
                                 to show those too. To select specific
@@ -314,9 +334,9 @@
 
                                 <listitem><para>Enable/disable user
                                 lingering for one or more users. If
-                                enabled for a specific user a user
+                                enabled for a specific user, a user
                                 manager is spawned for him/her at
-                                boot, and kept around after
+                                boot and kept around after
                                 logouts. This allows users who aren't
                                 logged in to run long-running
                                 services.</para></listitem>
@@ -368,14 +388,14 @@
 
                                 <listitem><para>Show properties of one
                                 or more seats or the manager
-                                itself. If no argument is specified
+                                itself. If no argument is specified,
                                 properties of the manager will be
-                                shown. If a seat is specified
+                                shown. If a seat is specified,
                                 properties of the seat are shown. By
                                 default, empty properties are
                                 suppressed. Use <option>--all</option>
                                 to show those too. To select specific
-                                properties to show use
+                                properties to show, use
                                 <option>--property=</option>. This
                                 command is intended to be used
                                 whenever computer-parsable output is
@@ -389,20 +409,22 @@
                         <varlistentry>
                                 <term><command>attach [NAME] [DEVICE...]</command></term>
 
-                                <listitem><para>Attach one or more
-                                devices to a seat. The devices should
-                                be specified via device paths in the
-                                <filename>/sys</filename> file
-                                system. To create a new seat attach at
-                                least one graphics card to a
-                                previously unused seat names. seat
+                                <listitem><para>Persistently attach
+                                one or more devices to a seat. The
+                                devices should be specified via device
+                                paths in the <filename>/sys</filename>
+                                file system. To create a new seat,
+                                attach at least one graphics card to a
+                                previously unused seat name. Seat
                                 names may consist only of a-z, A-Z,
-                                0-9, "-" and "_" and must be prefixed
-                                with "seat". To drop assignment of a
-                                device to a specific seat just
-                                reassign it to a different seat, or
-                                use
-                                <command>flush-devices</command>.</para></listitem>
+                                0-9, <literal>-</literal> and
+                                <literal>_</literal> and must be
+                                prefixed with <literal>seat</literal>.
+                                To drop assignment of a device to a
+                                specific seat, just reassign it to a
+                                different seat, or use
+                                <command>flush-devices</command>.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -411,8 +433,8 @@
                                 <listitem><para>Removes all device
                                 assignments previously created with
                                 <command>attach</command>. After this
-                                call only automatically generated
-                                seats will remain and all seat
+                                call, only automatically generated
+                                seats will remain, and all seat
                                 hardware is assigned to
                                 them.</para></listitem>
                         </varlistentry>
@@ -440,7 +462,7 @@
         <refsect1>
                 <title>Environment</title>
 
-                <variablelist>
+                <variablelist class='environment-variables'>
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when