X Strike Force XFree86 SVN commit: r1964 - in trunk/debian: . local
Author: branden
Date: 2004-10-18 12:48:47 -0500 (Mon, 18 Oct 2004)
New Revision: 1964
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/local/xdm.options
trunk/debian/local/xdm.options.5
Log:
Copyedit and improve xdm.options(5) manpage.
Set svn:keywords to Id on xdm.options itself.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-18 16:35:23 UTC (rev 1963)
+++ trunk/debian/CHANGESETS 2004-10-18 17:48:47 UTC (rev 1964)
@@ -174,4 +174,7 @@
diagnosing this bug. (Closes: #275710)
1963
+Copyedit and improve xdm.options(5) manpage.
+ 1964
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-18 16:35:23 UTC (rev 1963)
+++ trunk/debian/changelog 2004-10-18 17:48:47 UTC (rev 1964)
@@ -78,6 +78,8 @@
templates don't exist to be unregistered. Thanks to Florian Laws for
diagnosing this bug. (Closes: #275710)
+ * Copyedit and improve xdm.options(5) manpage.
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -148,7 +150,7 @@
+ Set UseBios default to "no" for PROSAVAGE_DDR and PROSAVAGE_DDRK, as
described at <URL: http://www.probo.com/timr/savage40.html >.
- -- Branden Robinson <branden@debian.org> Mon, 18 Oct 2004 11:34:10 -0500
+ -- Branden Robinson <branden@debian.org> Mon, 18 Oct 2004 12:47:10 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Property changes on: trunk/debian/local/xdm.options
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/xdm.options.5
===================================================================
--- trunk/debian/local/xdm.options.5 2004-10-18 16:35:23 UTC (rev 1963)
+++ trunk/debian/local/xdm.options.5 2004-10-18 17:48:47 UTC (rev 1964)
@@ -15,7 +15,7 @@
.\" 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 xdm.options 5 "2004\-04\-15" "Debian Project"
+.TH xdm.options 5 "2004\-10\-18" "Debian Project"
.SH NAME
xdm.options \- configuration options for X display manager
.SH DESCRIPTION
@@ -26,65 +26,91 @@
.PP
.I /etc/X11/xdm/xdm.options
may contain comments, which begin with a hash mark and end at the next
-newline, just like comments in shell scripts. The rest of the file
-consists of options which are expressed as words separated by hyphens, with
-only one option per line. If an option is present with the \(oqno\-\(cq
-prefix, or absent, it is disabled, otherwise it is considered enabled.
+newline, just like comments in shell scripts.
+The rest of the file consists of options which are expressed as words
+separated by hyphens, with only one option per line.
+Options are enabled by simply placing them in the file; they are disabled
+by prefixing the option name with \(oqno\-\(cq.
.PP
Available options are:
.TP
.B ignore\-nologin
-Normally, the contents of the /etc/nologin file will be displayed using
+Normally, if the
+.BR nologin (5)
+file exists, its contents will be displayed using
.BR xmessage (1x)
-(if
-.B xmessage
-is available), and the user will be returned to the xdm login screen after
-the xmessage is dismissed. If this option is enabled, xdm starts a session
-as usual (after the xmessage is dismissed, if xmessage is available).
+(if xmessage is available), and the user will be returned to the xdm login
+screen after xmessage is dismissed instead of starting the X session.
+If this option is enabled, xdm starts a session as usual (after xmessage is
+dismissed, if xmessage is available and the
+.I nologin
+file exists).
+This behavior is disabled by default:
+.I nologin
+is heeded, not ignored.
.TP
.B restart\-on\-upgrade
-Enable this option with caution on \(oqproduction\(cq machines; it causes
-the xdm daemon to be stopped and restarted on upgrade, even if the process
-has children (which means it is managing X sessions). Typically when a
+.B Enable this option with caution on \(oqproduction\(cq machines;
+it causes the daemon to be stopped and restarted on upgrade, even if the
+process has children (which means it is managing X sessions).
+Typically when a
package that contains a daemon is being installed or upgraded, its
maintainer scripts stop a running daemon process before installing the new
-binary, and restart it after the new binary is installed. Stopping xdm
-causes immediate termination of any sessions it manages; in some situations
-this could be an unwelcome surprise (for instance, for remote xdm users who
-had no idea the administrator was performing system maintenance). On the
-other hand, for machines that stay up for long periods of time, leaving the
-old daemon running can be a bad idea if the new version has, for instance,
-a fix for a security vulnerability (overwriting xdm's executable on the
-file system has no effect on the copy of xdm in memory). The xdm
-pre\-removal script checks to see if the xdm process has any children; if
-it does, it is possible that someone's session would be killed by stopping
-xdm, so a warning is issued and an opportunity to abort the upgrade of xdm
-is provided. Furthermore, restarting xdm on upgrade can be surprising,
-because a locally\-managed X server can change the active VT even while
-other packages are continuing to upgrade. If, by intent or accident, the X
-server does not honor the key sequence to switch VTs back to a virtual
-console, this can be undesirable. If this option is disabled (the Debian
-default), xdm will be not be stopped or started during an upgrade of its
-package; the administrator will have to do so by hand (with \(oqinvoke-rc.d
-xdm restart\(cq, or by rebooting the system) before the newly installed xdm
-binary is used.
+binary, and restart it after the new binary is installed.
+Stopping xdm causes immediate termination of any sessions it manages; in
+some situations this could be an unwelcome surprise (for instance, for
+remote xdm users who had no idea the administrator was performing system
+maintenance).
+On the other hand, for machines that stay up for long periods of time,
+leaving the old daemon running can be a bad idea if the new version has,
+for instance, a fix for a security vulnerability (overwriting xdm's
+executable on the file system has no effect on the copy of xdm in memory).
+The xdm pre\-removal script checks to see if the xdm process has any
+children; if it does, it is possible that someone's session would be killed
+by stopping xdm, so a warning is issued and an opportunity to abort the
+upgrade of xdm is provided.
+Furthermore, restarting xdm on upgrade can be surprising, because a
+locally\-managed X server can change the active VT even while other
+packages are continuing to upgrade.
+If, by intent or accident, the X server does not honor the key sequence to
+switch VTs back to a virtual console, this can be undesirable.
+This behavior is disabled by default: xdm will be not be stopped or started
+during an upgrade of its package; the administrator will have to do so by
+hand (with \(oqinvoke-rc.d xdm restart\(cq, or by rebooting the system)
+before the newly installed xdm binary is used.
.TP
.B start\-on\-install
-Enable this option with caution; it causes the xdm daemon to be started
-immediately after the package is installed. See the above entry regarding
+.B Enable this option with caution;
+it causes the xdm daemon to be started
+immediately after the package is installed.
+See the above entry regarding
.B restart\-on\-upgrade
for other caveats regarding the consequences of starting the xdm daemon
-during package management. If this option is disabled (the Debian
-default), xdm will not be started when it is installed. Changing this
-setting can affect future installs if the package is removed, but not
-purged (which removes \(oqconffiles\(cq, including
+during package management.
+This behavior is disabled by default: xdm will not be started when it is
+installed.
+Changing this setting can affect future installs if the package is removed,
+but not purged (which removes \(oqconffiles\(cq, including
.IR xdm.options ).
.TP
.B use\-sessreg
-If this option is enabled (the Debian default), the sessreg program will be
-invoked to register X sessions managed by xdm in the utmp and wtmp files.
-Otherwise, it is not, and the utmp and wtmp files will have no record of
-xdm sessions.
+This option causes the
+.I /etc/X11/xdm/Xsetup
+and
+.I /etc/X11/xdm/Xreset
+scripts to call the
+.BR sessreg (1x)
+program to register X sessions managed by xdm in the
+.BR utmp (5)
+and
+.BR wtmp (5)
+files.
+If it is disabled, the
+.I utmp
+and
+.I wtmp
+files will have no record of xdm sessions.
+This behavior is enabled by default; sessreg will be used.
.PP
Users of older versions of the Debian system should note that the
\(oqrun\-xconsole\(cq option has been removed. Shell scripts named
@@ -92,12 +118,15 @@
and
.I /etc/X11/xdm/Xreset
can be edited to disable or modify the running of xconsole on the xdm
-greeter screen; see the
-.B xdm
-manual page for more information.
+greeter screen; see
+.BR xdm (1x)
+for more information.
.SH AUTHOR
This manpage was written by Branden Robinson for the Debian Project.
.SH SEE ALSO
.BR sessreg (1x),
.BR xmessage (1x),
-.BR xdm (1x)
+.BR xdm (1x),
+.BR nologin (5),
+.BR utmp (5),
+.BR wtmp (5)
Reply to: