04/05: doc: Document sessions and ~/.xsession for SLiM.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 04e4e6ab51f271298f9a001ba5c8c6ae6426fd64
Author: Ludovic Courtès <address@hidden>
Date:   Fri May 8 16:26:53 2015 +0200

    doc: Document sessions and ~/.xsession for SLiM.
    
    * gnu/services/xorg.scm (slim-service): Document session types and
      ~/.xsession.
    * doc/guix.texi (X Window): Adjust accordingly.
---
 doc/guix.texi         |   13 +++++++++++++
 gnu/services/xorg.scm |   13 +++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 7504dea..b44811f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4968,6 +4968,19 @@ Return a service that spawns the SLiM graphical login 
manager, which in
 turn starts the X display server with @var{startx}, a command as returned by
 @code{xorg-start-command}.
 
address@hidden X session
+
+SLiM automatically looks for session types described by the @file{.desktop}
+files in @file{/run/current-system/profile/share/xsessions} and allows users
+to choose a session from the log-in screen using @kbd{F1}.  Packages such as
address@hidden, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} 
files;
+adding them to the system-wide set of packages automatically makes them
+available at the log-in screen.
+
+In addition, @file{~/.xsession} files are honored.  When available,
address@hidden/.xsession} must be an executable that starts a window manager
+and/or other X clients.
+
 When @var{allow-empty-passwords?} is true, allow logins with an empty
 password.  When @var{auto-login?} is true, log in automatically as
 @var{default-user}.
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 8fd003f..4821614 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -207,6 +207,19 @@ which should be passed to this script as the first 
argument.  If not, the
 turn starts the X display server with @var{startx}, a command as returned by
 @code{xorg-start-command}.
 
address@hidden X session
+
+SLiM automatically looks for session types described by the @file{.desktop}
+files in @file{/run/current-system/profile/share/xsessions} and allows users
+to choose a session from the log-in screen using @kbd{F1}.  Packages such as
address@hidden, @var{sawfish}, and @var{ratpoison} provide @file{.desktop} 
files;
+adding them to the system-wide set of packages automatically makes them
+available at the log-in screen.
+
+In addition, @file{~/.xsession} files are honored.  When available,
address@hidden/.xsession} must be an executable that starts a window manager
+and/or other X clients.
+
 When @var{allow-empty-passwords?} is true, allow logins with an empty
 password.  When @var{auto-login?} is true, log in automatically as
 @var{default-user} with @var{auto-login-session}.