keymap: horizontally align comments in the same column

[elogind.git] / man / logind.conf.xml

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 96e5936e5edd85f71602c696f8e0ed8865ccefe3..b7109353cab9857c08993a249f7bf626e5b1a333 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -22,7 +22,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="logind.conf" conditional='HAVE_PAM'>
+<refentry id="logind.conf" conditional='ENABLE_LOGIND'>

         <refentryinfo>
                 <title>logind.conf</title>
                 <productname>systemd</productname>
         <refentryinfo>
                 <title>logind.conf</title>
                 <productname>systemd</productname>


@@ -163,7 +163,7 @@
                                 will execute the action after all
                                 sessions reported that they are idle,
                                 and no idle inhibitor lock is active,
                                 will execute the action after all
                                 sessions reported that they are idle,
                                 and no idle inhibitor lock is active,

-                                and subsquently the time configured
+                                and subsequently the time configured

                                 with <varname>IdleActionSec=</varname>
                                 (see below) has passed.</para>
                                 </listitem>
                                 with <varname>IdleActionSec=</varname>
                                 (see below) has passed.</para>
                                 </listitem>


@@ -184,10 +184,10 @@
                                 <term><varname>KillExcludeUsers=</varname></term>
 
                                 <listitem><para>These settings take
                                 <term><varname>KillExcludeUsers=</varname></term>
 
                                 <listitem><para>These settings take

-                                space separated lists of user names
+                                space-separated lists of usernames

                                 that influence the effect of
                                 <varname>KillUserProcesses=</varname>. If
                                 that influence the effect of
                                 <varname>KillUserProcesses=</varname>. If

-                                not empty only processes of users
+                                not empty, only processes of users

                                 listed in
                                 <varname>KillOnlyUsers</varname> will
                                 be killed when they log out
                                 listed in
                                 <varname>KillOnlyUsers</varname> will
                                 be killed when they log out


@@ -207,10 +207,17 @@
 
                                 <listitem><para>These settings control
                                 the default control group hierarchies
 
                                 <listitem><para>These settings control
                                 the default control group hierarchies

-                                users logging in are added to. When
-                                logging in users will get private
-                                control groups in all hierarchies
-                                listed in
+                                users logging in are added to, in
+                                addition to the
+                                <literal>name=systemd</literal> named
+                                hierarchy. These settings take
+                                space-separated lists of controller
+                                names. Pass the empty string to ensure
+                                that logind does not touch any
+                                hierarchies but systemd's own. When
+                                logging in, user sessions will get
+                                private control groups in all
+                                hierarchies listed in

                                 <varname>Controllers=</varname> and be
                                 reset to the root control group in all
                                 hierarchies listed in
                                 <varname>Controllers=</varname> and be
                                 reset to the root control group in all
                                 hierarchies listed in


@@ -218,7 +225,15 @@
                                 defaults to the empty list,
                                 <varname>ResetControllers=</varname>
                                 defaults to
                                 defaults to the empty list,
                                 <varname>ResetControllers=</varname>
                                 defaults to

-                                <literal>cpu</literal>.</para></listitem>
+                                <literal>cpu</literal>. Note that for
+                                all controllers that are not listed in
+                                either <varname>Controllers=</varname>
+                                or
+                                <varname>ResetControllers=</varname>,
+                                newly created sessions will be part of
+                                the control groups of the system
+                                service that created the
+                                session.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -254,11 +269,11 @@
                                 <literal>hibernate</literal>,
                                 <literal>hybrid-sleep</literal> and
                                 <literal>lock</literal>. If
                                 <literal>hibernate</literal>,
                                 <literal>hybrid-sleep</literal> and
                                 <literal>lock</literal>. If

-                                <literal>ignore</literal> logind will
+                                <literal>ignore</literal>, logind will

                                 never handle these keys. If
                                 never handle these keys. If

-                                <literal>lock</literal> all running
-                                sessions will be screen
-                                locked. Otherwise the specified action
+                                <literal>lock</literal>, all running
+                                sessions will be screen-locked; otherwise,
+                                the specified action

                                 will be taken in the respective
                                 event. Only input devices with the
                                 <literal>power-switch</literal> udev
                                 will be taken in the respective
                                 event. Only input devices with the
                                 <literal>power-switch</literal> udev


@@ -286,10 +301,10 @@
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If
                                 sleep keys and the lid switch are
                                 subject to inhibitor locks. These
                                 settings take boolean arguments. If

-                                <literal>off</literal> the inhibitor
+                                <literal>off</literal>, the inhibitor

                                 locks taken by applications in order
                                 to block the requested operation are
                                 locks taken by applications in order
                                 to block the requested operation are

-                                respected, if <literal>on</literal>
+                                respected, if <literal>on</literal>,

                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,
                                 the requested operation is executed in
                                 any
                                 case. <varname>PowerKeyIgnoreInhibited=</varname>,