X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fpam_systemd.xml;h=2d2f1914876c55a28518e491badbe5efec083fff;hb=183de6d7d9def43ec90b94e775fdc49539a950ba;hp=883b50b640a859470e6626428a0fdb618d9d4f68;hpb=c36eecdfcb4afa09850002fbb81a95a24ffde599;p=elogind.git
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 883b50b64..2d2f19148 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -44,7 +44,7 @@
pam_systemd
- Register user sessions in the systemd control group hierarchy
+ Register user sessions in the systemd login manager
@@ -57,8 +57,9 @@
Descriptionpam_systemd registers user
- sessions in the systemd control group
- hierarchy.
+ sessions in the systemd login manager
+ systemd-logind.service8,
+ and hence the systemd control group hierarchy.
On login, this module ensures the following:
@@ -98,7 +99,7 @@
control group are killed and the control group
is removed.
- If last subgroup of the
+ If the last subgroup of the
/user/$USER control group
was removed the
$XDG_RUNTIME_DIR directory
@@ -156,7 +157,7 @@
listed in this argument will not be
subject to the effect of
. Note
- that that this option takes precedence
+ that this option takes precedence
over
, and
hence whatever is listed for
@@ -212,7 +213,7 @@
stricter version of
KillUserProcesses=1 which may be
configured system-wide in
- systemd-logind.conf5. The
+ logind.conf5. The
former kills processes of a session as soon as it
ends, the latter kills processes as soon as the last
session of the user ends.
@@ -271,7 +272,7 @@
in again, the directory contents will
have been lost in between, but
applications should not rely on this
- behaviour and must be able to deal with
+ behavior and must be able to deal with
stale files. To store session-private
data in this directory the user should
include the value of $XDG_SESSION_ID
@@ -304,12 +305,14 @@ session required pam_systemd.so kill-session-processes=1
See Also
+ systemd1,
+ systemd-logind.service8,
+ logind.conf5,
+ loginctl1,
pam.conf5,
pam.d5,
pam8,
- pam_loginuid8,
- systemd-logind.conf5,
- systemd1
+ pam_loginuid8