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

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 33a369e0d..2c8d982ed 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,20 @@
                                 set or not.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <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>
@@ -141,8 +148,8 @@
                         </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
@@ -242,6 +249,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>
 
@@ -389,13 +406,13 @@
                         <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
@@ -440,7 +457,7 @@
         <refsect1>
                 <title>Environment</title>
 
-                <variablelist>
+                <variablelist class='environment-variables'>
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when