xorg-server: Changes to 'debian-experimental'
debian/changelog | 3
debian/patches/07_xorgconf_manpage_overhaul.diff | 2216 -----------------
debian/patches/13_debian_add_xkbpath_env_variable.diff | 10
debian/patches/series | 1
4 files changed, 7 insertions(+), 2223 deletions(-)
New commits:
commit b2dd4f186b62baf0d619121170421d3e9d888315
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 22:11:18 2007 -0400
Also delete 07_xorgconf_manpage_overhaul.diff, which is now upstream
Refresh 13_debian_add_xkbpath_env_variable.diff too
diff --git a/debian/changelog b/debian/changelog
index 4df8091..b6ebf5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,12 +31,13 @@ xorg-server (2:1.3.99.0~git20070528-1) UNRELEASED; urgency=low
* Remove patches that were pushed upstream
+ 03_xnest_manpage_overhaul.diff
+ 04_read_rom_in_chunks.diff
+ + 07_xorgconf_manpage_overhaul.diff
+ 08_s390_servermd.diff
+ 12_security_policy_in_etc.diff
+ 16_s390_fix.diff
+ 23_kfreebsd_support.diff
- -- David Nusinow <dnusinow@debian.org> Mon, 28 May 2007 22:03:27 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 28 May 2007 22:09:07 -0400
xorg-server (2:1.3.0.0.dfsg-5) unstable; urgency=low
diff --git a/debian/patches/07_xorgconf_manpage_overhaul.diff b/debian/patches/07_xorgconf_manpage_overhaul.diff
deleted file mode 100644
index 31898f9..0000000
--- a/debian/patches/07_xorgconf_manpage_overhaul.diff
+++ /dev/null
@@ -1,2216 +0,0 @@
-$Id: 099e_xorgconf_manpage_overhaul.diff 966 2005-12-24 22:35:05Z dnusinow $
-
-Major stylistic cleanups, greatly expanded cross-reference ("SEE ALSO")
-section and some typo fixes.
-
-This patch by Branden Robinson.
-
-Not submitted to XFree86.
-
-Forward-ported by Fabio M. Di Nitto.
-
-NOTE: Branden you must really love this package!
-
----
- hw/xfree86/doc/man/xorg.conf.man.pre | 1307 ++++++++++++++++++++---------------
- 1 file changed, 751 insertions(+), 556 deletions(-)
-
-Index: hw/xfree86/doc/man/xorg.conf.man.pre
-===================================================================
---- hw/xfree86/doc/man/xorg.conf.man.pre.orig 2007-05-23 17:22:18.000000000 +0200
-+++ hw/xfree86/doc/man/xorg.conf.man.pre 2007-05-23 17:59:38.000000000 +0200
-@@ -3,7 +3,7 @@
- .ds q \N'34'
- .TH __xconfigfile__ __filemansuffix__ __vendorversion__
- .SH NAME
--__xconfigfile__ - Configuration File for __xservername__
-+__xconfigfile__ \- configuration File for __xservername__ X server
- .SH INTRODUCTION
- .B __xservername__
- supports several mechanisms for supplying/obtaining configuration and
-@@ -21,9 +21,10 @@
- .SH DESCRIPTION
- .B __xservername__
- uses a configuration file called
--.B __xconfigfile__
--for its initial setup. This configuration file is searched for in the
--following places when the server is started as a normal user:
-+.I __xconfigfile__
-+for its initial setup.
-+This configuration file is searched for in the following places when the
-+server is started as a normal user:
- .PP
- .RS 4
- .nf
-@@ -31,30 +32,31 @@
- .IR __projectroot__/etc/X11/ <cmdline>
- .IB /etc/X11/ $XORGCONFIG
- .IB __projectroot__/etc/X11/ $XORGCONFIG
--.I /etc/X11/__xconfigfile__-4
-+.I /etc/X11/__xconfigfile__\-4
- .I /etc/X11/__xconfigfile__
- .I /etc/__xconfigfile__
- .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
--.I __projectroot__/etc/X11/__xconfigfile__-4
-+.I __projectroot__/etc/X11/__xconfigfile__\-4
- .I __projectroot__/etc/X11/__xconfigfile__
- .IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
--.I __projectroot__/lib/X11/__xconfigfile__-4
-+.I __projectroot__/lib/X11/__xconfigfile__\-4
- .I __projectroot__/lib/X11/__xconfigfile__
- .fi
- .RE
- .PP
- where
- .I <cmdline>
--is a relative path (with no ".." components) specified with the
-+is a relative path (with no \(lq..\(rq components) specified with the
- .B \-config
- command line option,
- .B $XORGCONFIG
--is the relative path (with no ".." components) specified by that
-+is the relative path (with no \(lq..\(rq components) specified by that
- environment variable, and
- .I <hostname>
--is the machine's hostname as reported by gethostname(3).
-+is the machine's hostname as reported by
-+.BR gethostname (__oslibmansuffix__).
- .PP
--When the __xservername__ server is started by the "root" user, the config file
-+When the __xservername__ server is started by the \(lqroot\(rq user, the config file
- search locations are as follows:
- .PP
- .RS 4
-@@ -66,14 +68,14 @@
- .IB /etc/X11/ $XORGCONFIG
- .IB __projectroot__/etc/X11/ $XORGCONFIG
- .BI $HOME /__xconfigfile__
--.I /etc/X11/__xconfigfile__-4
-+.I /etc/X11/__xconfigfile__\-4
- .I /etc/X11/__xconfigfile__
- .I /etc/__xconfigfile__
- .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
--.I __projectroot__/etc/X11/__xconfigfile__-4
-+.I __projectroot__/etc/X11/__xconfigfile__\-4
- .I __projectroot__/etc/X11/__xconfigfile__
- .IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
--.I __projectroot__/lib/X11/__xconfigfile__-4
-+.I __projectroot__/lib/X11/__xconfigfile__\-4
- .I __projectroot__/lib/X11/__xconfigfile__
- .fi
- .RE
-@@ -90,13 +92,13 @@
- is the path specified by that environment variable (usually the home
- directory), and
- .I <hostname>
--is the machine's hostname as reported by gethostname(3).
-+is the machine's hostname as reported by
-+.BR gethostname (__oslibmansuffix__).
- .PP
- The
--.B __xconfigfile__
--file is composed of a number of sections which may be present in any
--order. Each section has
--the form:
-+.I __xconfigfile__
-+file is composed of a number of sections which may be present in any order.
-+Each section has the form:
- .PP
- .RS 4
- .nf
-@@ -121,13 +123,14 @@
- .BR "Modes " "Video modes descriptions"
- .BR "Screen " "Screen configuration"
- .BR "ServerLayout " "Overall layout"
--.BR "DRI " "DRI-specific configuration"
--.BR "Vendor " "Vendor-specific configuration"
-+.BR "DRI " "DRI\-specific configuration"
-+.BR "Vendor " "Vendor\-specific configuration"
- .fi
- .RE
- .PP
- The following obsolete section names are still recognised for compatibility
--purposes. In new config files, the
-+purposes.
-+In new config files, the
- .B InputDevice
- section should be used instead.
- .PP
-@@ -144,35 +147,38 @@
- .PP
- The
- .B ServerLayout
--sections are at the highest level. They bind together the input and
--output devices that will be used in a session. The input devices
--are described in the
-+sections are at the highest level.
-+They bind together the input and output devices that will be used in a session.
-+The input devices are described in the
- .B InputDevice
--sections. Output devices usually consist of multiple independent
--components (e.g., a graphics board and a monitor). These multiple
--components are bound together in the
-+sections.
-+Output devices usually consist of multiple independent components (e.g.,
-+a graphics board and a monitor).
-+These multiple components are bound together in the
- .B Screen
- sections, and it is these that are referenced by the
- .B ServerLayout
--section. Each
-+section.
-+Each
- .B Screen
--section binds together a graphics board and a monitor. The graphics
--boards are described in the
-+section binds together a graphics board and a monitor.
-+The graphics boards are described in the
- .B Device
- sections, and the monitors are described in the
- .B Monitor
- sections.
- .PP
--Config file keywords are case-insensitive, and "_" characters are
--ignored. Most strings (including
-+Config file keywords are case\-insensitive, and \(lq_\(rq characters are
-+ignored.
-+Most strings (including
- .B Option
- names) are also case-insensitive, and insensitive to white space and
--"_" characters.
-+\(lq_\(rq characters.
- .PP
--Each config file entry usually takes up a single line in the file.
--They consist of a keyword, which is possibly followed by one or
--more arguments, with the number and types of the arguments depending
--on the keyword. The argument types are:
-+Each config file entry usually takes up a single line in the file. They
-+consist of a keyword, which is possibly followed by one or more arguments,
-+with the number and types of the arguments depending on the keyword.
-+The argument types are:
- .PP
- .RS 4
- .nf
-@@ -182,17 +188,18 @@
- .fi
- .RE
- .PP
--Note: hex integer values must be prefixed with "0x", and octal values
--with "0".
-+Note: hex integer values must be prefixed with \(lq0x\(rq, and octal values
-+with \(lq0\(rq.
- .PP
- A special keyword called
- .B Option
--may be used to provide free-form data to various components of the server.
-+may be used to provide free\-form data to various components of the server.
- The
- .B Option
--keyword takes either one or two string arguments. The first is the option
--name, and the optional second argument is the option value. Some commonly
--used option value types include:
-+keyword takes either one or two string arguments.
-+The first is the option name, and the optional second argument is the
-+option value.
-+Some commonly used option value types include:
- .PP
- .RS 4
- .nf
-@@ -209,8 +216,8 @@
- .B Option
- values, not just strings, must be enclosed in quotes.
- .PP
--Boolean options may optionally have a value specified. When no value
--is specified, the option's value is
-+Boolean options may optionally have a value specified.
-+When no value is specified, the option's value is
- .BR TRUE .
- The following boolean option values are recognised as
- .BR TRUE :
-@@ -263,30 +270,35 @@
- the value and the expectations of the appropriate range of the value.
- It is recommended that the units always be specified when using frequency
- option values to avoid any errors in determining the value.
--.SH FILES SECTION
-+.SH "FILES SECTION"
- The
- .B Files
- section is used to specify some path names required by the server.
--Some of these paths can also be set from the command line (see Xserver(__appmansuffix__)
--and __xservername__(__appmansuffix__)). The command line settings override the values specified
--in the config file. The
-+Some of these paths can also be set from the command line (see
-+.BR Xserver (__appmansuffix__)
-+and
-+.BR __xservername__ (__appmansuffix__)).
-+The command line settings override the values specified in the config
-+file.
-+The
- .B Files
- section is optional, as are all of the entries that may appear in it.
- .PP
- The entries that can appear in this section are:
- .TP 7
- .BI "FontPath \*q" path \*q
--sets the search path for fonts. This path is a comma separated list of
--font path elements which the __xservername__ server searches for font databases.
-+sets the search path for fonts.
-+This path is a comma separated list of font path elements which the __xservername__
-+server searches for font databases.
- Multiple
- .B FontPath
- entries may be specified, and they will be concatenated to build up the
- fontpath used by the server. Font path elements may be either absolute
--directory paths, or a font server identifier. Font server identifiers
--have the form:
-+directory paths, or a font server identifier.
-+Font server identifiers have the form:
- .PP
- .RS 11
--.IR <trans> / <hostname> : <port-number>
-+.IR <trans> / <hostname> : <port\-number>
- .RE
- .PP
- .RS 7
-@@ -294,16 +306,16 @@
- .I <trans>
- is the transport type to use to connect to the font server (e.g.,
- .B unix
--for UNIX-domain sockets or
-+for UNIX\-domain sockets or
- .B tcp
- for a TCP/IP connection),
- .I <hostname>
- is the hostname of the machine running the font server, and
--.I <port-number>
-+.I <port\-number>
- is the port number that the font server is listening on (usually 7100).
- .PP
- When this entry is not specified in the config file, the server falls back
--to the compiled-in default font path, which contains the following
-+to the compiled\-in default font path, which contains the following
- font path elements:
- .PP
- .RS 4
-@@ -338,7 +350,7 @@
- .BI "RGBPath \*q" path \*q
- sets the path name for the RGB color database.
- When this entry is not specified in the config file, the server falls back
--to the compiled-in default RGB path, which is:
-+to the compiled\-in default RGB path, which is:
- .PP
- .RS 11
- .I __projectroot__/share/X11/rgb
-@@ -350,9 +362,10 @@
- binary format RGB color databases.
- .TP 7
- .BI "ModulePath \*q" path \*q
--sets the search path for loadable __xservername__ server modules. This path is
--a comma separated list of directories which the __xservername__ server searches
--for loadable modules loading in the order specified. Multiple
-+sets the search path for loadable __xservername__ server modules.
-+This path is a comma separated list of directories which the __xservername__ server
-+searches for loadable modules loading in the order specified.
-+Multiple
- .B ModulePath
- entries may be specified, and they will be concatenated to build the
- module search path used by the server.
-@@ -360,8 +373,8 @@
- .ig
- .TP 7
- .BI "LogFile \*q" path \*q
--sets the name of the __xservername__ server log file. The default log file name
--is
-+sets the name of the __xservername__ server log file.
-+The default log file name is
- .PP
- .RS 11
- .RI __logdir__/__xservername__. <n> .log
-@@ -372,15 +385,18 @@
- .I <n>
- is the display number for the __xservername__ server.
- ..
--.SH SERVERFLAGS SECTION
-+.SH "SERVERFLAGS SECTION"
- In addition to options specific to this section (described below), the
- .B ServerFlags
- section is used to specify some global
--__xservername__ server options. All of the entries in this section are
-+__xservername__ server options.
-+All of the entries in this section are
- .BR Options ,
- although for compatibility purposes some of the old style entries are
--still recognised. Those old style entries are not documented here, and
--using them is discouraged. The
-+still recognised.
-+Those old style entries are not documented here, and using them is
-+discouraged.
-+The
- .B ServerFlags
- section is optional, as are the entries that may be specified in it.
- .PP
-@@ -392,11 +408,12 @@
- .B Options
- specified in the active
- .B ServerLayout
--section. Options with command line equivalents are overridden when their
--command line equivalent is used. The options recognised by this section
--are:
-+section.
-+Options with command line equivalents are overridden when their command
-+line equivalent is used.
-+The options recognised by this section are:
- .TP 7
--.BI "Option \*qDefaultServerLayout\*q \*q" layout-id \*q
-+.BI "Option \*qDefaultServerLayout\*q \*q" layout\-id \*q
- This specifies the default
- .B ServerLayout
- section to use in the absence of the
-@@ -404,148 +421,185 @@
- command line option.
- .TP 7
- .BI "Option \*qNoTrapSignals\*q \*q" boolean \*q
--This prevents the __xservername__ server from trapping a range of unexpected
--fatal signals and exiting cleanly. Instead, the __xservername__ server will die
--and drop core where the fault occurred. The default behaviour is
--for the __xservername__ server to exit cleanly, but still drop a core file. In
--general you never want to use this option unless you are debugging
--an __xservername__ server problem and know how to deal with the consequences.
-+This prevents the __xservername__ server from trapping a range of unexpected fatal
-+signals and exiting cleanly.
-+Instead, the __xservername__ server will die and drop core where the fault occurred.
-+The default behaviour is for the __xservername__ server to exit cleanly, but still drop a
-+core file.
-+In general you never want to use this option unless you are debugging an __xservername__
-+server problem and know how to deal with the consequences.
- .TP 7
- .BI "Option \*qDontVTSwitch\*q \*q" boolean \*q
- This disallows the use of the
- .BI Ctrl+Alt+F n
- sequence (where
- .RI F n
--refers to one of the numbered function keys). That sequence is normally
--used to switch to another \*qvirtual terminal\*q on operating systems
--that have this feature. When this option is enabled, that key sequence has
--no special meaning and is passed to clients. Default: off.
-+refers to one of the numbered function keys).
-+That sequence is normally used to switch to another \*qvirtual terminal\*q
-+on operating systems that have this feature.
-+When this option is enabled, that key sequence has no special meaning and
-+is passed to clients.
-+Default: off.
- .TP 7
- .BI "Option \*qDontZap\*q \*q" boolean \*q
- This disallows the use of the
- .B Ctrl+Alt+Backspace
--sequence. That sequence is normally used to terminate the __xservername__ server.
--When this option is enabled, that key sequence has no special meaning
--and is passed to clients. Default: off.
-+sequence.
-+That sequence is normally used to terminate the __xservername__ server.
-+When this option is enabled, that key sequence has no special meaning and
-+is passed to clients.
-+Default: off.
- .TP 7
- .BI "Option \*qDontZoom\*q \*q" boolean \*q
- This disallows the use of the
--.B Ctrl+Alt+Keypad-Plus
-+.B Ctrl+Alt+Keypad\-Plus
- and
--.B Ctrl+Alt+Keypad-Minus
--sequences. These sequences allows you to switch between video modes.
-+.B Ctrl+Alt+Keypad\-Minus
-+sequences.
-+These sequences allows you to switch between video modes.
- When this option is enabled, those key sequences have no special meaning
--and are passed to clients. Default: off.
-+and are passed to clients.
-+Default: off.
- .TP 7
- .BI "Option \*qDisableVidModeExtension\*q \*q" boolean \*q
- This disables the parts of the VidMode extension used by the xvidtune client
--that can be used to change the video modes. Default: the VidMode extension
--is enabled.
-+that can be used to change the video modes.
-+Default: the VidMode extension is enabled.
- .TP 7
- .BI "Option \*qAllowNonLocalXvidtune\*q \*q" boolean \*q
- This allows the xvidtune client (and other clients that use the VidMode
--extension) to connect from another host. Default: off.
-+extension) to connect from another host.
-+Default: off.
- .TP 7
- .BI "Option \*qDisableModInDev\*q \*q" boolean \*q
--This disables the parts of the __xservername__-Misc extension that can be used to
--modify the input device settings dynamically. Default: that functionality
--is enabled.
-+This disables the parts of the __xservername__\-Misc extension that can be used to
-+modify the input device settings dynamically.
-+Default: that functionality is enabled.
- .TP 7
- .BI "Option \*qAllowNonLocalModInDev\*q \*q" boolean \*q
- This allows a client to connect from another host and change keyboard
--and mouse settings in the running server. Default: off.
-+and mouse settings in the running server.
-+Default: off.
- .TP 7
- .BI "Option \*qAllowMouseOpenFail\*q \*q" boolean \*q
- This allows the server to start up even if the mouse device can't be
--opened/initialised. Default: false.
-+opened/initialised.
-+Default: false.
- .TP 7
- .BI "Option \*qVTInit\*q \*q" command \*q
- Runs
- .I command
- after the VT used by the server has been opened.
--The command string is passed to "/bin/sh -c", and is run with the
--real user's id with stdin and stdout set to the VT. The purpose
--of this option is to allow system dependent VT initialisation
--commands to be run. This option should rarely be needed. Default: not set.
-+The command string is passed to \*q/bin/sh \-c\*q, and is run with the real
-+user's id with stdin and stdout set to the VT.
-+The purpose of this option is to allow system dependent VT initialisation
-+commands to be run.
-+This option should rarely be needed.
-+Default: not set.
- .TP 7
- .BI "Option \*qVTSysReq\*q \*q" boolean \*q
--enables the SYSV-style VT switch sequence for non-SYSV systems
--which support VT switching. This sequence is
--.B Alt-SysRq
--followed
--by a function key
-+enables the SYSV\-style VT switch sequence for non\-SYSV systems
-+which support VT switching.
-+This sequence is
-+.B Alt\-SysRq
-+followed by a function key
- .RB ( Fn ).
- This prevents the __xservername__ server trapping the
- keys used for the default VT switch sequence, which means that clients can
--access them. Default: off.
-+access them.
-+Default: off.
- .TP 7
- .BI "Option \*qXkbDisable\*q \*q" boolean \*q
--disable/enable the XKEYBOARD extension. The \-kb command line
--option overrides this config file option. Default: XKB is enabled.
-+disable/enable the XKEYBOARD extension.
-+The \-kb command line option overrides this config file option.
-+Default: XKB is enabled.
- .\" The following four options are "undocumented".
- .ig
- .TP 7
- .BI "Option \*qPciProbe1\*q"
--Use PCI probe method 1. Default: set.
-+Use PCI probe method 1.
-+Default: set.
- .TP 7
- .BI "Option \*qPciProbe2\*q"
--Use PCI probe method 2. Default: not set.
-+Use PCI probe method 2.
-+Default: not set.
- .TP 7
- .BI "Option \*qPciForceConfig1\*q"
--Force the use PCI config type 1. Default: not set.
-+Force the use PCI config type 1.
-+Default: not set.
- .TP 7
- .BI "Option \*qPciForceConfig2\*q"
--Force the use PCI config type 2. Default: not set.
-+Force the use PCI config type 2.
-+Default: not set.
- ..
- .TP 7
- .BI "Option \*qBlankTime\*q \*q" time \*q
--sets the inactivity timeout for the blanking phase of the screensaver.
-+sets the inactivity timeout for the
-+.B blank
-+phase of the screensaver.
- .I time
--is in minutes. This is equivalent to the __xservername__ server's `-s' flag,
--and the value can be changed at run-time with xset(__appmansuffix__). Default: 10
--minutes.
-+is in minutes.
-+This is equivalent to the __xservername__ server's
-+.B \-s
-+flag, and the value can be changed at run\-time with
-+.BR xset(__appmansuffix__).
-+Default: 10 minutes.
- .TP 7
- .BI "Option \*qStandbyTime\*q \*q" time \*q
--sets the inactivity timeout for the "standby" phase of DPMS mode.
-+sets the inactivity timeout for the
-+.B standby
-+phase of DPMS mode.
- .I time
--is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
--Default: 20 minutes. This is only suitable for VESA DPMS compatible
--monitors, and may not be supported by all video drivers. It is only
--enabled for screens that have the
-+is in minutes, and the value can be changed at run\-time with
-+.BR xset(__appmansuffix__).
-+Default: 20 minutes.
-+This is only suitable for VESA DPMS compatible monitors, and may not be
-+supported by all video drivers.
-+It is only enabled for screens that have the
- .B \*qDPMS\*q
- option set (see the MONITOR section below).
- .TP 7
- .BI "Option \*qSuspendTime\*q \*q" time \*q
--sets the inactivity timeout for the "suspend" phase of DPMS mode.
-+sets the inactivity timeout for the
-+.B suspend
-+phase of DPMS mode.
- .I time
--is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
--Default: 30 minutes. This is only suitable for VESA DPMS compatible
--monitors, and may not be supported by all video drivers. It is only
--enabled for screens that have the
-+is in minutes, and the value can be changed at run\-time with
-+.BR xset(__appmansuffix__).
-+Default: 30 minutes.
-+This is only suitable for VESA DPMS compatible monitors, and may not be
-+supported by all video drivers.
-+It is only enabled for screens that have the
- .B \*qDPMS\*q
- option set (see the MONITOR section below).
- .TP 7
- .BI "Option \*qOffTime\*q \*q" time \*q
--sets the inactivity timeout for the "off" phase of DPMS mode.
-+sets the inactivity timeout for the
-+.B off
-+phase of DPMS mode.
- .I time
--is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
--Default: 40 minutes. This is only suitable for VESA DPMS compatible
--monitors, and may not be supported by all video drivers. It is only
--enabled for screens that have the
-+is in minutes, and the value can be changed at run\-time with
-+.BR xset(__appmansuffix__).
-+Default: 40 minutes.
-+This is only suitable for VESA DPMS compatible monitors, and may not be
-+supported by all video drivers.
-+It is only enabled for screens that have the
- .B \*qDPMS\*q
- option set (see the MONITOR section below).
- .TP 7
- .BI "Option \*qPixmap\*q \*q" bpp \*q
--This sets the pixmap format to use for depth 24. Allowed values for
-+This sets the pixmap format to use for depth 24.
-+Allowed values for
- .I bpp
--are 24 and 32. Default: 32 unless driver constraints don't allow this
--(which is rare). Note: some clients don't behave well when this value
--is set to 24.
-+are 24 and 32.
-+Default: 32 unless driver constraints don't allow this (which is rare).
-+Note: some clients don't behave well when this value is set to 24.
- .TP 7
- .BI "Option \*qPC98\*q \*q" boolean \*q
--Specify that the machine is a Japanese PC-98 machine. This should not
--be enabled for anything other than the Japanese-specific PC-98
--architecture. Default: auto-detected.
-+Specify that the machine is a Japanese PC\-98 machine.
-+This should not be enabled for anything other than the Japanese\-specific
-+PC\-98 architecture.
-+Default: auto\-detected.
- .\" Doubt this should be documented.
- .ig
- .TP 7
-@@ -555,48 +609,54 @@
- ..
- .TP 7
- .BI "Option \*qNoPM\*q \*q" boolean \*q
--Disables something to do with power management events. Default: PM
--enabled on platforms that support it.
-+Disables something to do with power management events.
-+Default: PM enabled on platforms that support it.
- .TP 7
- .BI "Option \*qXinerama\*q \*q" boolean \*q
--enable or disable XINERAMA extension. Default is disabled.
-+enable or disable XINERAMA extension.
-+Default is disabled.
- .TP 7
- .BI "Option \*qAllowDeactivateGrabs\*q \*q" boolean \*q
- This option enables the use of the
--.B Ctrl+Alt+Keypad-Divide
--key sequence to deactivate any active keyboard and mouse grabs. Default:
--off.
-+.B Ctrl+Alt+Keypad\-Divide
-+key sequence to deactivate any active keyboard and mouse grabs.
-+Default: off.
- .TP 7
- .BI "Option \*qAllowClosedownGrabs\*q \*q" boolean \*q
- This option enables the use of the
--.B Ctrl+Alt+Keypad-Multiply
--key sequence to kill clients with an active keyboard or mouse grab as
--well as killing any application that may have locked the server, normally
--using the XGrabServer(__libmansuffix__) Xlib function. Default: off.
-+.B Ctrl+Alt+Keypad\-Multiply
-+key sequence to kill clients with an active keyboard or mouse grab as well
-+as killing any application that may have locked the server, normally using
-+the
-+.BR XGrabServer(__libmansuffix__)
-+Xlib function.
-+Default: off.
- .br
- Note that the options
--.BI AllowDeactivateGrabs
-+.B AllowDeactivateGrabs
- and
--.BI AllowClosedownGrabs
-+.B AllowClosedownGrabs
- will allow users to remove the grab used by screen saver/locker programs.
--An API was written to such cases. If you enable this option, make sure
--your screen saver/locker is updated.
-+An API was written to such cases.
-+If you enable this option, make sure your screen saver/locker is updated.
-+Default: off.
- .TP 7
- .BI "Option \*qHandleSpecialKeys\*q \*q" when \*q
- This option controls when the server uses the builtin handler to process
- special key combinations (such as
- .BR Ctrl+Alt+Backspace ).
--Normally the XKEYBOARD extension keymaps will provide mappings for each
--of the special key combinations, so the builtin handler is not needed
--unless the XKEYBOARD extension is disabled. The value of
-+Normally the XKEYBOARD extension keymaps will provide mappings for each of
-+the special key combinations, so the builtin handler is not needed unless
-+the XKEYBOARD extension is disabled.
-+The value of
- .I when
- can be
- .BR Always ,
- .BR Never ,
- or
- .BR WhenNeeded .
--Default: Use the builtin handler only if needed. The server will scan
--the keymap for a mapping to the
-+Default: Use the builtin handler only if needed.
-+The server will scan the keymap for a mapping to the
- .B Terminate
- action and, if found, use XKEYBOARD for processing actions, otherwise
- the builtin handler will be used.
-@@ -612,21 +672,22 @@
- .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
- Allow modules built for a different, potentially incompatible version of
- the X server to load. Disabled by default.
--.SH MODULE SECTION
-+.SH "MODULE SECTION"
- The
- .B Module
- section is used to specify which __xservername__ server modules should be loaded.
- This section is ignored when the __xservername__ server is built in static form.
- The types of modules normally loaded in this section are __xservername__ server
--extension modules, and font rasteriser modules. Most other module types
--are loaded automatically when they are needed via other mechanisms.
-+extension modules, and font rasteriser modules.
-+Most other module types are loaded automatically when they are needed via
-+other mechanisms.
- The
- .B Module
- section is optional, as are all of the entries that may be specified in
- it.
- .PP
--Entries in this section may be in two forms. The first and most commonly
--used form is an entry that uses the
-+Entries in this section may be in two forms.
-+The first and most commonly used form is an entry that uses the
- .B Load
- keyword, as described here:
- .TP 7
-@@ -634,8 +695,9 @@
- This instructs the server to load the module called
- .IR modulename .
- The module name given should be the module's standard name, not the
--module file name. The standard name is case-sensitive, and does not
--include the "lib" prefix, or the ".a", ".o", or ".so" suffixes.
-+module file name.
-+The standard name is case\-sensitive, and does not include the \(lqlib\(rq
-+prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
- .PP
- .RS 7
- Example: the Type 1 font rasteriser can be loaded with the following entry:
-@@ -668,13 +730,13 @@
- that are passed to the module when it is loaded.
- .PP
- Example: the extmod module (which contains a miscellaneous group of
--server extensions) can be loaded, with the XFree86-DGA extension
-+server extensions) can be loaded, with the XFree86\-DGA extension
- disabled by using the following entry:
- .PP
- .RS 4
- .nf
- .B "SubSection \*qextmod\*q"
--.B " Option \*qomit XFree86-DGA\*q"
-+.B " Option \*qomit XFree86\-DGA\*q"
- .B EndSubSection
- .fi
- .RE
-@@ -696,17 +758,20 @@
- .fi
- .RE
- .PP
--The "bitmap" font modules is loaded automatically. It is recommended
--that at very least the "extmod" extension module be loaded. If it isn't
--some commonly used server extensions (like the SHAPE extension) will not be
--available.
--.SH INPUTDEVICE SECTION
-+The \(lqbitmap\(rq font module is loaded automatically.
-+It is recommended
-+that at very least the \(lqextmod\(rq extension module be loaded.
-+If it isn't, some commonly used server extensions (like the SHAPE
-+extension) will not be available.
-+.SH "INPUTDEVICE SECTION"
- The config file may have multiple
- .B InputDevice
--sections. There will normally be at least two: one for the core (primary)
--keyboard, and one of the core pointer. If either of these two is missing,
--a default configuration for the missing ones will be used. Currently the
--default configuration may not work as expected on all platforms.
-+sections.
-+There will normally be at least two: one for the core (primary) keyboard,
-+and one of the core pointer.
-+If either of these two is missing, a default configuration for the missing
-+ones will be used.
-+Currently the default configuration may not work as expected on all platforms.
- .PP
- .B InputDevice
- sections have the following format:
-@@ -728,18 +793,21 @@
- .B Driver
- entries are required in all
- .B InputDevice
--sections. All other entries are optional.
-+sections.
-+All other entries are optional.
- .PP
- The
- .B Identifier
--entry specifies the unique name for this input device. The
-+entry specifies the unique name for this input device.
-+The
- .B Driver
- entry specifies the name of the driver to use for this input device.
- When using the loadable server, the input driver module
- .RI \*q inputdriver \*q
- will be loaded for each active
- .B InputDevice
--section. An
-+section.
-+An
- .B InputDevice
- section is considered active if it is referenced by an active
- .B ServerLayout
-@@ -749,7 +817,10 @@
- .B \-pointer
- command line options, or if it is selected implicitly as the core pointer
- or keyboard device in the absence of such explicit references.
--The most commonly used input drivers are "keyboard" and "mouse".
-+The most commonly used input drivers are
-+.BR keyboard (__drivermansuffix__)
-+and
-+.BR mouse (__drivermansuffix__).
- .PP
- In the absence of an explicitly specified core input device, the first
- .B InputDevice
-@@ -757,21 +828,24 @@
- .B CorePointer
- (or
- .BR CoreKeyboard )
--is used. If there is no match there, the first
-+is used.
-+If there is no match there, the first
- .B InputDevice
--that uses the "mouse" (or "keyboard" or "kbd") driver is used. The final
--fallback is to use built-in default configurations.
-+that uses the \(lqmouse\(rq (or \(lqkeyboard\(rq or \(lqkbd\(rq) driver is used.
-+The final fallback is to use built\-in default configurations.
- .PP
- .B InputDevice
--sections recognise some driver-independent
-+sections recognise some driver\-independent
- .BR Options ,
--which are described here. See the individual input driver manual pages
--for a description of the device-specific options.
-+which are described here.
-+See the individual input driver manual pages for a description of the
-+device\-specific options.
- .TP 7
- .BI "Option \*qCorePointer\*q"
- When this is set, the input device is installed as the core (primary)
--pointer device. There must be exactly one core pointer. If this option
--is not set here, or in the
-+pointer device.
-+There must be exactly one core pointer.
-+If this option is not set here, or in the
- .B ServerLayout
- section, or from the
- .B \-pointer
-@@ -783,8 +857,9 @@
- .TP 7
- .BI "Option \*qCoreKeyboard\*q"
- When this is set, the input device is to be installed as the core
--(primary) keyboard device. There must be exactly one core keyboard. If
--this option is not set here, in the
-+(primary) keyboard device.
-+There must be exactly one core keyboard.
-+If this option is not set here, in the
- .B ServerLayout
- section, or from the
- .B \-keyboard
-@@ -798,19 +873,21 @@
- .TP 7
- .BI "Option \*qSendCoreEvents\*q \*q" boolean \*q
- Both of these options are equivalent, and when enabled cause the
--input device to always report core events. This can be used, for
--example, to allow an additional pointer device to generate core
--pointer events (like moving the cursor, etc).
-+input device to always report core events.
-+This can be used, for example, to allow an additional pointer device to
-+generate core pointer events (like moving the cursor, etc).
- .TP 4
- .BI "Option \*qHistorySize\*q \*q" number \*q
--Sets the motion history size. Default: 0.
-+Sets the motion history size.
-+Default: 0.
- .TP 7
- .BI "Option \*qSendDragEvents\*q \*q" boolean \*q
- ???
--.SH DEVICE SECTION
-+.SH "DEVICE SECTION"
- The config file may have multiple
- .B Device
--sections. There must be at least one, for the video card being used.
-+sections.
-+There must be at least one, for the video card being used.
- .PP
- .B Device
- sections have the following format:
-@@ -836,27 +913,30 @@
- .PP
- The
- .B Identifier
--entry specifies the unique name for this graphics device. The
-+entry specifies the unique name for this graphics device.
-+The
- .B Driver
- entry specifies the name of the driver to use for this graphics device.
- When using the loadable server, the driver module
- .RI \*q driver \*q
- will be loaded for each active
- .B Device
--section. A
-+section.
-+A
- .B Device
- section is considered active if it is referenced by an active
- .B Screen
- section.
- .PP
- .B Device
--sections recognise some driver-independent entries and
-+sections recognise some driver\-independent entries and
- .BR Options ,
--which are described here. Not all drivers make use of these
--driver-independent entries, and many of those that do don't require them
--to be specified because the information is auto-detected. See the
--individual graphics driver manual pages for further information about
--this, and for a description of the device-specific options.
-+which are described here.
-+Not all drivers make use of these
-+driver\-independent entries, and many of those that do don't require them
-+to be specified because the information is auto\-detected.
-+See the individual graphics driver manual pages for further information
-+about this, and for a description of the device\-specific options.
- Note that most of the
- .B Options
- listed here (but not the other entries) may be specified in the
-@@ -865,118 +945,133 @@
- .B Device
- section.
- .TP 7
--.BI "BusID \*q" bus-id \*q
--This specifies the bus location of the graphics card. For PCI/AGP cards,
-+.BI "BusID \*q" bus\-id \*q
-+This specifies the bus location of the graphics card.
-+For PCI/AGP cards,
- the
--.I bus-id
-+.I bus\-id
- string has the form
- .BI PCI: bus : device : function
--(e.g., "PCI:1:0:0" might be appropriate for an AGP card).
-+(e.g., \(lqPCI:1:0:0\(rq might be appropriate for an AGP card).
- This field is usually optional in single-head configurations when using
--the primary graphics card. In multi-head configurations, or when using
--a secondary graphics card in a single-head configuration, this entry is
--mandatory. Its main purpose is to make an unambiguous connection between
--the device section and the hardware it is representing. This information
--can usually be found by running the __xservername__ server with the
-+the primary graphics card.
-+In multi-head configurations, or when using a secondary graphics card in a
-+single-head configuration, this entry is mandatory.
-+Its main purpose is to make an unambiguous connection between the device
-+section and the hardware it is representing.
-+This information can usually be found by running the __xservername__ server
-+with the
- .B \-scanpci
- command line option.
Reply to: