Imported Upstream version 217

[systemd.git] / man / pam_systemd.8

diff --git a/man/pam_systemd.8 b/man/pam_systemd.8
index dfc8a115a13610e3337b23dc2362c03f1ac24867..0c0b702cae3b706538df6b383fbf2fbd5b529ec6 100644 (file)
--- a/man/pam_systemd.8
+++ b/man/pam_systemd.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "PAM_SYSTEMD" "8" "" "systemd 215" "pam_systemd"
+.TH "PAM_SYSTEMD" "8" "" "systemd 217" "pam_systemd"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,7 +57,7 @@ The
 \fI$XDG_SESSION_ID\fR
 environment variable is initialized\&. If auditing is available and
 \fBpam_loginuid\&.so\fR
-run before this module (which is highly recommended), the variable is initialized from the auditing session id (/proc/self/sessionid)\&. Otherwise an independent session counter is used\&.
+was run before this module (which is highly recommended), the variable is initialized from the auditing session id (/proc/self/sessionid)\&. Otherwise, an independent session counter is used\&.
 .RE
 .sp
 .RS 4
@@ -70,9 +70,8 @@ run before this module (which is highly recommended), the variable is initialize
 .\}
 A new systemd scope unit is created for the session\&. If this is the first concurrent session of the user, an implicit slice below
 user\&.slice
-is automatically created and the scope placed in it\&. In instance of the system service
-user@\&.service
-which runs the systemd user manager instance\&.
+is automatically created and the scope placed into it\&. An instance of the system service
+user@\&.service, which runs the systemd user manager instance, is started\&.
 .RE
 .PP
 On logout, this module ensures the following:
@@ -85,7 +84,8 @@ On logout, this module ensures the following:
 .sp -1
 .IP "  1." 4.2
 .\}
-If this is enabled, all processes of the session are terminated\&. If the last concurrent session of a user ends, his user systemd instance will be terminated too, and so will the user\*(Aqs slice unit\&.
+If enabled in
+\fBlogind.conf\fR(5), all processes of the session are terminated\&. If the last concurrent session of a user ends, the user\*(Aqs systemd instance will be terminated too, and so will the user\*(Aqs slice unit\&.
 .RE
 .sp
 .RS 4
@@ -152,13 +152,14 @@ A session identifier, suitable to be used in filenames\&. The string itself shou
 .PP
 \fI$XDG_RUNTIME_DIR\fR
 .RS 4
-Path to a user\-private user\-writable directory that is bound to the user login time on the machine\&. It is automatically created the first time a user logs in and removed on his final logout\&. If a user logs in twice at the same time, both sessions will see the same
+Path to a user\-private user\-writable directory that is bound to the user login time on the machine\&. It is automatically created the first time a user logs in and removed on the user\*(Aqs final logout\&. If a user logs in twice at the same time, both sessions will see the same
 \fI$XDG_RUNTIME_DIR\fR
 and the same contents\&. If a user logs in once, then logs out again, and logs in again, the directory contents will have been lost in between, but applications should not rely on this 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
 \fI$XDG_SESSION_ID\fR
 in the filename\&. This directory shall be used for runtime file system objects such as
 \fBAF_UNIX\fR
-sockets, FIFOs, PID files and similar\&. It is guaranteed that this directory is local and offers the greatest possible file system feature set the operating system provides\&.
+sockets, FIFOs, PID files and similar\&. It is guaranteed that this directory is local and offers the greatest possible file system feature set the operating system provides\&. For further details see the
+\m[blue]\fBXDG Base Directory Specification\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .RE
 .PP
 The following environment variables are read by the module and may be used by the PAM service to pass metadata to the module:
@@ -183,7 +184,12 @@ A single, short identifier string for the desktop environment\&. This may be use
 "GNOME", or
 "KDE"\&. It is recommended to use the same identifiers and capitalization as for
 \fI$XDG_CURRENT_DESKTOP\fR, as defined by the
-\m[blue]\fBDesktop Entry Specification\fR\m[]\&\s-2\u[1]\d\s+2\&.
+\m[blue]\fBDesktop Entry Specification\fR\m[]\&\s-2\u[2]\d\s+2\&. (However, note that
+\fI$XDG_SESSION_DESKTOP\fR
+only takes a single item, and not a colon\-separated list like
+\fI$XDG_CURRENT_DESKTOP\fR\&.) See
+\fBsd_session_get_desktop\fR(3)
+for more details\&.
 .RE
 .PP
 \fI$XDG_SEAT\fR
@@ -229,6 +235,11 @@ session    required     pam_systemd\&.so
 \fBsystemd.service\fR(5)
 .SH "NOTES"
 .IP " 1." 4
+XDG Base Directory Specification
+.RS 4
+\%http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+.RE
+.IP " 2." 4
 Desktop Entry Specification
 .RS 4
 \%http://standards.freedesktop.org/desktop-entry-spec/latest/