X Strike Force SVN commit: rev 420 - in trunk/debian: . local
Author: branden
Date: 2003-08-21 16:20:05 -0500 (Thu, 21 Aug 2003)
New Revision: 420
Modified:
trunk/debian/changelog
trunk/debian/local/Xsession.5
trunk/debian/local/Xsession.options.5
Log:
debian/local/Xsession{,.options}.5:
- further clarify the X session startup procedure in the manpages, per
suggestion from Frank Murphy
- update copyright notice
- add $Id$ expando
- set svn:keywords property to "Id"
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-08-21 18:57:03 UTC (rev 419)
+++ trunk/debian/changelog 2003-08-21 21:20:05 UTC (rev 420)
@@ -3,8 +3,11 @@
* debian/control: add gcc's epoch to versioned Build-Conflict on gcc-3.3
(thanks, James Troup)
- -- Branden Robinson <branden@debian.org> Wed, 20 Aug 2003 19:32:19 -0500
+ * debian/local/Xsession{,.options}.5: further clarify the X session startup
+ procedure in the manpages, per suggestion from Frank Murphy
+ -- Branden Robinson <branden@debian.org> Thu, 21 Aug 2003 16:18:00 -0500
+
xfree86 (4.2.1-10) unstable; urgency=medium
* patch #000_stolen_from_HEAD_xlib: fix for buffer overflow in
Modified: trunk/debian/local/Xsession.5
===================================================================
--- trunk/debian/local/Xsession.5 2003-08-21 18:57:03 UTC (rev 419)
+++ trunk/debian/local/Xsession.5 2003-08-21 21:20:05 UTC (rev 420)
@@ -1,4 +1,4 @@
-.\" This manpage is copyright (C) 1998,1999,2000,2001,2002 Branden Robinson
+.\" This manpage is copyright 1998--2003 Branden Robinson
.\" <branden@debian.org>.
.\"
.\" This is free software; you may redistribute it and/or modify
@@ -15,7 +15,9 @@
.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
.\" Suite 330, Boston, MA 02111-1307 USA
-.TH Xsession 5 "2003\-08\-05" "Debian GNU/Linux"
+.\"
+.\" $Id$
+.TH Xsession 5 "2003\-08\-21" "Debian GNU/Linux"
.SH NAME
Xsession \- initialize X session
.SH SYNOPSIS
@@ -150,12 +152,12 @@
.PP
3) Determine startup program. The X client to launch as the controlling
process (the one that, upon exiting, causes the X server to exit as well)
-is determined next. If the line "allow\-user\-xsession" is present in
+is determined next. If a program or failsafe argument was given and is
+allowed (see above), it is used as the controlling process. Otherwise, if
+the line "allow\-user\-xsession" is present in
.IR Xsession.options ,
-a user\-specified session program or script is used. If a program or
-failsafe argument was given and is allowed (see above), it is used instead.
-Otherwise, two historically popular names for user X session scripts are
-searched for:
+a user\-specified session program or script is used. In the latter case,
+two historically popular names for user X session scripts are searched for:
.IR $HOME/.xsession
and
.IR $HOME/.Xsession
@@ -163,9 +165,8 @@
is not executable, it is marked to be executed with the Bourne shell
interpreter,
.BR sh (1).
-If "allow\-user\-xsession" is not specified, or no user X session program can
-be located, and no failsafe session is to be run, the following programs
-are searched for:
+Finally, if none of the above succeeds, the following programs are searched
+for:
.IR /usr/bin/x\-session\-manager ,
.IR /usr/bin/x\-window\-manager ,
and
Property changes on: trunk/debian/local/Xsession.5
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/Xsession.options.5
===================================================================
--- trunk/debian/local/Xsession.options.5 2003-08-21 18:57:03 UTC (rev 419)
+++ trunk/debian/local/Xsession.options.5 2003-08-21 21:20:05 UTC (rev 420)
@@ -1,4 +1,4 @@
-.\" This manpage is copyright (C) 1998,1999,2000,2001 Branden Robinson
+.\" This manpage is copyright 1998--2001,2003 Branden Robinson
.\" <branden@debian.org>.
.\"
.\" This is free software; you may redistribute it and/or modify
@@ -15,7 +15,9 @@
.\" the Debian operating system, in /usr/share/common-licenses/GPL; if
.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
.\" Suite 330, Boston, MA 02111-1307 USA
-.TH Xsession.options 5 "2003\-08\-05" "Debian GNU/Linux"
+.\"
+.\" $Id$
+.TH Xsession.options 5 "2003\-08\-21" "Debian GNU/Linux"
.SH NAME
Xsession.options \- configuration options for
.BR Xsession(5)
@@ -52,11 +54,11 @@
.IP allow\-user\-xsession
If users have an executable file called
.I .Xsession
-in their home directories, it is used as the startup program for the X
+in their home directories, it can be used as the startup program for the X
session (see
.BR Xsession (5)).
-If the file is present not executable, it is still used, but assumed to be
-a Bourne shell script, and executed with
+If the file is present not executable, it may still be used, but is assumed
+to be a Bourne shell script, and executed with
.BR sh (1).
.IP use\-ssh\-agent
If the
Property changes on: trunk/debian/local/Xsession.options.5
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: