X Strike Force XFree86 SVN commit: r2002 - in trunk/debian: . local
Author: branden
Date: 2004-10-31 02:25:02 -0500 (Sun, 31 Oct 2004)
New Revision: 2002
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/local/XF86Config.7
trunk/debian/local/Xsession.5
trunk/debian/local/Xsession.options.5
trunk/debian/local/Xwrapper.config.5
trunk/debian/local/dexconf.1
trunk/debian/local/update-fonts-alias.8
trunk/debian/local/update-fonts-dir.8
trunk/debian/local/update-fonts-scale.8
trunk/debian/local/xdm.options.5
trunk/debian/local/xfs.options.5
trunk/debian/local/xvfb-run.1
Log:
Tidy up and make consistent all Debian-specific manpages.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/CHANGESETS 2004-10-31 07:25:02 UTC (rev 2002)
@@ -174,9 +174,6 @@
diagnosing this bug. (Closes: #275710)
1963
-Copyedit and improve xdm.options(5) manpage.
- 1964
-
Stop manually compressing the plain text version of the Debian X FAQ;
dh_compress will take care of that. Tell dh_compress to avoid compressing
the XHTML version of the FAQ.
@@ -221,4 +218,7 @@
(Closes: #278714)
1973
+Tidy up and make consistent all Debian-specific manpages.
+ 1964, 2002
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/changelog 2004-10-31 07:25:02 UTC (rev 2002)
@@ -78,8 +78,6 @@
templates don't exist to be unregistered. Thanks to Florian Laws for
diagnosing this bug. (Closes: #275710)
- * Copyedit and improve xdm.options(5) manpage.
-
* Stop manually compressing the plain text version of the Debian X FAQ;
dh_compress will take care of that. Tell dh_compress to avoid compressing
the XHTML version of the FAQ.
@@ -111,6 +109,8 @@
xvfb-run to be misparsed if they contained whitespace. Thanks, Jason!
(Closes: #276415)
+ * Tidy up and make consistent all Debian-specific manpages.
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -186,7 +186,7 @@
* Fix nl_BE locale alias information.
- -- Branden Robinson <branden@debian.org> Fri, 29 Oct 2004 06:39:04 -0500
+ -- Branden Robinson <branden@debian.org> Sun, 31 Oct 2004 02:22:48 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Modified: trunk/debian/local/XF86Config.7
===================================================================
--- trunk/debian/local/XF86Config.7 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/XF86Config.7 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,5 +1,7 @@
-.\" This manpage is copyright (C) 2001 Branden Robinson <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 2001, 2002, 2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This is free software; you may 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,
@@ -14,15 +16,90 @@
.\" 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 XF86Config 7 "2002\-10\-24" "Debian GNU/Linux"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH XF86Config 7 "2004\-10\-31" "Debian Project"
.SH NAME
XF86Config \- XFree86 X server configuration
.SH DESCRIPTION
The Debian system supports simultaneous installation of XFree86 version 3
-and version 4 servers. To accomodate this simultaneity, the names of
-several utilities and manual pages had to be changed from their upstream
-defaults.
-.SS "XFree86 3.x Server Configuration"
+and version 4 servers.
+To accomodate this simultaneity, the names of several utilities and manual
+pages had to be changed from their upstream defaults.
+.SS "XFree86 4.\fIx\fB Server Configuration"
+There is only one server package for XFree86
+.RI 4. x ,
+.BR xserver\-xfree86 ,
+corresponding to the single server binary.
+(Modules supporting various hardware are loaded on demand by the server,
+and most XFree86 server modules that exist are available as part of the
+package.)
+.PP
+Information about the XFree86 X server is available in the
+.BR XFree86 (1x)
+manual page.
+The format of the version 4 server configuration file is given in
+.BR XF86Config\-4 (5x),
+and the upstream, text\-based configuration tool for the version 4 server is
+documented in
+.BR xf86config (1x),
+Note, however, that usage of the
+.BR debconf (7)
+configuration process is preferred.
+To reconfigure the X server using
+.BR debconf ,
+simply run
+.RS
+.BR "dpkg\-reconfigure xserver\-xfree86" .
+.RE
+.PP
+.B In the Debian system, the only supported location for the XFree86
+.BI 4. x
+.B server configuration file is
+.IB /etc/X11/XF86Config\-4 .
+The XFree86 server program will look in a variety of locations, but
+.I /etc/X11/XF86Config\-4
+is the only one supported by Debian for xserver\-xfree86.
+The reason for this strict policy is to reduce confusion.
+.PP
+When reporting bugs to the Debian Bug Tracking System in xserver\-xfree86,
+be sure to include a copy of your
+.I /etc/X11/XF86Config\-4
+and
+.I /var/log/XFree86.0.log
+(or whichever log file the X server used \(em see
+.BR XFree86 (1x))
+files in the bug report.
+Many problems with the X server are the result of poor configuration.
+Furthermore, this information aids the Debian Developers in determining
+your hardware scenario.
+.SS "XFree86 3.\fIx\fB Server Configuration"
+.B Note that as of September 2003, packages of XFree86
+.BI 3. x
+.B are no longer supported by the Debian Project.
+This information in this section is provided as a convenience for users who
+must, for whatever reason, keep XFree86
+.RI 3. x
+packages installed on their systems.
+Please note that the XFree86
+.RI 3. x
+codebase is not maintained by anyone, even for security fixes.
+If you run XFree86
+.RI 3. x
+on your system, you may be vulnerable to CAN\-2002\-0164, CAN\-2003\-0063,
+CAN\-2003\-0071, CAN\-2003\-0690, CAN\-2003\-0730, CAN\-2004\-0083,
+CAN\-2004\-0084, CAN\-2004\-0093, CAN\-2004\-0094, CAN\-2004\-0106,
+CAN\-2004\-0687, CAN\-2004\-0688, and CAN\-2004\-0914 (as indexed by the
+.URL "http://cve.mitre.org/cve/"; "MITRE CVE project" ),
+among other flaws.
+.PP
Version 3 XFree86 X server packages include:
.TP
.B xserver\-3dlabs
@@ -61,25 +138,30 @@
.PP
Information common to all version 3 XFree86 X servers is available in the
.BR XFree86\-v3 (1x)
-manual page. The format of the version 3 server configuration file is
-given in
+manual page.
+The format of the version 3 server configuration file is given in
.BR XF86Config\-v3 (5x),
and the upstream, text\-based configuration tool for version 3 servers is
documented in
.BR xf86config\-v3 (1x).
-Note, however, that usage of the debconf configuration process is
-preferred. To reconfigure the X server using debconf, simply run:
-.PP
-dpkg\-reconfigure
+Note, however, that usage of the
+.BR debconf (7)
+configuration process is preferred.
+To reconfigure the X server using
+.BR debconf ,
+simply run
+.RS
+.B dpkg\-reconfigure
.I package
-.PP
-Where
+.RE
+where
.I package
is one of the above listed packages (whichever is appropriate for your
hardware).
.PP
-\fBIn the Debian system, the only supported location for the XFree86 3.x
-server configuration file is\fp
+.B In the Debian system, the only supported location for the XFree86
+.BI 3. x
+.B server configuration file is
.IB /etc/X11/XF86Config .
The X server programs will look in a variety of locations, but
.I /etc/X11/XF86Config
@@ -89,65 +171,29 @@
When reporting bugs to the Debian Bug Tracking System in any of the above
listed packages, be sure to include a copy of your
.I /etc/X11/XF86Config
-file in the bug report. If possible, please also include the X server
-ouput, which can be preserved by redirecting to a file. For instance:
+file in the bug report.
+If possible, please also include the X server ouput, which can be preserved
+by redirecting to a file.
+For instance:
.RS
-startx > $HOME/xserver.log 2>&1
+.B startx >$HOME/xserver.log 2>&1
.RE
Many problems with the X server are the result of poor configuration.
Furthermore, this information aids the Debian Developers in determining
your hardware scenario.
.PP
-Finally, keep in mind that most modern hardware is better supported by the
-version 4 XFree86 server, packaged as xserver\-xfree86. The version 3
-servers are no longer maintained upstream, and it is unlikely that bugs in
-those servers will ever be fixed. (Debian packaging issues will continue
-to be addressed by the Debian package maintainer.)
-.PP
-For information about the status of support for various video chipsets in
-XFree86 version 4, see <http://www.xfree86.org/current/Status.html>.
-Keep in mind that it takes time for new versions of XFree86 to be packaged
-for Debian; see <http://people.debian.org/~branden/xsf.html> for packaging
-progress reports.
-.SS "XFree86 4.x Server Configuration"
-There is only one server package for XFree86 4.x,
-.BR xserver\-xfree86 ,
-corresponding to the
-single server binary. (Modules supporting various hardware are loaded on
-demand by the server, and most XFree86 server modules that exist are
-available as part of the package.)
-.PP
-Information about the XFree86 X server is available in the
-.BR XFree86 (1x)
-manual page. The format of the version 4 server configuration file is
-given in
-.BR XF86Config\-4 (5x),
-and the upstream, text\-based configuration tool for the version 4 server is
-documented in
-.BR xf86config (1x),
-Note, however, that usage of the debconf configuration process is
-preferred. To reconfigure the X server using debconf, simply run:
-.PP
-dpkg\-reconfigure xserver\-xfree86
-.PP
-\fBIn the Debian system, the only supported location for the XFree86 4.x
-server configuration file is\fP
-.IB /etc/X11/XF86Config\-4 .
-The XFree86 server program will look in a variety of locations, but
-.I /etc/X11/XF86Config\-4
-is the only one supported by Debian for xserver\-xfree86. The reason for
-this strict policy is to reduce confusion.
-.PP
-When reporting bugs to the Debian Bug Tracking System in xserver\-xfree86,
-be sure to include a copy of your
-.I /etc/X11/XF86Config\-4
-and
-.I /var/log/XFree86.0.log
-(or whichever log file the X server used \- see
-.BR XFree86 (1x))
-files in the bug report. Many problems with the X server are the result of
-poor configuration. Furthermore, this information aids the Debian
-Developers in determining your hardware scenario.
+Please note that most modern hardware is better supported by the version
+.RI 4. x
+release series of XFree86.
+The XFree86
+.RI 4. x
+X server is packaged as xserver\-xfree86.
+The version
+.RI 3. x
+XFree86 X servers are no longer maintained upstream, and it is unlikely
+that bugs in those servers will ever be fixed.
+.SH AUTHOR
+Branden Robinson wrote this manual page.
.SH "SEE ALSO"
.BR XF86Config\-4 (5x),
.BR XF86Config\-v3 (5x),
@@ -155,4 +201,6 @@
.BR XFree86\-v3 (1x),
.BR xf86config (1x),
.BR xf86config\-v3 (1x),
+.BR debconf (7),
.BR dpkg\-reconfigure (8)
+.\" vim:set et tw=80:
Property changes on: trunk/debian/local/XF86Config.7
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/Xsession.5
===================================================================
--- trunk/debian/local/Xsession.5 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/Xsession.5 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,6 +1,7 @@
-.\" This manpage is copyright 1998--2004 Branden Robinson
-.\" <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 1998--2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This is free software; you may 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,
@@ -15,9 +16,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
-.\"
-.\" $Id$
-.TH Xsession 5 "2004\-06\-03" "Debian Project"
+.TH Xsession 5 "2004\-10\-31" "Debian Project"
.SH NAME
Xsession \- initialize X session
.SH SYNOPSIS
@@ -36,8 +35,8 @@
(Some display managers only invoke
.I Xsession
when specifically directed to so by the user; see the documentation for
-your display manager to find out more.) Administrators unfamilar with the
-Bourne shell will likely find the
+your display manager to find out more.)
+Administrators unfamilar with the Bourne shell will likely find the
.BR Xsession.options (5)
configuration file easier to deal with than
.I Xsession
@@ -56,55 +55,66 @@
.I Xsession
is used by both common methods of starting the X Window System,
.B xdm
-and
+(or another X display manager) and
.BR startx .
To change this for
.BR xdm,
edit the \(oqDisplayManager*session\(cq resource in the
.I /etc/X11/xdm/xdm\-config
-file; for
-.BR startx ,
-replace the contents of the
+file \(em for other display managers, consult their documentation.
+To stop
+.B startx
+from using
+.I Xsession
+by default, replace the contents of the
.I /etc/X11/xinit/xinitrc
file.
.PP
The
.I Xsession
script is quite flexible, and extensive customization of the X startup
-procedure is possible without modifying the script itself. See
-\(lqCUSTOMIZING THE STARTUP PROCEDURE\(rq below.
+procedure is possible without modifying the script itself.
+See \(lqCUSTOMIZING THE STARTUP PROCEDURE\(rq below.
.SS "SESSION TYPES"
.I Xsession
may optionally be passed a single argument indicating the type of X
-session to be started. It is up to the display manager to set the
-argument, and there is no way to pass
+session to be started.
+It is up to the display manager to set the argument, and there is no way to
+pass
.I Xsession
an argument from
.B startx
or
.BR xinit .
By default, three different arguments are supported:
-.IP failsafe
-invokes a session consisting solely of
-.I /usr/bin/x\-terminal\-emulator
-(no window manager is launched). If the x\-terminal\-emulator program cannot
-be found, the session exits. The \(oqfailsafe\(cq argument is ignored if
-there is no \(oqallow\-failsafe\(cq line in
+.TP
+.B failsafe
+invokes a session consisting solely of an
+.BR x\-terminal\-emulator (1)
+(no window manager is launched).
+If the
+.B x\-terminal\-emulator program cannot
+be found, the session exits.
+The \(oqfailsafe\(cq argument is ignored if there is no
+\(oqallow\-failsafe\(cq line in
.IR Xsession.options .
-.IP default
+.TP
+.B default
produces the same behavior as if no session type argument had been given at
all.
.TP
.I program
starts
.I program
-if it can be found in the $PATH. This is usually a session manager or a
-very featureful window manager. If
+if it can be found in the $PATH.
+This is usually a session manager or a very featureful window manager.
+If
.I program
is not found, the
.I Xsession
-script proceeds with its default behavior. This argument is ignored if
-there is no \(oqallow\-user\-xsession\(cq line in
+script proceeds with its default behavior.
+This argument is ignored if there is no \(oqallow\-user\-xsession\(cq line
+in
.IR Xsession.options .
(If the administrator does not want users writing their own
.I .Xsession
@@ -113,72 +123,80 @@
.SS "DEFAULT STARTUP PROCEDURE"
Initially,
.I Xsession
-performs some housekeeping. It declares a set of built\-in functions (see
+performs some housekeeping.
+It declares a set of built\-in functions (see
\(lqBUILT\-IN SHELL FUNCTIONS\(rq below) and variables, then attempts to
create a log file for the X session, or append to an existing one.
Historically this is called an \(oqerror\(cq file, but it catches all sorts
of diagnostic output from various X clients run in the user's session, not
-just error messages. If it is impossible to write to an error file, the
-script (and thus the X session) aborts. For convenience, once the error
-file is successfully opened,
+just error messages.
+If it is impossible to write to an error file, the script (and thus the X
+session) aborts.
+For convenience, once the error file is successfully opened,
.I Xsession
reports the fact that the session has started, the invoking username, and
-the date to the error file. This makes it easier to discern which X
-session produced a particular line of output in the file.
+the date to the error file.
+This makes it easier to discern which X session produced a particular line
+of output in the file.
.PP
.I Xsession
next confirms that its script directory,
.IR Xsession.d ,
-exists. If it does not, the script aborts. After the script directory is
-confirmed to be present,
+exists.
+If it does not, the script aborts.
+After the script directory is confirmed to be present,
.I Xsession
uses an internal implementation of
.BR run\-parts (1)
to identify files in that directory that should be sourced (executed) in
-the shell's environment. Only files named in a certain way are sourced;
-see the
+the shell's environment.
+Only files named in a certain way are sourced; see the
.B run\-parts
-manual page for a description of valid characters in the filename. (This
-restriction enables the administrator to move experimental or problematic
-files out of the way of the script but keep them in an obvious place, for
-instance by renaming them with \(oq.old\(cq or \(oq.broken\(cq appended to
-the filename.)
+manual page for a description of valid characters in the filename.
+(This restriction enables the administrator to move experimental or
+problematic files out of the way of the script but keep them in an obvious
+place, for instance by renaming them with \(oq.old\(cq or \(oq.broken\(cq
+appended to the filename.)
.SS "SUPPLIED SCRIPTS"
Five shell script portions are supplied by default to handle the details of
the session startup procedure.
.TP
.I /etc/X11/Xsession.d/20xfree86\-common_process\-args
-Arguments are processed as described in \(lqSESSION TYPES\(rq above. The
-startup program, if one is identified at this point, is merely stored for
-later reference, and not immediately executed.
+Arguments are processed as described in \(lqSESSION TYPES\(rq above.
+The startup program, if one is identified at this point, is merely stored
+for later reference, and not immediately executed.
.TP
.I /etc/X11/Xsession.d/30xfree86\-common_xresources
-X resources are merged. The internal
+X resources are merged.
+The internal
.B run\-parts
is again used, this time to identify files in the
.I /etc/X11/Xresources
-directory that should be processed with \(oqxrdb \-merge\(cq. Next, if the
-line \(oqallow\-user\-resources\(cq is present in
+directory that should be processed with \(oqxrdb \-merge\(cq.
+Next, if the line \(oqallow\-user\-resources\(cq is present in
.IR Xsession.options ,
the user's
.I $HOME/.Xresources
file is merged in the same way.
.TP
.I /etc/X11/Xsession.d/50xfree86\-common_determine\-startup
-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 a program or failsafe argument was given and is
-allowed (see above), it is used as the controlling process. Otherwise, if
-the line \(oqallow\-user\-xsession\(cq is present in
+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 a program or failsafe argument was given and is allowed (see above), it
+is used as the controlling process.
+Otherwise, if the line \(oqallow\-user\-xsession\(cq is present in
.IR Xsession.options ,
-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:
+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
-(note the difference in case). The first one found is used. If the script
-is not executable, it is marked to be executed with the Bourne shell
-interpreter,
+(note the difference in case).
+The first one found is used.
+If the script is not executable, it is marked to be executed with the
+Bourne shell interpreter,
.BR sh .
Finally, if none of the above succeeds, the following programs are searched
for:
@@ -186,24 +204,28 @@
.IR /usr/bin/x\-window\-manager ,
and
.IR /usr/bin/x\-terminal\-emulator .
-The first one found is used. If none are found,
+The first one found is used.
+If none are found,
.I Xsession
aborts with an error.
.TP
.I /etc/X11/Xsession.d/90xfree86\-common_ssh\-agent
Start
.BR ssh\-agent (1),
-if needed. If the line \(oquse\-ssh\-agent\(cq is present in
+if needed.
+If the line \(oquse\-ssh\-agent\(cq is present in
.IR Xsession.options ,
and no SSH agent process appears to be running already,
.B ssh\-agent
is marked to be used to execute the startup program determined previously.
-.I Note: this functionality may move to the ssh package in the future.
+.B Note:
+this functionality may move to the ssh package in the future.
.TP
.I /etc/X11/Xsession.d/99xfree86\-common_start
-Start the X session. The startup program is executed, inside a Bourne
-shell if it is not executable, and inside an ssh\-agent if necessary. The
-shell's
+Start the X session.
+The startup program is executed, inside a Bourne shell if it is not
+executable, and inside an ssh\-agent if necessary.
+The shell's
.B exec
command is used to spare a slot in the process table.
.SS "CUSTOMIZING THE STARTUP PROCEDURE"
@@ -212,12 +234,14 @@
Because the order in which the various scripts in
.I /etc/X11/Xsession.d
are executed is important, files to be added to this directory should
-have a well\-formed name. The following format is recommended:
+have a well\-formed name.
+The following format is recommended:
.PP
* a two\-digit number denoting sequence;
.PP
-* the name of the package providing the script;
-.HP
+* the name of the package providing the script (or \(oqcustom\(cq for
+locally\-created scripts);
+.PP
* an underscore;
.PP
* a description of the script's basic function, using only characters allowed
@@ -252,13 +276,16 @@
described below.
.SS "BUILT\-IN SHELL FUNCTIONS"
.B message
-is used for communicating with the user. It is a wrapper for the
+is used for communicating with the user.
+It is a wrapper for the
.BR echo (1)
command and relies upon
.B echo
-for its argument processing. This function may be given an arbitrarily
-long message string, which is formatted to the user's terminal width
-(breaking lines at whitespace) and sent to standard error. If the
+for its argument processing.
+This function may be given an arbitrarily long message string, which is
+formatted to the user's terminal width (breaking lines at whitespace) and
+sent to standard error.
+If the
.I DISPLAY
environment variable is set and the
.BR xmessage (1x)
@@ -268,13 +295,13 @@
.PP
.B message_nonl
is used for communicating with the user when a trailing newline is
-undesirable; it omits a trailing newline from the message text. It
-otherwise works as
+undesirable; it omits a trailing newline from the message text.
+It otherwise works as
.BR message .
.PP
.B errormsg
-is used for indicating an error condition and aborting the script. It
-works as
+is used for indicating an error condition and aborting the script.
+It works as
.BR message ,
above, except that after displaying the message, it will exit
.I Xsession
@@ -284,15 +311,16 @@
.IR Xsession :
.TP
.B HOME
-The user's home directory; various files are searched for here.
+specifies the user's home directory; various files are searched for here.
.TP
.B TMPDIR
-Default directory for temporary files; if the standard X session error file
-cannot be opened, this variable is used to locate a place for one.
+names a default directory for temporary files; if the standard X session
+error file cannot be opened, this variable is used to locate a place for
+one.
.TP
.B COLUMNS
-Width of terminal device, in character cells. Used for formatting
-diagnostic messages.
+indicates the width of terminal device in character cells.
+This value is used for formatting diagnostic messages.
.SH "INPUT FILES"
.TP
.I /etc/X11/Xsession.d/
@@ -307,7 +335,8 @@
.I /etc/X11/Xresources/
is a directory containing files corresponding to Debian package names, each of
which contains system\-wide X resource settings for X clients from the
-corresponding package. The settings are loaded with
+corresponding package.
+The settings are loaded with
.BR "xrdb \-merge" .
Files in this directory are matched using
.BR run\-parts .
@@ -315,19 +344,20 @@
.I /etc/X11/Xsession.options
contains configuration options for the
.I /etc/X11/Xsession
-script. See
+script.
+See
.BR Xsession.options (5)
for more information.
.TP
.I $HOME/.Xresources
-contains X resources specific to the invoking user's environment. The
-settings are loaded with
+contains X resources specific to the invoking user's environment.
+The settings are loaded with
.BR "xrdb \-merge" .
Note that
.I $HOME/.Xdefaults
is a relic from X Version 10 (and X11R1) days, before app\-defaults files
-were implemented. It has been deprecated for over ten years at the time of
-this writing.
+were implemented.
+It has been deprecated for over ten years at the time of this writing.
.I .Xresources
should be used instead.
.TP
@@ -344,15 +374,20 @@
.SH "OUTPUT FILES"
.TP
.I $HOME/.xsession\-errors
-Where standard output and standard error for
+is where standard output and standard error for
.I Xsession
script and all X client processes are directed by default.
.TP
-.I $TMPDIR
-Where the X session error file is placed if
+.I $TMPDIR/filename
+is where the X session error file is placed if
.I $HOME/.xsession\-errors
-cannot be opened. The filename is provided by
+cannot be opened.
+For security reasons, the exact filename is randomly generated by
.BR tempfile (1).
+.SH AUTHORS
+Stephen Early, Mark Eichin, and Branden Robinson developed Debian's X
+session handling scripts.
+Branden Robinson wrote this manual page.
.SH "SEE ALSO"
.BR Xsession.options (5),
.BR X (7x),
@@ -365,8 +400,4 @@
.BR xmodmap (1x),
.BR xrdb (1x),
.BR sh (1)
-.SH AUTHOR
-.I /etc/X11/Xsession
-and its associated files in
-.I /etc/X11/Xsession.d
-were written by Stephen Early, Mark Eichin, and Branden Robinson.
+.\" vim:set et tw=80:
Modified: trunk/debian/local/Xsession.options.5
===================================================================
--- trunk/debian/local/Xsession.options.5 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/Xsession.options.5 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,6 +1,7 @@
-.\" This manpage is copyright 1998--2001,2003 Branden Robinson
-.\" <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 1998--2001, 2003--2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This is free software; you may 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,
@@ -15,43 +16,49 @@
.\" 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
-.\"
-.\" $Id$
-.TH Xsession.options 5 "2003\-10\-07" "Debian GNU/Linux"
+.TH Xsession.options 5 "2004\-10\-31" "Debian Project"
.SH NAME
Xsession.options \- configuration options for
-.BR Xsession(5)
+.BR Xsession (5)
.SH DESCRIPTION
.I /etc/X11/Xsession.options
contains a set of flags that determine some of the behavior of the
.BR Xsession (5)
Bourne shell
.RB ( sh (1))
-script. See the
+script.
+See the
.BR Xsession (5)
manpage for further information.
.PP
.I Xsession.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 "no\-"
-prefix, or absent, it is disabled, otherwise it is considered enabled.
+may contain comments, which begin with a hash mark (\(oq#\(cq) 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.
+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:
-.IP allow\-failsafe
-If the "failsafe" argument is passed to the
+.TP
+.B allow\-failsafe
+If the \(oqfailsafe\(cq argument is passed to the
.I Xsession
script, an emergency X session is invoked, consisting of only an
.BR x\-terminal\-emulator (1)
-in the upper\-left hand corner of the screen. No window manager is started.
-If an x\-terminal\-emulator is not available, the session exits immediately.
-.IP allow\-user\-resources
+in the upper\-left hand corner of the screen.
+No window manager is started.
+If an
+.B x\-terminal\-emulator
+program is not available, the session exits immediately.
+.TP
+.B allow\-user\-resources
If users have a file called
.I .Xresources
in their home directories, these resources will be merged with the default
-resources when they log in.
-.IP allow\-user\-xsession
+X resources when they log in.
+.TP
+.B allow\-user\-xsession
If users have an executable file called
.I .Xsession
in their home directories, it can be used as the startup program for the X
@@ -60,7 +67,8 @@
If the file is present but 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
+.TP
+.B use\-ssh\-agent
If the
.BR ssh\-agent (1)
program is available and no agent process appears to be running already,
@@ -68,12 +76,16 @@
.B ssh\-agent
with the startup command, instead of the startup command directly.
.PP
-Additional options may be supported by the local administrator. See
+All of the above options are enabled by default.
+Additional options may be supported by the local administrator.
.BR Xsession (5)
-for how this is accomplished.
+describes how this is accomplished.
+.SH AUTHORS
+Stephen Early, Mark Eichin, and Branden Robinson developed Debian's X
+session handling scripts.
+Branden Robinson wrote this manual page.
.SH SEE ALSO
.BR Xsession (5),
.BR ssh\-agent (1),
.BR x\-terminal\-emulator (1)
-.SH AUTHOR
-This manpage was written by Branden Robinson for Debian GNU/Linux.
+.\" vim:set et tw=80:
Modified: trunk/debian/local/Xwrapper.config.5
===================================================================
--- trunk/debian/local/Xwrapper.config.5 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/Xwrapper.config.5 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,4 +1,6 @@
-.\" This manpage is copyright (C) 2000 Progeny Linux Systems, Inc.
+.\" $Id$
+.\"
+.\" Copyright 2000, 2003, 2004 Progeny Linux Systems, Inc.
.\" Author: Branden Robinson <branden@progeny.com>
.\"
.\" This is free software; you may redistribute it and/or modify
@@ -15,7 +17,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 Xwrapper.config 5 "2003\-08\-05" "Debian Project"
+.TH Xwrapper.config 5 "2004\-10\-31" "Debian Project"
.SH NAME
Xwrapper.config \- configuration options for X server wrapper
.SH DESCRIPTION
@@ -25,66 +27,86 @@
.IR /usr/X11R6/bin/X .
The purpose of the wrapper, and of this configuration file, is twofold.
.PP
-Firstly, it is intended to implement sound security practices. Since the X
-server requires superuser privileges, it may be unwise to permit just any user
-on the system to execute it. Even if the X server is not exploitable in the
-sense of permitting ordinary users to gain elevated privileges, a
-poorly\-written or insufficiently\-tested hardware driver for the X server may
-cause bus lockups and freeze the system, an unpleasant experience for anyone
-using it at the time.
+Firstly, it is intended to implement sound security practices.
+Since the X server requires superuser privileges, it may be unwise to
+permit just any user on the system to execute it.
+Even if the X server is not exploitable in the sense of permitting ordinary
+users to gain elevated privileges, a poorly\-written or
+insufficiently\-tested hardware driver for the X server may cause bus
+lockups and freeze the system, an unpleasant experience for anyone using it
+at the time.
.PP
Secondly, a wrapper is a convenient place to set up an execution
environment for the X server distinct from the configurable parameters
of the X server itself.
.PP
.B Xwrapper.config
-may be edited by hand, but it is typically configured via debconf, the
-Debian configuration tool. The X server wrapper is part of the
+may be edited by hand, but it is typically configured via
+.BR debconf (7),
+the Debian configuration tool.
+The X server wrapper is part of the
.I xserver\-common
-Debian package, therefore the parameters of
+Debian package; therefore, the parameters of
.B Xwrapper.config
may be changed with the command
-.IR "dpkg\-reconfigure xserver\-common" .
+.RS
+.BR "dpkg\-reconfigure xserver\-common" .
+.RE
See
-.IR dpkg\-reconfigure (8)
+.BR dpkg\-reconfigure (8)
for more information.
.PP
The format of
.B Xwrapper.config
is a text file containing a series of lines of the form
.TP
-.IR name = value
+.IB name = value
.PP
where
.I name
is a variable name containing any combination of numbers, letters, or
underscore (_) characters, and
.I value
-is any combination of letters, numbers, underscores (_), dashes (\-).
+is any combination of letters, numbers, underscores (_), or dashes (\-).
.I value
may also contain spaces as long as there is at least one character from the
-list above bounding the space(s) on both sides. Whitespace before and
-after
-.IR name , value ,
-or the equals sign is legal but ignored. Any lines not matching the above
-described legal format are ignored. Note that this specification may
-change as the X server wrapper develops.
+list above bounding the space(s) on both sides.
+Whitespace before and after
+.IR name ,
+.IR value ,
+or the equals sign is legal but ignored.
+Any lines not matching the above described legal format are ignored.
+Note that this specification may change as the X server wrapper develops.
.PP
Available options are:
-.IP allowed_users
+.TP
+.B allowed_users
may be set to one of the following values:
-.BR rootonly , console , anybody .
-"rootonly" indicates that only the root user may start the X server;
-"console" indicates that root, or any user whose controlling TTY is a
-virtual console, may start the X server; and "anybody" indicates that any
-user may start the X server.
-.IP nice_value
-may be any integer in the interval [\-20,19]. This is used to set the
-executing X server's process priority. See
-.IR nice (1).
+.BR rootonly ,
+.BR console ,
+or
+.BR anybody .
+.B rootonly
+indicates that only the root user may start the X server;
+.B console
+indicates that root, or any user whose controlling TTY is a
+virtual console, may start the X server; and
+.B anybody
+indicates that any user may start the X server.
+.TP
+.B nice_value
+may be any integer in the interval [\-20,19].
+This is used to set the executing X server's process priority.
+See
+.BR nice (1).
+.SH AUTHORS
+The X server wrapper was written by Stephen Early, Mark Eichin, and Branden
+Robinson for the Debian Project, with valuable contributions from Erik
+Troan, Topi Miettinen, and Colin Phipps.
+This manual page was written by Branden Robinson with sponsorship from
+Progeny Linux Systems.
.SH SEE ALSO
-.IR dpkg\-reconfigure (8),
-.IR nice (1)
-.SH AUTHOR
-This manpage was written by Branden Robinson for Progeny Linux Systems,
-Inc., and Debian GNU/Linux.
+.BR debconf (7),
+.BR dpkg\-reconfigure (8),
+.BR nice (1)
+.\" vim:set et tw=80:
Property changes on: trunk/debian/local/Xwrapper.config.5
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/dexconf.1
===================================================================
--- trunk/debian/local/dexconf.1 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/dexconf.1 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,9 +1,8 @@
-.\" This manpage is copyright (C) 2000, 2001, 2003, 2004 Progeny Linux
-.\" Systems, Inc.
+.\" $Id$
+.\"
+.\" Copyright 2000, 2001, 2003, 2004 Progeny Linux Systems, Inc.
.\" Author: Branden Robinson <branden@progeny.com>
.\"
-.\" $Id$
-.\"
.\" This is free software; you may 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,
@@ -18,7 +17,16 @@
.\" 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 dexconf 1 "2004\-08\-21" "Debian Project"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH dexconf 1 "2004\-10\-31" "Debian Project"
.SH NAME
dexconf \- generate XFree86 X server configuration file from debconf data
.SH SYNOPSIS
@@ -98,19 +106,19 @@
If not set,
.I /tmp
is used as the parent of the scratch directory.
-.SH OUTPUT FILES
+.SH "OUTPUT FILES"
.TP
.I /etc/X11/XF86Config\-4
-Configuration file for the XFree86
+is the configuration file for the XFree86
.RI 4. x
X server.
.SH DIAGNOSTICS
.B dexconf
-produces several diagnostic messages if it encounters an error condition.
+produces diagnostic messages upon encountering various error conditions.
These messages are prefixed with the name of the command and a colon; for
example:
.RS
-.B "dexconf: error encountered"
+.BI "dexconf: " message
.RE
A list of diagnostic messages currently issued by
.B dexconf
@@ -122,9 +130,10 @@
.BR \-f ,
.B \-\-format
option.
-See the \(oqHISTORY\(cq section below.
+See the \(lqHISTORY\(rq section below.
.TP
-.BI "cannot create temporary work directory; " dirname " does not exist or is not a directory"
+.BI "cannot create temporary work directory; " dirname " does not exist or is\
+\& not a directory"
.B
dexconf
was unable to create a scratch directory to work in because the parent
@@ -137,7 +146,8 @@
.B TMPDIR
environment variable to the name of an existing directory.
.TP
-.BI "cannot create temporary work directory in " dirname "; directory not writable"
+.BI "cannot create temporary work directory in " dirname "; directory not\
+\& writable"
.B dexconf
had insufficient permissions to create a directory in
.IR dirname .
@@ -215,7 +225,7 @@
options.
.TP
.BI "unrecognized option " "option"
-An unrecongized option was specified.
+An unrecognized option was specified.
Use only the documented options.
.SH "ASYNCHRONOUS EVENTS"
.B dexconf
@@ -281,10 +291,19 @@
.I /dev/tty
might not work either.
It may be best to use a temporary file or known location.
+.SH BUGS
+See
+.URL "http://bugs.debian.org/xserver\-common"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
+.BR dexconf ,
+please see
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
+.BR reportbug (1)
+command.
.SH AUTHOR
.B dexconf
-was written by Branden Robinson for Progeny Linux Systems, Inc., and the
-Debian Project.
+was written by Branden Robinson with sponsorship from Progeny Linux Systems.
.SH "SEE ALSO"
.BR XF86Config\-4 (5x),
.BR xf86cfg (1x),
@@ -293,12 +312,4 @@
.PP
.IR "Debian X Window System Frequently Asked Questions" :
/usr/share/doc/xfree86\-common/FAQ.xhtml
-.\" OPERANDS
-.\" INPUT FILES
-.\" STDIN
-.\" STDOUT
-.\" STDERR
-.\" EXTENDED DESCRIPTION
-.\" CONSEQUENCES OF ERRORS
-.\" APPLICATION USAGE
-.\" EXAMPLES
+.\" vim:set et tw=80:
Modified: trunk/debian/local/update-fonts-alias.8
===================================================================
--- trunk/debian/local/update-fonts-alias.8 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/update-fonts-alias.8 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,5 +1,7 @@
-.\" This manpage is copyright 1999,2002 Branden Robinson <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 1999, 2002, 2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This 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, version 2.
@@ -13,7 +15,16 @@
.\" 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 update\-fonts\-alias 8 "2003\-08\-05" "Debian Project"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH update\-fonts\-alias 8 "2004\-10\-31" "Debian Project"
.SH NAME
update\-fonts\-alias \- compile fonts.alias files
.SH SYNOPSIS
@@ -32,7 +43,8 @@
containing X Window System fonts that provide aliases for their XLFD names,
but may be invoked at any time to reconstruct
.I fonts.alias
-files. For each
+files.
+For each
.IR directory ,
which is simply the last component of its path (such as \(oq75dpi\(cq or
\(oqmisc\(cq),
@@ -43,7 +55,8 @@
.IR /etc/X11/fonts/ directory / package .alias .
.PP
This enables multiple packages to provide aliases for fonts in the same
-directory. No font package actually provides the
+directory.
+No font package actually provides the
.I fonts.alias
file in the X font directory itself, so there is no danger of overwriting
one package's aliases with those of another.
@@ -75,8 +88,9 @@
in package maintainer scripts is provided in the Debian Policy Manual.
.SH OPERANDS
.B update\-fonts\-alias
-takes one or more X font directory names to operate on as operands. Only
-the final path component of the directory name should be specified; e.g.,
+takes one or more X font directory names to operate on as operands.
+Only the final path component of the directory name should be specified;
+e.g.,
.RS
.B update\-fonts\-alias 75dpi
.RE
@@ -90,8 +104,8 @@
.TP
.B error: one or more font directories must be provided
.B update\-fonts\-alias
-was invoked without operands. Supply one or more X font directory names to
-operate on.
+was invoked without operands.
+Supply one or more X font directory names to operate on.
.TP
.B error: path to X font directory must be used
A directory name was supplied that was not an X font directory name.
@@ -99,8 +113,8 @@
.SS Warnings
.TP
.BI "warning: absolute path " directory " was provided"
-Usage of absolute paths is deprecated. Use only the final component of the
-X font directory name for
+Usage of absolute paths is deprecated.
+Use only the final component of the X font directory name for
.IR directory .
.TP
.BI "warning: " directory " does not exist or is not a directory"
@@ -119,8 +133,9 @@
.B update\-fonts\-alias
experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase\-clients>. If you wish to
-report a bug in
+See
+.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
.BR update\-fonts\-alias ,
please see
.I /usr/share/doc/debian/bug\-reporting.txt
@@ -129,6 +144,7 @@
command.
.SH AUTHOR
.B update\-fonts\-alias
-was written by Branden Robinson for the Debian Project.
+was written by Branden Robinson.
.SH "SEE ALSO"
.BR mkfontdir (1x)
+.\" vim:set et tw=80:
Property changes on: trunk/debian/local/update-fonts-alias.8
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/update-fonts-dir.8
===================================================================
--- trunk/debian/local/update-fonts-dir.8 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/update-fonts-dir.8 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,5 +1,7 @@
-.\" This manpage is copyright 1999,2002 Branden Robinson <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 1999, 2002--2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This 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, version 2.
@@ -13,7 +15,16 @@
.\" 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 update\-fonts\-dir 8 "2003\-08\-05" "Debian Project"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH update\-fonts\-dir 8 "2004\-10\-31" "Debian Project"
.SH NAME
update\-fonts\-dir \- compile fonts.dir files
.SH SYNOPSIS
@@ -25,13 +36,15 @@
.I fonts.dir
file in an X font directory by invoking
.BR mkfontdir (1x)
-with the appropriate arguments. It is typically invoked only from the
+with the appropriate arguments.
+It is typically invoked only from the
post\-installation and post\-removal scripts of a
.I package
containing fonts for the X Window System, but may be invoked at any time to
reconstruct
.I fonts.dir
-files. For each
+files.
+For each
.IR directory ,
which is simply the last component of its path (such as \(oq75dpi\(cq or
\(oqmisc\(cq),
@@ -43,7 +56,8 @@
and font files found within it.
.PP
This enables multiple packages to provide names for fonts in the same
-directory. No font package actually provides the
+directory.
+No font package actually provides the
.I fonts.dir
file in the X font directory itself, so there is no danger of overwriting
one package's font names with those of another.
@@ -70,8 +84,9 @@
in package maintainer scripts is provided in the Debian Policy Manual.
.SH OPERANDS
.B update\-fonts\-dir
-takes one or more X font directory names to operate on as operands. Only
-the final path component of the directory name should be specified; e.g.,
+takes one or more X font directory names to operate on as operands.
+Only the final path component of the directory name should be specified;
+e.g.,
.RS
.B update\-fonts\-dir 75dpi
.RE
@@ -85,8 +100,8 @@
.TP
.B error: one or more font directories must be provided
.B update\-fonts\-dir
-was invoked without operands. Supply one or more X font directory names to
-operate on.
+was invoked without operands.
+Supply one or more X font directory names to operate on.
.TP
.B error: path to X font directory must be used
A directory name was supplied that was not an X font directory name.
@@ -94,8 +109,8 @@
.SS Warnings
.TP
.BI "warning: absolute path " directory " was provided"
-Usage of absolute paths is deprecated. Use only the final component of the
-X font directory name for
+Usage of absolute paths is deprecated.
+Use only the final component of the X font directory name for
.IR directory .
.TP
.BI "warning: " directory " does not exist or is not a directory"
@@ -114,8 +129,9 @@
.B update\-fonts\-dir
experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase\-clients>. If you wish to
-report a bug in
+See
+.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
.BR update\-fonts\-dir ,
please see
.I /usr/share/doc/debian/bug\-reporting.txt
@@ -124,6 +140,7 @@
command.
.SH AUTHOR
.B update\-fonts\-dir
-was written by Branden Robinson for the Debian Project.
+was written by Branden Robinson.
.SH "SEE ALSO"
.BR mkfontdir (1x)
+.\" vim:set et tw=80:
Property changes on: trunk/debian/local/update-fonts-dir.8
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/local/update-fonts-scale.8
===================================================================
--- trunk/debian/local/update-fonts-scale.8 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/update-fonts-scale.8 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,6 +1,6 @@
.\" $Id$
.\"
-.\" Copyright 1999,2002,2004 Branden Robinson <branden@debian.org>.
+.\" Copyright 1999, 2002, 2004 Branden Robinson <branden@debian.org>.
.\"
.\" This 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
@@ -15,6 +15,15 @@
.\" 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
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
.TH update\-fonts\-scale 8 "2004\-04\-11" "Debian Project"
.SH NAME
update\-fonts\-scale \- generate fonts.scale files
@@ -33,7 +42,8 @@
System whose X LFD font names are not in the font files themselves, but may
be invoked at any time to reconstruct
.I fonts.scale
-files. For each
+files.
+For each
.IR directory ,
which is either an absolute path to an X font directory or (preferably)
simply the last component of its path (such as \(oq75dpi\(cq or
@@ -48,7 +58,8 @@
is the name of the package installing the fonts.
.PP
This enables multiple packages to provide names for fonts in the same
-directory. No font package actually provides the
+directory.
+No font package actually provides the
.I fonts.scale
file in the X font directory itself, so there is no danger of overwriting
one package's font names with those of another.
@@ -81,8 +92,9 @@
in package maintainer scripts is provided in the Debian Policy Manual.
.SH OPERANDS
.B update\-fonts\-scale
-takes one or more X font directory names to operate on as operands. Only
-the final path component of the directory name should be specified; e.g.,
+takes one or more X font directory names to operate on as operands.
+Only the final path component of the directory name should be specified;
+e.g.,
.RS
.B update\-fonts\-scale 75dpi
.RE
@@ -95,13 +107,14 @@
.TP
.B COLUMNS
This variable is used to format diagnostic messages so that they fit the
-width of the terminal. If not set, a terminal width of 80 columns is
-assumed.
+width of the terminal.
+If not set, a terminal width of 80 columns is assumed.
.TP
.B DEBUG
This variable determines whether low\-level diagnostic messages are issued
-to standard error output. A null (empty) or unset value indicates that
-they are not, and a non\-null value indicates that they are.
+to standard error output.
+A null (empty) or unset value indicates that they are not, and a non\-null
+value indicates that they are.
.SH DIAGNOSTICS
.B update\-fonts\-scale
reports three types of diagnostics; errors, which are fatal and cause the
@@ -114,8 +127,8 @@
.TP
.B error: one or more font directories must be provided
.B update\-fonts\-scale
-was invoked without operands. Supply one or more X font directory names to
-operate on.
+was invoked without operands.
+Supply one or more X font directory names to operate on.
.TP
.B error: path to X font directory must be used
A directory name was supplied that was not an X font directory name.
@@ -123,8 +136,8 @@
.SS Warnings
.TP
.BI "warning: absolute path " directory " was provided"
-Usage of absolute paths is deprecated. Use only the final component of the
-X font directory name for
+Usage of absolute paths is deprecated.
+Use only the final component of the X font directory name for
.IR directory .
.TP
.BI "warning: " directory " does not exist or is not a directory"
@@ -142,8 +155,8 @@
.IR filename .
This is normal when
.I package
-has been removed, but not purged from the system. In other circumstances,
-it likely indicates an error in
+has been removed, but not purged from the system.
+In other circumstances, it likely indicates an error in
.IR package .
.SH "EXIT STATUS"
.TP
@@ -155,8 +168,9 @@
.B update\-fonts\-scale
experienced a fatal error; see the section on diagnostic messages above.
.SH BUGS
-See <http://bugs.debian.org/xbase\-clients>. If you wish to
-report a bug in
+See
+.URL "http://bugs.debian.org/xbase\-clients"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
.BR update\-fonts\-scale ,
please see
.I /usr/share/doc/debian/bug\-reporting.txt
@@ -165,6 +179,7 @@
command.
.SH AUTHOR
.B update\-fonts\-scale
-was written by Branden Robinson for the Debian Project.
+was written by Branden Robinson.
.SH "SEE ALSO"
.BR mkfontdir (1x)
+.\" vim:set et tw=80:
Modified: trunk/debian/local/xdm.options.5
===================================================================
--- trunk/debian/local/xdm.options.5 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/xdm.options.5 2004-10-31 07:25:02 UTC (rev 2002)
@@ -15,18 +15,24 @@
.\" 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\-10\-18" "Debian Project"
+.TH xdm.options 5 "2004\-10\-31" "Debian Project"
.SH NAME
-xdm.options \- configuration options for X display manager
+xdm.options \- configuration options for the X display manager
.SH DESCRIPTION
.I /etc/X11/xdm/xdm.options
contains a set of flags that determine some of the behavior of the
X display manager
.BR xdm (1x).
+Most of
+.BR xdm 's
+behavior is customized through other files; consult the
+.B xdm
+manual page if this manual page does not describe the behavior you want to
+alter.
.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.
+may contain comments, which begin with a hash mark (\(oq#\(cq) 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.
Options are enabled by simply placing them in the file; they are disabled
@@ -39,10 +45,16 @@
.BR nologin (5)
file exists, its contents will be displayed using
.BR xmessage (1x)
-(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
+(if xmessage is available), and the user will be returned to the
+.B xdm
+login screen after xmessage is dismissed instead of starting the X session.
+If this option is enabled,
+.B xdm
+starts a session as usual (after
+.B xmessage
+is dismissed, if
+.B xmessage
+is available and the
.I nologin
file exists).
This behavior is disabled by default:
@@ -57,38 +69,58 @@
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).
+Stopping
+.B xdm
+causes immediate termination of any sessions it manages; in some situations
+this could be an unwelcome surprise (for instance, for remote
+.B 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
+for instance, a fix for a security vulnerability (overwriting
+.BR xdm 's
+executable on the file system has no effect on the copy of
+.B xdm
+in memory).
+The
+.B xdm
+package's pre\-removal script checks to see if the
+.B 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.
+by stopping
+.BR xdm ,
+so a warning is issued and an opportunity to abort the upgrade of
+.B xdm
+is provided.
+Furthermore, restarting
+.B 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.
+This behavior is disabled by default:
+.B xdm
+will be not be stopped or started during an upgrade of its package; the
+administrator will have to do so by hand (with
+.B invoke\-rc.d xdm restart
+or by rebooting the system) before the newly installed
+.B xdm
+binary is used.
.TP
.B start\-on\-install
.B Enable this option with caution;
-it causes the xdm daemon to be started
-immediately after the package is installed.
+it causes the
+.B 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.
-This behavior is disabled by default: xdm will not be started when it is
-installed.
+for other caveats regarding the consequences of starting the
+.B xdm
+daemon during package management.
+This behavior is disabled by default:
+.B 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 ).
@@ -100,7 +132,9 @@
.I /etc/X11/xdm/Xreset
scripts to call the
.BR sessreg (1x)
-program to register X sessions managed by xdm in the
+program to register X sessions managed by
+.B xdm
+in the
.BR utmp (5)
and
.BR wtmp (5)
@@ -109,20 +143,28 @@
.I utmp
and
.I wtmp
-files will have no record of xdm sessions.
+files will have no record of
+.B 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
+\(oqrun\-xconsole\(cq option has been removed.
+Shell scripts named
.I /etc/X11/xdm/Xsetup
and
.I /etc/X11/xdm/Xreset
-can be edited to disable or modify the running of xconsole on the xdm
+can be edited to disable or modify the running of xconsole on the
+.B xdm
greeter screen; see
.BR xdm (1x)
for more information.
-.SH AUTHOR
-This manpage was written by Branden Robinson for the Debian Project.
+.SH AUTHORS
+Stephen Early, Mark Eichin, and Branden Robinson customized
+.BR xdm 's
+startup and reset scripts and package maintainer scripts to implement the
+functionality described above.
+This manual page was written by Branden Robinson.
.SH SEE ALSO
.BR sessreg (1x),
.BR xmessage (1x),
@@ -130,3 +172,4 @@
.BR nologin (5),
.BR utmp (5),
.BR wtmp (5)
+.\" vim:set et tw=80:
Modified: trunk/debian/local/xfs.options.5
===================================================================
--- trunk/debian/local/xfs.options.5 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/xfs.options.5 2004-10-31 07:25:02 UTC (rev 2002)
@@ -15,9 +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 xfs.options 5 "2002\-11\-24" "Debian Project"
+.TH xfs.options 5 "2004\-10\-31" "Debian Project"
.SH NAME
-xfs.options \- configuration options for X font server
+xfs.options \- configuration options for the X font server
.SH DESCRIPTION
.I /etc/X11/fs/xfs.options
contains a set of flags that determine some of the behavior of the X font
@@ -25,30 +25,45 @@
.BR xfs (1x).
.PP
.I /etc/X11/fs/xfs.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.
+may contain comments, which begin with a hash mark (\(oq#\(cq) 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.
+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 restart\-on\-upgrade
-Enable this option with caution on \(oqproduction\(cq machines; it causes
-the xfs daemon to be stopped and restarted on upgrade. This will break all
-existing connections by X servers to the font server, and as a result may
-deprive them of access to fonts. In some situations this could be an
-unwelcome surprise (for instance, for remote xfs 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 xfs's executable on the file system has
-no effect on the copy of xfs in memory). If this option is disabled (the
-Debian default), xfs will be not be stopped or started during an install or
-upgrade; the administrator will have to do so by hand (with
-\(oqinvoke-rc.d xfs restart\(cq, or by rebooting the system) before the
-newly installed xfs binary is used.
+.B Enable this option with caution on \(oqproduction\(cq machines;
+it causes the
+.B xfs
+daemon to be stopped and restarted on upgrade.
+This will break all existing connections by X servers to the font server,
+and as a result may deprive them of access to fonts.
+In some situations this could be an unwelcome surprise (for instance, for
+remote
+.B xfs
+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
+.BR xfs 's
+executable on the file system has no effect on the copy of
+.B xfs
+in memory).
+This behavior is disabled by default:
+.B xfs
+will be not be stopped or started during an upgrade of its package; the
+administrator will have to do so by hand (with
+.B invoke-rc.d xfs restart
+or by rebooting the system) before the newly installed
+.B xfs
+binary is used.
.SH AUTHOR
-This manpage was written by Branden Robinson for the Debian Project.
+Branden Robinson customized
+.BR xfs 's
+package maintainer scripts to implement the functionality described above.
.SH SEE ALSO
.BR xfs (1x)
+.\" vim:set et tw=80:
Modified: trunk/debian/local/xvfb-run.1
===================================================================
--- trunk/debian/local/xvfb-run.1 2004-10-30 06:16:12 UTC (rev 2001)
+++ trunk/debian/local/xvfb-run.1 2004-10-31 07:25:02 UTC (rev 2002)
@@ -1,6 +1,7 @@
-.\" This manpage is copyright (C) 1998,1999,2000,2001,2002 Branden Robinson
-.\" <branden@debian.org>.
+.\" $Id$
.\"
+.\" Copyright 1998--2004 Branden Robinson <branden@debian.org>.
+.\"
.\" This is free software; you may 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,
@@ -15,7 +16,16 @@
.\" 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 xvfb\-run 1 "2004\-06\-03" "Debian Project"
+.\"
+.\" We need the URL macro from groff's www macro package, but also want
+.\" things to work all right for people who don't have it. So we define
+.\" our own URL macro and let the www macro package override it if it's
+.\" available.
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH xvfb\-run 1 "2004\-10\-31" "Debian Project"
.SH NAME
xvfb\-run \- run specified X client or command in a virtual X server environment
.SH SYNOPSIS
@@ -38,9 +48,11 @@
.BR xauth (1x))
and then starts the
.B Xvfb
-X server as a background process. The process ID of
+X server as a background process.
+The process ID of
.B Xvfb
-is stored for later use. The specified
+is stored for later use.
+The specified
.I command
is then run using the X display corresponding to the
.B Xvfb
@@ -75,7 +87,7 @@
.B Xvfb
in
.IR file .
-If not set, output is sent to
+The default is
.IR /dev/null .
.TP
.BI \-f\ file \fR,\fB\ \-\-auth\-file= file
@@ -102,15 +114,19 @@
.I servernumber
as the server number (but see the
.B \-a\fR,\fB \-\-auto\-servernum
-option above). This value defaults to 99.
+option above).
+The default is 99.
.TP
.B \-l\fR,\fB \-\-listen\-tcp
Enable TCP port listening in the X server.
+For security reasons (to avoid denial\-of\-service attacks or exploits),
+TCP port listening is disabled by default.
.TP
.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
Use
.I protocolname
-as the X authority protocol to use. This defaults to \(oq.\(cq, which
+as the X authority protocol to use.
+The default is \(oq.\(cq, which
.B xauth
interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
.TP
@@ -119,47 +135,56 @@
.I arguments
to the
.B Xvfb
-server. Be careful to quote any whitespace characters that may occur
-within
+server.
+Be careful to quote any whitespace characters that may occur within
.I arguments
to prevent them from regarded as separators for
.BR xvfb\-run 's
-own arguments. Also, note that specification of \(oq\-nolisten tcp\(cq in
+own arguments.
+Also, note that specification of \(oq\-nolisten tcp\(cq in
.I arguments
may override the function of
.BR xvfb\-run 's
own
.B \-l\fR,\fB \-\-listen\-tcp
option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list. Use
-the
+be ignored because of the way the X server parses its argument list.
+Use the
.B xvfb\-run
option
.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function. Defaults to \(oq\-screen 0 640x480x8\(cq.
+to achieve the latter function.
+The default is \(oq\-screen 0 640x480x8\(cq.
.TP
.BI \-w\ delay \fR,\fB\ \-\-wait= delay
Wait
.I delay
seconds after launching
.B Xvfb
-before attempting to start the specified command. Defaults to 3.
+before attempting to start the specified command.
+The default is 3.
.SH ENVIRONMENT
.TP
.B TMPDIR
specifies the directory in which to place
.BR xvfb\-run 's
temporary directory for storage of the X authority file; only used if the
-\-f or \-\-auth\-file options are not specified.
-'\" .SH INPUT FILES
-'\" None.
-.SH FILES
+.B \-f
+or
+.B \-\-auth\-file
+options are not specified.
+.SH "OUTPUT FILES"
.PP
-Unless the \-f or \-\-auth\-file options are specified, a temporary
+Unless the
+.B \-f
+or
+.B \-\-auth\-file
+options are specified, a temporary
directory and file within it are created (and deleted) to store the X
authority cookies used by the
.B Xvfb
-server and client(s) run under it. See
+server and client(s) run under it.
+See
.BR tempfile (1).
If \-f or \-\-auth\-file are used, then the specified X authority file is
only written to, not created or deleted (though
@@ -172,7 +197,7 @@
or
.B \-\-error\-file
options are specifed; see above.
-.SH EXIT STATUS
+.SH "EXIT STATUS"
.B xvfb\-run
uses its exit status as well as output to standard error to communicate
diagnostics.
@@ -210,10 +235,21 @@
their own, so they will have to be killed before
.B xvfb\-run
will exit.
+.SH BUGS
+See
+.URL "http://bugs.debian.org/xvfb"; "the Debian Bug Tracking System" .
+If you wish to report a bug in
+.BR xvfb\-run ,
+please see
+.I /usr/share/doc/debian/bug\-reporting.txt
+or the
+.BR reportbug (1)
+command.
.SH AUTHOR
.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia for Progeny Linux Systems,
-Inc., and the Debian Project.
+was written by Branden Robinson and Jeff Licquia with sponsorship from
+Progeny Linux Systems.
.SH "SEE ALSO"
.BR Xvfb (1x),
.BR xauth (1x)
+.\" vim:set et tw=80:
Property changes on: trunk/debian/local/xvfb-run.1
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: