X Strike Force SVN commit: rev 366 - in trunk/debian: . local
Author: branden
Date: 2003-08-05 01:11:48 -0500 (Tue, 05 Aug 2003)
New Revision: 366
Modified:
trunk/debian/changelog
trunk/debian/local/Xsession.5
trunk/debian/local/Xsession.options.5
trunk/debian/local/Xwrapper.config.5
trunk/debian/local/update-fonts-alias.8
trunk/debian/local/update-fonts-dir.8
trunk/debian/local/update-fonts-scale.8
trunk/debian/local/xvfb-run.1
Log:
debian/local/*.[0-9]: "I SEE UNESCAPED HYPHENS!"; update all
Debian-authored manpages to properly escape ASCII 45 ("-", "HYPHEN-MINUS")
characters so that groff interprets them as dashes instead of hyphens
(they're actually used as dashes, so that's what we should be telling
groff they are, eh?)
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/changelog 2003-08-05 06:11:48 UTC (rev 366)
@@ -108,8 +108,14 @@
* debian/local/Xsession.options.5: fix missing-word typo
- -- Branden Robinson <branden@debian.org> Tue, 5 Aug 2003 00:51:04 -0500
+ * debian/local/*.[0-9]: "I SEE UNESCAPED HYPHENS!"; update all
+ Debian-authored manpages to properly escape ASCII 45 ("-", "HYPHEN-MINUS")
+ characters so that groff interprets them as dashes instead of hyphens
+ (they're actually used as dashes, so that's what we should be telling
+ groff they are, eh?)
+ -- Branden Robinson <branden@debian.org> Tue, 5 Aug 2003 01:08:35 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/local/Xsession.5
==============================================================================
--- trunk/debian/local/Xsession.5 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/Xsession.5 2003-08-05 06:11:48 UTC (rev 366)
@@ -15,12 +15,12 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH Xsession 5 "2002-09-24" "Debian GNU/Linux"
+.TH Xsession 5 "2003\-08\-05" "Debian GNU/Linux"
.SH NAME
Xsession \- initialize X session
.SH SYNOPSIS
Xsession [
-.I session-type
+.I session\-type
]
.SH DESCRIPTION
.I /etc/X11/Xsession
@@ -59,7 +59,7 @@
To change this for
.BR xdm,
edit the "DisplayManager*session" resource in the
-.I /etc/X11/xdm/xdm-config
+.I /etc/X11/xdm/xdm\-config
file; for
.BR startx ,
replace the contents of the
@@ -78,10 +78,10 @@
argument. 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
+.I /usr/bin/x\-terminal\-emulator
+(no window manager is launched). If the x\-terminal\-emulator program cannot
be found, the session exits. The "failsafe" argument is ignored if there
-is no "allow-failsafe" line in
+is no "allow\-failsafe" line in
.IR Xsession.options .
.IP default
produces the same behavior as if no session type argument had been given at
@@ -96,7 +96,7 @@
is not found, the
.I Xsession
script proceeds with its default behavior. This argument is ignored if
-there is no "allow-user-xsession" line in
+there is no "allow\-user\-xsession" line in
.IR Xsession.options .
(The reason being, if the administrator does not want users writing their
own
@@ -106,8 +106,8 @@
.SS DEFAULT STARTUP PROCEDURE
Initially,
.I Xsession
-performs some housekeeping. It declares a set of built-in functions (see
-"BUILT-IN SHELL FUNCTIONS" below) and variables, then attempts to create a
+performs some housekeeping. It declares a set of built\-in functions (see
+"BUILT\-IN SHELL FUNCTIONS" below) and variables, then attempts to create a
log file for the X session. Historically this is called an "error" file,
but it catches all sorts of diagnostic output from various X clients run in
the user's session, not just error messages. If creation of an error file
@@ -120,11 +120,11 @@
confirmed to be present,
.I Xsession
uses an internal implementation of
-.BR run-parts (1)
+.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
-.BR run-parts (1)
+.BR run\-parts (1)
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
@@ -138,11 +138,11 @@
merely stored for later reference, and not immediately executed.
.PP
2) Merging of X resources. The internal
-.BR run-parts (1)
+.BR run\-parts (1)
is again used, this time to identify files in the
.I /etc/X11/Xresources
-directory that should be processed with "xrdb -merge". Next, if the line
-"allow-user-resources" is present in
+directory that should be processed with "xrdb \-merge". Next, if the line
+"allow\-user\-resources" is present in
.IR Xsession.options ,
the user's
.I $HOME/.Xresources
@@ -150,9 +150,9 @@
.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 the line "allow\-user\-xsession" is present in
.IR Xsession.options ,
-a user-specified session program or script is used. If a program or
+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:
@@ -163,39 +163,39 @@
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
+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:
-.IR /usr/bin/x-session-manager ,
-.IR /usr/bin/x-window-manager ,
+.IR /usr/bin/x\-session\-manager ,
+.IR /usr/bin/x\-window\-manager ,
and
-.IR /usr/bin/x-terminal-emulator .
+.IR /usr/bin/x\-terminal\-emulator .
The first one found is used. If none are found,
.I Xsession
aborts with an error.
.PP
-4) Start ssh-agent, if needed. If the line "use-ssh-agent" is present in
+4) Start ssh\-agent, if needed. If the line "use\-ssh\-agent" is present in
.IR Xsession.options ,
and no ssh agent process appears to be running already,
-.BR ssh-agent (1)
+.BR ssh\-agent (1)
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.
.PP
5) Start the X session. Finally, the startup program is executed, inside a
-Bourne shell if necessary, and inside an ssh-agent if necessary. The
+Bourne shell if necessary, 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
-Of course, any of the existing files can be edited in-place.
+Of course, any of the existing files can be edited in\-place.
.PP
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
.PD 0
-* a two-digit number denoting sequence
+* a two\-digit number denoting sequence
.PP
* the name of the package providing the script
.PP
@@ -203,11 +203,11 @@
.PP
* a description of the script's basic function, using only characters allowed
by
-.BR run-parts (1).
+.BR run\-parts (1).
.PD
.PP
Here is an example of how one might write a script, named
-.IR 40custom_load-xmodmap ,
+.IR 40custom_load\-xmodmap ,
to invoke
.BR xmodmap (1x):
.PP
@@ -218,9 +218,9 @@
.PD
.PP
.PD 0
-if [ -x /usr/bin/X11/xmodmap ]; then
+if [ \-x /usr/bin/X11/xmodmap ]; then
.PP
- if [ -f $SYSMODMAP ]; then
+ if [ \-f $SYSMODMAP ]; then
.PP
xmodmap $SYSMODMAP
.PP
@@ -230,9 +230,9 @@
.PD
.PP
.PD 0
-if [ -x /usr/bin/X11/xmodmap ]; then
+if [ \-x /usr/bin/X11/xmodmap ]; then
.PP
- if [ -f $USRMODMAP ]; then
+ if [ \-f $USRMODMAP ]; then
.PP
xmodmap $USRMODMAP
.PP
@@ -243,9 +243,9 @@
.PP
Those writing scripts for
.I Xsession
-to execute should avail themselves of its built-in shell functions,
+to execute should avail themselves of its built\-in shell functions,
described below.
-.SS BUILT-IN SHELL FUNCTIONS
+.SS BUILT\-IN SHELL FUNCTIONS
.PP
.B message
is used for communicating with the user. It may be given an arbitrarily
@@ -291,18 +291,18 @@
is a directory containing Bourne shell scripts to be executed by
.IR Xsession .
Files in this directory are matched using
-.BR run-parts (1)
+.BR run\-parts (1)
and are
.BR source d,
not executed in a subshell.
.TP
.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
+which contains system\-wide X resource settings for X clients from the
corresponding package. The settings are loaded with
-.BR "xrdb -merge" .
+.BR "xrdb \-merge" .
Files in this directory are matched using
-.BR run-parts (1).
+.BR run\-parts (1).
.TP
.I /etc/X11/Xsession.options
contains configuration options for the
@@ -317,7 +317,7 @@
.BR "xrdb \-merge" .
Note that
.I $HOME/.Xdefaults
-is a relic from X Version 10 (and X11R1) days, before app-defaults files
+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.
.I .Xresources
@@ -329,27 +329,27 @@
See the manual page for
.B xinit
and/or
-.I /usr/share/doc/xfree86-common/examples/xsession
+.I /usr/share/doc/xfree86\-common/examples/xsession
for tips on writing an
.I .Xsession
file.
.SH OUTPUT FILES
.TP
-.I $HOME/.xsession-errors
+.I $HOME/.xsession\-errors
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 $HOME/.xsession-errors
+.I $HOME/.xsession\-errors
cannot be opened. The filename is provided by
.BR tempfile (1).
.SH SEE ALSO
.BR Xsession.options (5),
.BR X (7x),
-.BR run-parts (1),
-.BR ssh-agent (1),
+.BR run\-parts (1),
+.BR ssh\-agent (1),
.BR startx (1x),
.BR tempfile (1),
.BR xdm (1x),
Modified: trunk/debian/local/Xsession.options.5
==============================================================================
--- trunk/debian/local/Xsession.options.5 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/Xsession.options.5 2003-08-05 06:11:48 UTC (rev 366)
@@ -15,7 +15,7 @@
.\" along with the Debian GNU/Linux system; 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"
+.TH Xsession.options 5 "2003\-08\-05" "Debian GNU/Linux"
.SH NAME
Xsession.options \- configuration options for
.BR Xsession(5)
@@ -33,23 +33,23 @@
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-"
+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.
.PP
Available options are:
-.IP allow-failsafe
+.IP allow\-failsafe
If the "failsafe" 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
+.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
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
+.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
@@ -58,12 +58,12 @@
If the file is present not executable, it is still used, but assumed to be
a Bourne shell script, and executed with
.BR sh (1).
-.IP use-ssh-agent
+.IP use\-ssh\-agent
If the
-.BR ssh-agent (1)
+.BR ssh\-agent (1)
program is available and no agent process appears to be running already,
the X session will be invoked by exec'ing
-.B ssh-agent
+.B ssh\-agent
with the startup command, instead of the startup command directly.
.PP
Additional options may be supported by the local administrator. See
@@ -71,7 +71,7 @@
for how this is accomplished.
.SH SEE ALSO
.BR Xsession (5),
-.BR ssh-agent (1),
-.BR x-terminal-emulator (1)
+.BR ssh\-agent (1),
+.BR x\-terminal\-emulator (1)
.SH AUTHOR
This manpage was written by Branden Robinson for Debian GNU/Linux.
Modified: trunk/debian/local/Xwrapper.config.5
==============================================================================
--- trunk/debian/local/Xwrapper.config.5 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/Xwrapper.config.5 2003-08-05 06:11:48 UTC (rev 366)
@@ -15,7 +15,7 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH Xwrapper.config 5 "6 Jan 2001" "Debian GNU/Linux"
+.TH Xwrapper.config 5 "2003\-08\-05" "Debian Project"
.SH NAME
Xwrapper.config \- configuration options for X server wrapper
.SH DESCRIPTION
@@ -29,7 +29,7 @@
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
+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
@@ -40,13 +40,13 @@
.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
-.I xserver-common
+.I xserver\-common
Debian package, therefore the parameters of
.B Xwrapper.config
may be changed with the command
-.IR "dpkg-reconfigure xserver-common" .
+.IR "dpkg\-reconfigure xserver\-common" .
See
-.IR dpkg-reconfigure (8)
+.IR dpkg\-reconfigure (8)
for more information.
.PP
The format of
@@ -60,7 +60,7 @@
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 (_), 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
@@ -79,11 +79,11 @@
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
+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).
.SH SEE ALSO
-.IR dpkg-reconfigure (8),
+.IR dpkg\-reconfigure (8),
.IR nice (1)
.SH AUTHOR
This manpage was written by Branden Robinson for Progeny Linux Systems,
Modified: trunk/debian/local/update-fonts-alias.8
==============================================================================
--- trunk/debian/local/update-fonts-alias.8 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/update-fonts-alias.8 2003-08-05 06:11:48 UTC (rev 366)
@@ -13,7 +13,7 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-alias 8 "2002\-11\-01" "Debian Project"
+.TH update\-fonts\-alias 8 "2003\-08\-05" "Debian Project"
.SH NAME
update\-fonts\-alias \- compile fonts.alias files
.SH SYNOPSIS
@@ -78,12 +78,12 @@
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
+.B update\-fonts\-alias 75dpi
.RE
is correct, while
-.RB \(oq "update-fonts-alias /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-alias /usr/X11R6/lib/X11/fonts/75dpi" \(cq
and
-.RB \(oq "update-fonts-alias /usr/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-alias /usr/lib/X11/fonts/75dpi" \(cq
are not.
.SH DIAGNOSTICS
.SS Errors
Modified: trunk/debian/local/update-fonts-dir.8
==============================================================================
--- trunk/debian/local/update-fonts-dir.8 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/update-fonts-dir.8 2003-08-05 06:11:48 UTC (rev 366)
@@ -13,7 +13,7 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-dir 8 "2002\-11\-01" "Debian Project"
+.TH update\-fonts\-dir 8 "2003\-08\-05" "Debian Project"
.SH NAME
update\-fonts\-dir \- compile fonts.dir files
.SH SYNOPSIS
@@ -73,12 +73,12 @@
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
+.B update\-fonts\-dir 75dpi
.RE
is correct, while
-.RB \(oq "update-fonts-dir /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-dir /usr/X11R6/lib/X11/fonts/75dpi" \(cq
and
-.RB \(oq "update-fonts-dir /usr/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-dir /usr/lib/X11/fonts/75dpi" \(cq
are not.
.SH DIAGNOSTICS
.SS Errors
Modified: trunk/debian/local/update-fonts-scale.8
==============================================================================
--- trunk/debian/local/update-fonts-scale.8 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/update-fonts-scale.8 2003-08-05 06:11:48 UTC (rev 366)
@@ -13,7 +13,7 @@
.\" your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or
.\" with the dpkg source package as the file COPYING. If not, write to the
.\" Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH update-fonts-scale 8 "2002\-11\-01" "Debian Project"
+.TH update\-fonts\-scale 8 "2003\-08\-05" "Debian Project"
.SH NAME
update\-fonts\-scale \- compile fonts.scale files
.SH SYNOPSIS
@@ -81,12 +81,12 @@
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
+.B update\-fonts\-scale 75dpi
.RE
is correct, while
-.RB \(oq "update-fonts-scale /usr/X11R6/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-scale /usr/X11R6/lib/X11/fonts/75dpi" \(cq
and
-.RB \(oq "update-fonts-scale /usr/lib/X11/fonts/75dpi" \(cq
+.RB \(oq "update\-fonts\-scale /usr/lib/X11/fonts/75dpi" \(cq
are not.
.SH DIAGNOSTICS
.SS Errors
Modified: trunk/debian/local/xvfb-run.1
==============================================================================
--- trunk/debian/local/xvfb-run.1 2003-08-05 05:51:59 UTC (rev 365)
+++ trunk/debian/local/xvfb-run.1 2003-08-05 06:11:48 UTC (rev 366)
@@ -15,7 +15,7 @@
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
-.TH xvfb\-run 1 "2002\-10\-24" "Debian Project"
+.TH xvfb\-run 1 "2003\-08\-05" "Debian Project"
.SH NAME
xvfb\-run \- run specified X client or command in a virtual X server environment
.SH SYNOPSIS
@@ -101,7 +101,7 @@
.I protocolname
as the X authority protocol to use. This defaults to \(oq.\(cq, which
.B xauth
-interprets as its own default protocol, which is MIT-MAGIC-COOKIE-1.
+interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
.TP
.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments
Pass
@@ -112,17 +112,17 @@
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
+.BR xvfb\-run 's
+own arguments. Also, note that specification of \(oq\-nolisten tcp\(cq in
.I arguments
may override the function of
-.BR xvfb-run 's
+.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
-.B xvfb-run
+.B xvfb\-run
option
.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber
to achieve the latter function. Defaults to \(oq\-screen 0 640x480x8\(cq.
@@ -174,11 +174,11 @@
.B Xvfb
X server on the first available server number greater than or equal to 1.
.TP
-.B xvfb\-run \-\-server\-args="-screen 0 1024x768x24" ico -faces
+.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
runs the
.BR ico (1x)
demonstration client (and passes it the
-.B -faces
+.B \-faces
argument) inside the
.B Xvfb
X server, configured with a root window of 1024 by 768 pixels and a color
Reply to: