Merge nss-myhostname

[elogind.git] / man / loginctl.xml

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 49fc1ffeac2abf248a561f55941a75f3875263a0..5dbc1f696719c593ba778afbd9f93491be6e75c5 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -88,7 +88,7 @@
                                 <term><option>-p</option></term>
 
                                 <listitem><para>When showing
                                 <term><option>-p</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
                                 display to certain properties as
                                 specified as argument. If not
                                 specified all set properties are


@@ -242,6 +242,14 @@
                                 sessions, if the session supports it.</para></listitem>
                         </varlistentry>
 
                                 sessions, if the session supports it.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><command>lock-sessions</command></term>
+
+                                <listitem><para>Activate the screen
+                                lock on all current sessions
+                                supporting it.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><command>terminate-session [ID...]</command></term>
 
                         <varlistentry>
                                 <term><command>terminate-session [ID...]</command></term>
 


@@ -389,13 +397,13 @@
                         <varlistentry>
                                 <term><command>attach [NAME] [DEVICE...]</command></term>
 
                         <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
                                 names may consist only of a-z, A-Z,
                                 0-9, "-" and "_" and must be prefixed
                                 with "seat". To drop assignment of a