xserver: Branch 'master' - 11 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Mar 30 23:14:05 UTC 2025


 hw/kdrive/Xkdrive.man                          |   10 -
 hw/kdrive/ephyr/man/Xephyr.man                 |    6 
 hw/vfb/man/Xvfb.man                            |    9 -
 hw/xfree86/drivers/inputtest/inputtestdrv.man  |  118 ++++++++------
 hw/xfree86/drivers/modesetting/modesetting.man |   13 -
 hw/xfree86/exa/man/exa.man                     |   40 +++-
 hw/xfree86/fbdevhw/man/fbdevhw.man             |   12 -
 hw/xfree86/man/Xorg.man                        |  177 ++++++++++++---------
 hw/xfree86/man/Xorg.wrap.man                   |    3 
 hw/xfree86/man/xorg.conf.man                   |  150 +++++++++---------
 hw/xfree86/utils/man/gtf.man                   |    9 -
 hw/xquartz/man/Xquartz.man                     |   37 +++-
 hw/xwayland/man/Xwayland.man                   |    8 
 hw/xwin/man/XWin.man                           |   46 +++--
 hw/xwin/man/XWinrc.man                         |    9 -
 hw/xwin/winclipboard/xwinclip.man              |   16 +
 man/Xserver.man                                |  208 ++++++++++++++-----------
 17 files changed, 532 insertions(+), 339 deletions(-)

New commits:
commit 5ac0a19e7f488e8ae7e35157a3982d826e296038
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 29 13:36:54 2025 -0700

    man pages: use .BR to mark up man page references
    
    The name of a man page is typeset in bold and the section in roman
    (see man-pages(7)).
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man
index 4a5ee21c4..d785d05f3 100644
--- a/hw/kdrive/Xkdrive.man
+++ b/hw/kdrive/Xkdrive.man
@@ -16,7 +16,8 @@ servers; for information on a specific X server, please refer to the
 relevant manual page.
 .SH OPTIONS
 In addition to the standard options accepted by all X servers (see
-Xserver(1)), all the 
+.BR Xserver (1)),
+all the 
 .B Xkdrive
 servers accept the following options:
 .TP 8
@@ -44,7 +45,12 @@ enable emulation of a middle mouse button by chording.
 .B -3button
 disable emulation of a middle mouse button by chording.
 .SH SEE ALSO
-X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), Xvesa(1), Xfbdev(1).
+.BR X (@miscmansuffix@),
+.BR Xserver (1),
+.BR xdm (1),
+.BR xinit (1),
+.BR Xvesa (1),
+.BR Xfbdev (1).
 .SH AUTHORS
 The Xkdrive common core was written by Keith Packard,
 and is based on the Sample Implementation of X.
diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index cc8a80f21..0ebd4e92c 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -39,7 +39,8 @@ uses the host X server window as "framebuffer" via fast SHM XImages.
 It also has support for "visually" debugging what the server is
 painting.
 .SH OPTIONS
-The server accepts all the standard options of Xserver(@appmansuffix@)
+The server accepts all the standard options of
+.BR Xserver (@appmansuffix@)
 and the following additional options:
 .TP 8
 .BI -screen " width" x height
@@ -91,6 +92,7 @@ Keyboard handling is basic but works.
 .IP \(bu 2
 Mouse button 5 probably won't work.
 .SH "SEE ALSO"
-X(@miscmansuffix@), Xserver(@appmansuffix@)
+.BR X (@miscmansuffix@),
+.BR Xserver (@appmansuffix@)
 .SH AUTHOR
 Matthew Allum <mallum at o-hand.com> 2004
diff --git a/hw/vfb/man/Xvfb.man b/hw/vfb/man/Xvfb.man
index d7959b879..82bb8137e 100644
--- a/hw/vfb/man/Xvfb.man
+++ b/hw/vfb/man/Xvfb.man
@@ -49,7 +49,8 @@ new platform, and providing an unobtrusive way to run applications
 that don't really need an X server but insist on having one anyway.
 .SH OPTIONS
 .PP
-In addition to the normal server options described in the \fIXserver(1)\fP
+In addition to the normal server options described in the
+.BR Xserver (1)
 manual page, \fIXvfb\fP accepts the following command line switches:
 .TP 4
 .B "\-screen \fIscreennum\fP \fIWxHxD\fP"
@@ -119,6 +120,10 @@ xwud -in /var/tmp/Xvfb_screen0
 Displays screen 0 of the server started by the preceding example.
 .SH "SEE ALSO"
 .PP
-X(@miscmansuffix@), Xserver(1), xwd(1), xwud(1), XWDFile.h
+.BR X (@miscmansuffix@),
+.BR Xserver (1),
+.BR xwd (1),
+.BR xwud (1),
+.B XWDFile.h
 .SH AUTHORS
 David P. Wiggins, The Open Group, Inc.
diff --git a/hw/xfree86/drivers/modesetting/modesetting.man b/hw/xfree86/drivers/modesetting/modesetting.man
index 4a8af97c8..6a2935919 100644
--- a/hw/xfree86/drivers/modesetting/modesetting.man
+++ b/hw/xfree86/drivers/modesetting/modesetting.man
@@ -27,9 +27,10 @@ The
 driver supports all hardware where a KMS driver is available.
 modesetting uses the Linux DRM KMS ioctls and dumb object create/map.
 .SH CONFIGURATION DETAILS
-Please refer to @xconfigfile@(@filemansuffix@) for general configuration
-details.  This section only covers configuration details specific to
-this driver.
+Please refer to
+.BR @xconfigfile@ (@filemansuffix@)
+for general configuration details.
+This section only covers configuration details specific to this driver.
 .PP
 For this driver it is not required to specify modes in the screen 
 section of the config file.  The
@@ -125,7 +126,9 @@ Enable atomic modesetting when supported.  The default is
 .B off.
 .TP
 .SH "SEE ALSO"
- at xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@),
-X(@miscmansuffix@)
+.BR @xservername@ (@appmansuffix@),
+.BR @xconfigfile@ (@filemansuffix@),
+.BR Xserver (@appmansuffix@),
+.BR X (@miscmansuffix@)
 .SH AUTHORS
 Authors include: Dave Airlie
diff --git a/hw/xfree86/fbdevhw/man/fbdevhw.man b/hw/xfree86/fbdevhw/man/fbdevhw.man
index f9e8aaf41..f72b3cd1d 100644
--- a/hw/xfree86/fbdevhw/man/fbdevhw.man
+++ b/hw/xfree86/fbdevhw/man/fbdevhw.man
@@ -10,13 +10,17 @@ A
 .B fbdevhw
 module is currently available for linux framebuffer devices.
 .PP
-fbdev(@drivermansuffix@) is a non-accelerated driver which runs on top of the
+.BR fbdev (@drivermansuffix@)
+is a non-accelerated driver which runs on top of the
 fbdevhw module.  fbdevhw can be used by other drivers too, this
 is usually activated with `Option "UseFBDev"' in the device section.
 .SH "SEE ALSO"
-Xorg(@appmansuffix@), xorg.conf(@filemansuffix@),
-xorgconfig(@appmansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@),
-fbdev(@drivermansuffix@)
+.BR Xorg (@appmansuffix@),
+.BR xorg.conf (@filemansuffix@),
+.BR xorgconfig (@appmansuffix@),
+.BR Xserver (@appmansuffix@),
+.BR X (@miscmansuffix@),
+.BR fbdev (@drivermansuffix@)
 .SH AUTHORS
 Authors include: Gerd Knorr, based on the XF68_FBDev Server code
 (Martin Schaller, Geert Uytterhoeven).
diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index 2084653f8..b928d535b 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -33,8 +33,10 @@ free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,
 OpenBSD, and Solaris.  Commercial UNIX operating systems such as
 UnixWare are also supported.  Other supported operating systems include
 GNU Hurd.  Mac OS X is supported with the
-Xquartz(@appmansuffix@) X server.  Win32/Cygwin is supported with the
-XWin(@appmansuffix@) X server.
+.BR Xquartz (@appmansuffix@)
+X server.  Win32/Cygwin is supported with the
+.BR XWin (@appmansuffix@)
+X server.
 .PP
 .SH "NETWORK CONNECTIONS"
 .B Xorg
@@ -44,8 +46,10 @@ byte-streams:
 .I "Local"
 On most platforms, the "Local" connection type is a UNIX-domain socket.
 On some System V platforms, the "local" connection types also include
-STREAMS pipes, named pipes, and some other mechanisms.  See the
-"LOCAL CONNECTIONS" section of X(@miscmansuffix@) for details.
+STREAMS pipes, named pipes, and some other mechanisms.
+See the "LOCAL CONNECTIONS" section of
+.BR X (@miscmansuffix@)
+for details.
 .TP 4
 .I TCP/IP
 .B Xorg
@@ -56,25 +60,31 @@ where
 is the display number.  This connection type is usually disabled by default,
 but may be enabled with the
 .B \-listen
-option (see the Xserver(1) man page for details).
+option (see the
+.BR Xserver (1)
+man page for details).
 .SH OPTIONS
 .B Xorg
 supports several mechanisms for supplying/obtaining configuration and
 run-time parameters: command line options, environment variables, the
-xorg.conf(@filemansuffix@) configuration files, auto-detection, and
+.BR xorg.conf (@filemansuffix@)
+configuration files, auto-detection, and
 fallback defaults.  When the same information is supplied in more than
 one way, the highest precedence mechanism is used.  The list of mechanisms
 is ordered from highest precedence to lowest.  Note that not all parameters
 can be supplied via all methods.  The available command line options
-and environment variables (and some defaults) are described here and in
-the Xserver(@appmansuffix@) manual page.  Most configuration file
+and environment variables (and some defaults) are described here and in the
+.BR Xserver (@appmansuffix@)
+manual page.  Most configuration file
 parameters, with their defaults, are described in the
-xorg.conf(@filemansuffix@) manual page.  Driver and module specific
+.BR xorg.conf (@filemansuffix@)
+manual page.  Driver and module specific
 configuration parameters are described in the relevant driver or module
 manual page.
 .PP
 In addition to the normal server options described in the
-Xserver(@appmansuffix@) manual page,
+.BR Xserver (@appmansuffix@)
+manual page,
 .B Xorg
 accepts the following command line switches:
 .TP 8
@@ -92,15 +102,17 @@ as Linux, BSD, OpenSolaris, SVR3, and SVR4.
 Allow the server to start up even if the mouse device can't be opened
 or initialised.  This is equivalent to the
 .B AllowMouseOpenFail
-xorg.conf(@filemansuffix@) file option.
+.BR xorg.conf (@filemansuffix@)
+file option.
 .TP 8
 .B \-allowNonLocalXvidtune
 Make the VidMode extension available to remote clients.  This allows
 the xvidtune client to connect from another host.  This is equivalent
 to the
 .B AllowNonLocalXvidtune
-xorg.conf(@filemansuffix@) file option.  By default non-local
-connections are not allowed.
+.BR xorg.conf (@filemansuffix@)
+file option.
+By default non-local connections are not allowed.
 .TP 8
 .BI \-bgamma " value"
 Set the blue gamma correction.
@@ -139,10 +151,12 @@ config directory search path for all other users.
 When this option is specified, the
 .B Xorg
 server loads all video driver modules, probes for available hardware,
-and writes out an initial xorg.conf(@filemansuffix@) file based on
-what was detected.  This option currently has some problems on some
-platforms, but in most cases it is a good way to bootstrap the
-configuration process.  This option is only available when the server
+and writes out an initial
+.BR xorg.conf (@filemansuffix@)
+file based on what was detected.
+This option currently has some problems on some platforms,
+but in most cases it is a good way to bootstrap the configuration process.
+This option is only available when the server
 is run as root (i.e, with real-uid 0).
 .TP 8
 .BI "\-crt /dev/tty" XX
@@ -159,7 +173,8 @@ Disable the parts of the VidMode extension (used by the xvidtune
 client) that can be used to change the video modes.  This is equivalent
 to the
 .B DisableVidModeExtension
-xorg.conf(@filemansuffix@) file option.
+.BR xorg.conf (@filemansuffix@)
+file option.
 .TP 8
 .B \-fbbpp \fIn\fP
 Sets the number of framebuffer bits per pixel.  You should only set this
@@ -226,7 +241,9 @@ want to use systemd-logind integration you must specify this option.
 Not all platforms support (or can use) this option.
 .TP 8
 .BI \-keyboard " keyboard-name"
-Use the xorg.conf(@filemansuffix@) file
+Use the
+.BR xorg.conf (@filemansuffix@)
+file
 .B InputDevice
 section called
 .I keyboard-name
@@ -238,7 +255,9 @@ section and this option, the first relevant
 section is used for the core keyboard.
 .TP 8
 .BI \-layout " layout-name"
-Use the xorg.conf(@filemansuffix@) file
+Use the
+.BR xorg.conf (@filemansuffix@)
+file
 .B Layout
 section called
 .IR layout-name .
@@ -287,7 +306,8 @@ as root (i.e, with real-uid 0).
 Disable automatically setting secondary GPUs up as output sinks and offload
 sources. This is equivalent to setting the
 .B AutoBindGPU
-xorg.conf(__filemansuffix__) file option. To
+.BR xorg.conf (@filemansuffix@)
+file option. To
 .B false.
 .TP 8
 .B \-nosilk
@@ -298,7 +318,9 @@ Disable the automatic switching on X server reset and shutdown to the
 VT that was active when the server started, if supported by the OS.
 .TP 8
 .BI \-pointer " pointer-name"
-Use the xorg.conf(@filemansuffix@) file
+Use the
+.BR xorg.conf (@filemansuffix@)
+file
 .B InputDevice
 section called
 .I pointer-name
@@ -328,7 +350,9 @@ options.
 Share virtual terminals with another X server, if supported by the OS.
 .TP 8
 .BI \-screen " screen-name"
-Use the xorg.conf(@filemansuffix@) file
+Use the
+.BR xorg.conf (@filemansuffix@)
+file
 .B Screen
 section called
 .IR screen-name .
@@ -392,7 +416,8 @@ keymap.
 Immediately kills the server -- no questions asked. It can be disabled by
 setting the
 .B DontZap
-xorg.conf(@filemansuffix@) file option to a TRUE value.
+.BR xorg.conf (@filemansuffix@)
+file option to a TRUE value.
 .PP
 .RS 8
 It should be noted that zapping is triggered by the
@@ -406,20 +431,23 @@ but can be enabled with the XKB option
 Change video mode to next one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-xorg.conf(@filemansuffix@) file option.
+.BR xorg.conf (@filemansuffix@)
+file option.
 .TP 8
 .B Ctrl+Alt+Keypad-Minus
 Change video mode to previous one specified in the configuration file.
 This can be disabled with the
 .B DontZoom
-xorg.conf(@filemansuffix@) file option.
+.BR xorg.conf (@filemansuffix@)
+file option.
 .TP 8
 .B Ctrl+Alt+F1...F12
 For systems with virtual terminal support, these keystroke
 combinations are used to switch to virtual terminals 1 through 12,
 respectively.  This can be disabled with the
 .B DontVTSwitch
-xorg.conf(@filemansuffix@) file option.
+.BR xorg.conf (@filemansuffix@)
+file option.
 .SH CONFIGURATION
 .B Xorg
 typically uses a configuration file called
@@ -429,8 +457,9 @@ and configuration files with the suffix
 in a directory called
 .B @xconfigdir@
 for its initial setup.
-Refer to the xorg.conf(@filemansuffix@) manual page for information
-about the format of this file.
+Refer to the
+.BR xorg.conf (@filemansuffix@)
+manual page for information about the format of this file.
 .PP
 .B Xorg
 has a mechanism for automatically generating a built-in configuration
@@ -460,9 +489,11 @@ supported by Xorg.  Enhancements are planned for future releases.
 .SH FILES
 The
 .B Xorg
-server config files can be found in a range of locations.  These are
-documented fully in the xorg.conf(@filemansuffix@) manual page.  The
-most commonly used locations are shown here.
+server config files can be found in a range of locations.
+These are documented fully in the
+.BR xorg.conf (@filemansuffix@)
+manual page.
+The most commonly used locations are shown here.
 .TP 30
 .B /etc/X11/xorg.conf
 Server configuration file.
@@ -523,45 +554,49 @@ Manual pages.
 Initial access control list for display
 .IR n .
 .SH "SEE ALSO"
-X(@miscmansuffix@), Xserver(@appmansuffix@), xdm(@appmansuffix@), xinit(@appmansuffix@),
-xorg.conf(@filemansuffix@), xvidtune(@appmansuffix@),
-xkeyboard-config (@miscmansuffix@),
-apm(@drivermansuffix@),
-ati(@drivermansuffix@),
-chips(@drivermansuffix@),
-cirrus(@drivermansuffix@),
-cyrix(@drivermansuffix@),
-fbdev(@drivermansuffix@),
-glide(@drivermansuffix@),
-glint(@drivermansuffix@),
-i128(@drivermansuffix@),
-i740(@drivermansuffix@),
-imstt(@drivermansuffix@),
-intel(@drivermansuffix@),
-mga(@drivermansuffix@),
-neomagic(@drivermansuffix@),
-nsc(@drivermansuffix@),
-nv(@drivermansuffix@),
-openchrome (@drivermansuffix@),
-r128(@drivermansuffix@),
-rendition(@drivermansuffix@),
-s3virge(@drivermansuffix@),
-siliconmotion(@drivermansuffix@),
-sis(@drivermansuffix@),
-sunbw2(@drivermansuffix@),
-suncg14(@drivermansuffix@),
-suncg3(@drivermansuffix@),
-suncg6(@drivermansuffix@),
-sunffb(@drivermansuffix@),
-sunleo(@drivermansuffix@),
-suntcx(@drivermansuffix@),
-tdfx(@drivermansuffix@),
-tga(@drivermansuffix@),
-trident(@drivermansuffix@),
-tseng(@drivermansuffix@),
-v4l(@drivermansuffix@),
-vesa(@drivermansuffix@),
-vmware(@drivermansuffix@),
+.BR X (@miscmansuffix@),
+.BR Xserver (@appmansuffix@),
+.BR xdm (@appmansuffix@),
+.BR xinit (@appmansuffix@),
+.BR xorg.conf (@filemansuffix@),
+.BR xvidtune (@appmansuffix@),
+.BR xkeyboard-config  (@miscmansuffix@),
+.BR apm (@drivermansuffix@),
+.BR ati (@drivermansuffix@),
+.BR chips (@drivermansuffix@),
+.BR cirrus (@drivermansuffix@),
+.BR cyrix (@drivermansuffix@),
+.BR fbdev (@drivermansuffix@),
+.BR glide (@drivermansuffix@),
+.BR glint (@drivermansuffix@),
+.BR i128 (@drivermansuffix@),
+.BR i740 (@drivermansuffix@),
+.BR imstt (@drivermansuffix@),
+.BR intel (@drivermansuffix@),
+.BR mga (@drivermansuffix@),
+.BR neomagic (@drivermansuffix@),
+.BR nsc (@drivermansuffix@),
+.BR nv (@drivermansuffix@),
+.BR openchrome  (@drivermansuffix@),
+.BR r128 (@drivermansuffix@),
+.BR rendition (@drivermansuffix@),
+.BR s3virge (@drivermansuffix@),
+.BR siliconmotion (@drivermansuffix@),
+.BR sis (@drivermansuffix@),
+.BR sunbw2 (@drivermansuffix@),
+.BR suncg14 (@drivermansuffix@),
+.BR suncg3 (@drivermansuffix@),
+.BR suncg6 (@drivermansuffix@),
+.BR sunffb (@drivermansuffix@),
+.BR sunleo (@drivermansuffix@),
+.BR suntcx (@drivermansuffix@),
+.BR tdfx (@drivermansuffix@),
+.BR tga (@drivermansuffix@),
+.BR trident (@drivermansuffix@),
+.BR tseng (@drivermansuffix@),
+.BR v4l (@drivermansuffix@),
+.BR vesa (@drivermansuffix@),
+.BR vmware (@drivermansuffix@),
 .br
 Web site
 .IR <https://www.x.org> .
diff --git a/hw/xfree86/man/Xorg.wrap.man b/hw/xfree86/man/Xorg.wrap.man
index a8ee5eae8..0bf394fa9 100644
--- a/hw/xfree86/man/Xorg.wrap.man
+++ b/hw/xfree86/man/Xorg.wrap.man
@@ -64,4 +64,5 @@ graphics cards and some are not kms capable auto-detection may fail,
 in this case manual configuration should be used.
 
 .SH "SEE ALSO"
-Xorg X server information: \fIXorg\fP(1)
+Xorg X server information:
+.BR Xorg (1)
diff --git a/hw/xfree86/utils/man/gtf.man b/hw/xfree86/utils/man/gtf.man
index 95bddbbcf..336dfac08 100644
--- a/hw/xfree86/utils/man/gtf.man
+++ b/hw/xfree86/utils/man/gtf.man
@@ -15,9 +15,9 @@ is a utility for calculating VESA GTF modes.  Given the desired
 horizontal and vertical resolutions and refresh rate (in Hz), the parameters
 for a matching VESA GTF mode are printed out.  Two output formats are
 supported: mode lines suitable for the Xorg
-.B xorg.conf(@filemansuffix@)
+.BR xorg.conf (@filemansuffix@)
 file, and mode parameters suitable for the Linux
-.B fbset(8)
+.BR fbset (8)
 utility.
 
 .SH OPTIONS
@@ -32,9 +32,10 @@ default format.
 .TP 8
 .BR \-f | \-\-fbset
 Print the mode parameters in a format suitable for
-.BR fbset(8) .
+.BR fbset (8).
 .SH "SEE ALSO"
-xorg.conf(@filemansuffix@), cvt(@appmansuffix@)
+.BR xorg.conf (@filemansuffix@),
+.BR cvt (@appmansuffix@)
 .SH AUTHOR
 Andy Ritger.
 .PP
diff --git a/hw/xquartz/man/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 9b01bbaf3..5d2eea017 100644
--- a/hw/xquartz/man/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man
@@ -14,7 +14,9 @@ X11 display is the size of the screen and contains all the other
 windows. The X11 root window is not displayed in rootless mode as Mac
 OS X handles the desktop background.
 .SH CUSTOMIZATION
-\fIXquartz\fP can be customized using the defaults(1) command. The available options are:
+\fIXquartz\fP can be customized using the
+.BR defaults (1)
+command. The available options are:
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 enable_fake_buttons -boolean true
 Emulates a 3 button mouse using modifier keys. By default, the Command modifier
@@ -43,11 +45,13 @@ Disables the alert dialog displayed when attempting to quit X11.
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 no_auth -boolean true
 Stops the X server requiring that clients authenticate themselves when
-connecting.  See Xsecurity(@miscmansuffix@).
+connecting.  See
+.BR Xsecurity (@miscmansuffix@).
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 nolisten_tcp -boolean false
-This will tell the server to listen and accept TCP connections.  Doing this without enabling
-xauth is a possible security concern.  See Xsecurity(@miscmansuffix@).
+This will tell the server to listen and accept TCP connections.
+Doing this without enabling xauth is a possible security concern.  See
+.BR Xsecurity (@miscmansuffix@).
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 enable_system_beep -boolean false
 Don't use the standard system beep effect for X11 alerts.
@@ -88,7 +92,8 @@ This option defaults to false and is only accessible through the command line.
 This option defaults to false.  Enable this option to ensure that X11 scroll events are always in the direction of the device.  This overrides the related option in the Mouse/Trackpad section of System Preferences.
 .SH OPTIONS
 .PP
-In addition to the normal server options described in the \fIXserver(1)\fP
+In addition to the normal server options described in the
+.BR Xserver (1)
 manual page, \fIXquartz\fP accepts the following command line switches:
 .TP 8
 .B \-fakebuttons
@@ -110,9 +115,14 @@ XQuartz stores a server log at ~/Library/Logs/X11. at bundle_id_prefix@.log which
 is analogous to /var/log/Xorg.#.log on systems that use the XFree86 DDX such as
 Linux, BSD, and Solaris.
 .PP
-In addition to this server log, XQuartz sends messages to syslogd(8) using
-asl(3).  These logs are sent to the @bundle_id_prefix@ facility, and you can
-watch these logs using the following syslog(1) command:
+In addition to this server log, XQuartz sends messages to
+.BR syslogd (8)
+using
+.BR asl (3).
+These logs are sent to the @bundle_id_prefix@ facility, and you can
+watch these logs using the following
+.BR syslog (1)
+command:
 .TP 8
 .B $ syslog -w -k Facility eq @bundle_id_prefix@
 .PP
@@ -123,7 +133,9 @@ or you can include extra information such as the file, line, and function where
 By default, XQuartz sets an ASL mask which prevents it from logging messages
 below the ASL_LEVEL_WARNING level (meaning almost all logging is done strictly
 to the file referenced above).  To force XQuartz to send all log messages to
-syslogd(8), you can adjust this mask using the following syslog(1) command:
+.BR syslogd (8), you can adjust this mask using the following
+.BR syslog (1)
+command:
 .TP 8
 .B $ syslog -c X11.bin -d
 .PP
@@ -134,7 +146,12 @@ you will need to adjust XQuartz's asl mask as above but using -i or -n
 instead of -d.
 .SH "SEE ALSO"
 .PP
-X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)
+.BR X (@miscmansuffix@),
+.BR Xserver (1),
+.BR xdm (1),
+.BR xinit (1),
+.BR syslog (1),
+.BR syslogd (8)
 .PP
 https://www.xquartz.org/
 .PP
diff --git a/hw/xwayland/man/Xwayland.man b/hw/xwayland/man/Xwayland.man
index e30799e9a..1a35a6828 100644
--- a/hw/xwayland/man/Xwayland.man
+++ b/hw/xwayland/man/Xwayland.man
@@ -43,7 +43,9 @@ of the Wayland desktop. It is however possible for a user to launch Xwayland
 non-rootless, mainly for testing purposes.
 .PP
 Like all of the X servers, \fIXwayland\fP accepts the command line options
-described in the \fIXserver\fP(@miscmansuffix@) manual page.
+described in the
+.BR Xserver (@miscmansuffix@)
+manual page.
 The following additional arguments are supported as well.
 .TP 8
 .B \-decorate
@@ -176,4 +178,6 @@ the name of the display of the Wayland server.
 .B XWAYLAND_NO_GLAMOR
 disable glamor and DRI3 support in \fIXwayland\fP, for testing purposes.
 .SH "SEE ALSO"
-General information: \fIX\fP(@miscmansuffix@), \fIwayland-info\fP(@miscmansuffix@)
+General information:
+.BR X (@miscmansuffix@),
+.BR wayland-info (@miscmansuffix@)
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index 8d4af41db..d84d95e30 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -31,7 +31,8 @@ containing the whole screen but this root window (traditionally covered with an
 pattern) is hidden from view, so only top-level X windows are seen.
 
 .SH OPTIONS
-In addition to the normal server options described in the \fIXserver(1)\fP
+In addition to the normal server options described in the
+.BR Xserver (1)
 manual page, \fIXWin\fP accepts the following command line switches,
 \fIall\fP of which are optional:
 
@@ -110,7 +111,8 @@ Currently \fB\-fullscreen\fP may only be applied to one X screen.
 .TP 8
 .B "\-icon" \fIicon-specifier\fP
 Override the window icon for the screen window from the default.
-The \fIicon-specifier\fP is as defined in \fIXWinrc(@filemansuffix@)\fP.
+The \fIicon-specifier\fP is as defined in
+.BR XWinrc (@filemansuffix@).
 .TP 8
 .B \-nodecoration
 Do not give the Cygwin/X window a \fIWindows\fP window border, title bar,
@@ -292,8 +294,9 @@ fullscreen with a DirectDraw engine.  This parameter is ignored if
 \fB\-fullscreen\fP is not specified.
 
 .SH MISCELLANEOUS OPTIONS
-See also the normal server options described in the \fIXserver(1)\fP
-manual page
+See also the normal server options described in the
+.BR Xserver (1)
+manual page.
 
 .TP 8
 .B \-help
@@ -328,21 +331,27 @@ values will yield a still more detailed debug output.
 .TP 8
 .B "\-xkbvariant \fIvariant\fp"
 These options configure the xkeyboard extension to load
-a particular keyboard map as the X server starts.  The behavior is similar
-to the \fIsetxkbmap\fP(1) program.
+a particular keyboard map as the X server starts.
+The behavior is similar to the
+.BR setxkbmap (1)
+program.
 
-See the \fIxkeyboard-config\fP(@miscmansuffix@) manual page for a list of
-keyboard configurations.
+See the
+.BR xkeyboard\-config (@miscmansuffix@)
+manual page for a list of keyboard configurations.
 
-The keyboard layout data is located at \fI at datadir@/X11/xkb/\fP.  Additional information
-can be found in the README files there and in the \fIsetxkbmap\fP(1) manual page.
+The keyboard layout data is located at \fI at datadir@/X11/xkb/\fP.
+Additional information can be found in the README files there and in the
+.BR setxkbmap (1)
+manual page.
 
 For example, in order to load a German layout for a pc105 keyboard, use the options:
 .br
 .I " \-xkblayout de \-xkbmodel pc105"
 
-Alternatively, you can use the \fIsetxkbmap\fP(1) program after \fIXWin\fP is
-running.
+Alternatively, you can use the
+.BR setxkbmap (1)
+program after \fIXWin\fP is running.
 
 The default is to select a keyboard configuration matching your current layout as
 reported by \fIWindows\fP, if known, or the default X server configuration
@@ -387,15 +396,22 @@ window, in both the generic case and for particular programs.
 * To change the style that is associated to the \fIWindows\fP window that
 \fXWin I-multiwindow\fP produces for each top-level X window.
 .PP
-The format of the \fI.XWinrc\fP file is given in the XWinrc(5) manual page.
+The format of the \fI.XWinrc\fP file is given in the
+.BR XWinrc (5)
+manual page.
 
 .SH EXAMPLES
 Need some examples
 
 
 .SH "SEE ALSO"
-X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), XWinrc(@filemansuffix@),
-setxkbmap(1), xkeyboard-config(@miscmansuffix@).
+.BR X (@miscmansuffix@),
+.BR Xserver (1),
+.BR xdm (1),
+.BR xinit (1),
+.BR XWinrc (@filemansuffix@),
+.BR setxkbmap (1),
+.BR xkeyboard-config (@miscmansuffix@).
 
 
 .SH BUGS
diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man
index 3c1ed067d..71d59f99f 100644
--- a/hw/xwin/man/XWinrc.man
+++ b/hw/xwin/man/XWinrc.man
@@ -7,9 +7,10 @@ XWinrc\- XWin Server Resource Configuration File.
 
 .SH DESCRIPTION
 The X Server for the X Window System on the Cygwin/X environment
-running on Microsoft Windows, \fIXWin\fP can be optionally configured
-with the \fIXWinrc\fP file.  A system-wide configuration file should
-be placed in \fI
+running on Microsoft Windows,
+.BR XWin (1)
+can be optionally configured with the \fIXWinrc\fP file.
+A system-wide configuration file should be placed in \fI
 @sysconfdir@/X11/system.XWinrc\fP, a per-user file
 should be put at \fI$HOME/.XWinrc\fP.  The \fIsystem.XWinrc\fP file is
 read only if no \fI$HOME/.XWinrc\fP exist.
@@ -248,7 +249,7 @@ This example makes an oclock window frameless in \fI-multiwindow\fP mode
 
 
 .SH "SEE ALSO"
- XWin(1)
+.BR XWin (1)
 
 
 .SH AUTHOR
diff --git a/hw/xwin/winclipboard/xwinclip.man b/hw/xwin/winclipboard/xwinclip.man
index f0c2fc32b..0f1d2c540 100644
--- a/hw/xwin/winclipboard/xwinclip.man
+++ b/hw/xwin/winclipboard/xwinclip.man
@@ -17,8 +17,14 @@ It also monitors the contents of the Windows clipboard for changes, taking owner
 CLIPBOARD selections, and making the contents of the Windows clipboard available in them.
 
 .B Note well:
-The \fIXWin(1)\fP X server has internal clipboard integration that is enabled by default.
-Do \fINOT\fP run \fIxwinclip\fP unless \fIXWin(1)\fP has been started with the -noclipboard option.
+The
+.BR XWin (1)
+X server has internal clipboard integration that is enabled by default.
+Do \fINOT\fP run \fIxwinclip\fP unless
+.BR XWin (1)
+has been started with the
+.B -noclipboard
+option.
 
 .SH OPTIONS
 \fIxwinclip\fP accepts the following optional command line switches:
@@ -31,7 +37,7 @@ Specifies the X server display to connect to.
 Do not monitor the PRIMARY selection.
 
 .SH "SEE ALSO"
-XWin(1)
+.BR XWin (1)
 
 .SH BUGS
 Only text clipboard contents are supported.
@@ -49,7 +55,9 @@ client which owns the selection to convert the selection to our requested format
 using a fixed timeout.  After requesting conversion of the selection, if no events are received from the X
 client which owns the selection for one second, the conversion is assumed to have failed.
 
-The XWin(1) server should indicate somehow (by placing an atom on the root window?) that it is running with its
+The
+.BR XWin (1)
+server should indicate somehow (by placing an atom on the root window?) that it is running with its
 internal clipboard integration enabled, and xwinclip should notice this and exit with an appropriate error.
 
 Probably many other bugs.
diff --git a/man/Xserver.man b/man/Xserver.man
index 99fa3be15..25e6152df 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -39,13 +39,15 @@ frequently a link or a copy of the appropriate server binary for
 driving the most frequently used server on a given machine.
 .SH "STARTING THE SERVER"
 The X server is usually started from the X Display Manager program
-\fIxdm\fP(1) or a similar display manager program.
+.BR xdm (1)
+or a similar display manager program.
 This utility is run from the system boot files and takes care of keeping
 the server running, prompting for usernames and passwords, and starting up
 the user sessions.
 .PP
 Installations that run more than one window system may need to use the
-\fIxinit\fP(1) utility instead of a display manager.  However, \fIxinit\fP is
+.BR xinit (1)
+utility instead of a display manager.  However, \fIxinit\fP is
 to be considered a tool for building startup scripts and is not
 intended for use by end users.  Site administrators are \fBstrongly\fP
 urged to use a display manager, or build other interfaces for novice users.
@@ -73,8 +75,10 @@ should override values specified via other mechanisms.
 .B :\fIdisplaynumber\fP
 The X server runs as the given \fIdisplaynumber\fP, which by default is 0.
 If multiple X servers are to run simultaneously on a host, each must have
-a unique display number.  See the DISPLAY
-NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
+a unique display number.
+See the DISPLAY NAMES section of the
+.BR X (@miscmansuffix@)
+manual page to learn how to
 specify which display number clients should try to use.
 .TP 8
 .B \-a \fInumber\fP
@@ -98,8 +102,12 @@ Audit lines are sent as standard error output.
 .TP 8
 .B \-auth \fIauthorization-file\fP
 specifies a file which contains a collection of authorization records used
-to authenticate access.  See also the \fIxdm\fP(1) and
-\fIXsecurity\fP(@miscmansuffix@) manual pages.
+to authenticate access.
+See also the
+.BR xdm (1)
+and
+.BR Xsecurity (@miscmansuffix@)
+manual pages.
 .TP 8
 .B \-background none
 Asks the driver not to clear the background on startup,
@@ -446,15 +454,17 @@ loads keyboard description in \fIfilename\fP on server startup.
 .SH "NETWORK CONNECTIONS"
 The X server supports client connections via a platform-dependent subset of
 the following transport types: TCP/IP, Unix Domain sockets,
-and several varieties of SVR4 local connections.  See the DISPLAY
-NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
+and several varieties of SVR4 local connections.
+See the DISPLAY NAMES section of the
+.BR X (@miscmansuffix@)
+manual page to learn how to
 specify which transport type clients should try to use.
 .SH GRANTING ACCESS
 The X server implements a platform-dependent subset of the following
 authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,
 XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the
-\fIXsecurity\fP(@miscmansuffix@) manual page for information on the
-operation of these protocols.
+.BR Xsecurity (@miscmansuffix@)
+manual page for information on the operation of these protocols.
 .PP
 Authorization data required by the above protocols is passed to the
 server in a private file named with the \fB\-auth\fP command line
@@ -464,9 +474,10 @@ If this file contains any authorization records, the local host is not
 automatically allowed access to the server, and only clients which
 send one of the authorization records contained in the file in the
 connection setup information will be allowed access.  See the
-\fIXau\fP manual page for a description of the binary format of this
-file.  See \fIxauth\fP(1) for maintenance of this file, and distribution
-of its contents to remote hosts.
+.BR Xau (3)
+manual page for a description of the binary format of this file.  See
+.BR xauth (1)
+for maintenance of this file, and distribution of its contents to remote hosts.
 .PP
 The X server also uses a host-based access control list for deciding
 whether or not to accept connections from clients on a particular machine.
@@ -476,7 +487,9 @@ well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where
 \fBn\fP is the display number of the server.  Each line of the file should
 contain either an Internet hostname (e.g., expo.lcs.mit.edu)
 or a complete name in the format
-\fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.
+\fIfamily\fP:\fIname\fP as described in the
+.BR xhost (1)
+manual page.
 There should be no leading or trailing spaces on any lines.  For example:
 .sp
 .in +8
@@ -495,8 +508,9 @@ The X protocol intrinsically does not have any notion of window operation
 permissions or place any restrictions on what a client can do; if a program can
 connect to a display, it has full run of the screen.
 X servers that support the SECURITY extension fare better because clients
-can be designated untrusted via the authorization they use to connect; see
-the \fIxauth\fP(1) manual page for details.  Restrictions are imposed
+can be designated untrusted via the authorization they use to connect; see the
+.BR xauth (1)
+manual page for details.  Restrictions are imposed
 on untrusted clients that curtail the mischief they can do.  See the SECURITY
 extension specification for a complete list of these restrictions.
 .PP
@@ -537,7 +551,8 @@ A special kind of directory can be specified using the \fBcatalogue\fP:
 prefix.  Directories specified this way can contain symlinks pointing to the
 real font directories.  See the FONTPATH.D section for details.
 .LP
-The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
+The font path can be set with the \fB\-fp\fP option or by
+.BR xset (1)
 after the server has started.
 .SH "FONTPATH.D"
 You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
@@ -587,36 +602,61 @@ Outline font directories
 Unix domain socket for display number \fBn\fP
 .TP 30
 .I /usr/adm/X\fBn\fPmsgs
-Error log file for display number \fBn\fP if run from \fIinit\fP(@adminmansuffix@)
+Error log file for display number \fBn\fP if run from
+.BR init (@adminmansuffix@)
 .TP 30
 .I @projectroot@/lib/X11/xdm/xdm\-errors
-Default error log file if the server is run from \fIxdm\fP(1)
+Default error log file if the server is run from
+.BR xdm (1)
 .SH "SEE ALSO"
-General information: \fIX\fP(@miscmansuffix@)
+General information:
+.BR X (@miscmansuffix@)
 .PP
 Protocols:
 .I "X Window System Protocol,"
 .I "The X Font Service Protocol,"
 .I "X Display Manager Control Protocol"
 .PP
-Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
-\fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),
+Fonts: 
+.BR bdftopcf (1), 
+.BR mkfontdir (1), 
+.BR mkfontscale (1),
+.BR xfs (1), 
+.BR xlsfonts (1), 
+.BR xfontsel (1), 
+.BR xfd (1),
 .I "X Logical Font Description Conventions"
 .PP
-Keyboards: \fIxkeyboard\-config\fP(@miscmansuffix@)
+Keyboards: 
+.BR xkeyboard\-config (@miscmansuffix@)
 .PP
-Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
-\fIxdm\fP(1), \fIxhost\fP(1)
+Security: 
+.BR Xsecurity (@miscmansuffix@), 
+.BR xauth (1), 
+.BR Xau (3),
+.BR xdm (1), 
+.BR xhost (1),
 .I "Security Extension Specification"
 .PP
-Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
+Starting the server: 
+.BR startx (1), 
+.BR xdm (1), 
+.BR xinit (1)
 .PP
-Controlling the server once started: \fIxset\fP(1), \fIxsetroot\fP(1),
-\fIxhost\fP(1), \fIxinput\fP(1), \fIxrandr\fP(1)
+Controlling the server once started: 
+.BR xset (1), 
+.BR xsetroot (1),
+.BR xhost (1), 
+.BR xinput (1), 
+.BR xrandr (1)
 .PP
 Server-specific man pages:
-\fIXorg\fP(1), \fIXephyr\fP(1), \fIXnest\fP(1),
-\fIXvfb\fP(1), \fIXquartz\fP(1), \fIXWin\fP(1).
+.BR Xorg (1), 
+.BR Xephyr (1), 
+.BR Xnest (1),
+.BR Xvfb (1), 
+.BR Xquartz (1), 
+.BR XWin (1).
 .PP
 Server internal documentation:
 .I "Definition of the Porting Layer for the X v11 Sample Server"
commit b4b6b19c9a834df980e9209f1c44318fd67f3e8a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Mar 29 13:27:33 2025 -0700

    Xserver.man: remove X FireWall Proxy (xfwp) info
    
    xfwp has not been maintained in many years, with ssh X11-Forwarding
    preferred instead.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/man/Xserver.man b/man/Xserver.man
index 5043e59b8..99fa3be15 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -491,15 +491,6 @@ local:
 Users can add or remove hosts from this list and enable or disable access
 control using the \fIxhost\fP command from the same machine as the server.
 .PP
-If the X FireWall Proxy (\fIxfwp\fP) is being used without a sitepolicy,
-host-based authorization must be turned on for clients to be able to
-connect to the X server via the \fIxfwp\fP.  If \fIxfwp\fP is run without
-a configuration file and thus no sitepolicy is defined, if \fIxfwp\fP
-is using an X server where xhost + has been run to turn off host-based
-authorization checks, when a client tries to connect to this X server
-via \fIxfwp\fP, the X server will deny the connection.  See \fIxfwp\fP(1)
-for more information about this proxy.
-.PP
 The X protocol intrinsically does not have any notion of window operation
 permissions or place any restrictions on what a client can do; if a program can
 connect to a display, it has full run of the screen.
@@ -615,7 +606,7 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 Keyboards: \fIxkeyboard\-config\fP(@miscmansuffix@)
 .PP
 Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
-\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
+\fIxdm\fP(1), \fIxhost\fP(1)
 .I "Security Extension Specification"
 .PP
 Starting the server: \fIstartx\fP(1), \fIxdm\fP(1), \fIxinit\fP(1)
commit bcf743f356ae8fbfc31f6e9699879f2788493abb
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sat Feb 8 02:19:19 2025 +0000

    inputtestdrv.4: editorial changes for this man page
    
    Use the correct macro for the font change of a single argument or
    split the argument into two.
    
    43:.BI Keyboard
    46:.BI Pointer
    52:.BI PointerAbsolute
    58:.BI PointerAbsoluteProximity
    62:.BI Touch
    103:.BI xf86ITEventWaitForSync
    
    -.-.
    
    Wrong distance between sentences in the input file.
    
    Separate the sentences and subordinate clauses; each begins on a new
    line.  See man-pages(7) ("Conventions for source file layout") and
    "info groff" ("Input Conventions").
    
    19:server as input events. It supports the full set of the xf86 driver APIs
    20:exposed by Xorg. The primary use cases of this input driver are various
    29:is created after the driver is initialized. The paths to the socket is passed
    37:Sets the path where the driver will create a named socket. Any existing file
    47:Initializes a relative-mode pointer device. It will have four valuators -
    53:Initializes an absolute-mode pointer device. It will have four valuators -
    87:specifies the protocol version supported by it. If this version is lower than
    91:to the driver. Each event is an instance of one of the
    93:structs. The length field defines the full length of the struct in bytes and
    96:The responses from the server follow the same structure. Each response is an
    99:structs. The length field defines the full length of the struct in bytes and
    104:event. After sending such event, the client must read of a
    106:events. The completion of the read operation indicates that Xorg has fully
    
    -.-.
    
    The name of a man page is typeset in bold and the section in roman
    (see man-pages(7)).
    
    24:Please refer to xorg.conf(5) for general configuration
    112:Xorg(1), xorg.conf(5), Xserver(1), X(7)
    
    -.-
    
    Additionally:
    
    "read of a xf86... event" -> "read an xf86... event"
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095449
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/xfree86/drivers/inputtest/inputtestdrv.man b/hw/xfree86/drivers/inputtest/inputtestdrv.man
index b0aa76dd3..0fd3431d9 100644
--- a/hw/xfree86/drivers/inputtest/inputtestdrv.man
+++ b/hw/xfree86/drivers/inputtest/inputtestdrv.man
@@ -15,57 +15,67 @@ inputtest \- An X.Org input driver for testing
 
 .SH DESCRIPTION
 .B inputtest
-is an Xorg input driver that passes events received over a socket on to the
-server as input events. It supports the full set of the xf86 driver APIs
-exposed by Xorg. The primary use cases of this input driver are various
-integration tests that need to interface with the input subsystem.
+is an Xorg input driver
+that passes events received over a socket on to the server as input events.
+It supports the full set of the xf86 driver APIs exposed by Xorg.
+The primary use cases of this input driver are various integration tests
+that need to interface with the input subsystem.
 
 .SH CONFIGURATION DETAILS
-Please refer to @xconfigfile@(@filemansuffix@) for general configuration
-details and for options that can be used with all input drivers.  This
-section only covers configuration details specific to this driver.
+Please refer to
+.BR @xconfigfile@ (@filemansuffix@)
+for general configuration details
+and for options
+that can be used with all input drivers.
+This section only covers configuration details specific to this driver.
 .PP
-External process can communicate with the input driver via a named socket that
-is created after the driver is initialized. The paths to the socket is passed
-via input driver options.
+External process can communicate with the input driver via a named socket
+that is created after the driver is initialized.
+The paths to the socket is passed via input driver options.
 .PP
 The following driver
 .B Options
 are supported:
 .TP 7
 .BI "Option \*qSocketPath\*q \*q" string \*q
-Sets the path where the driver will create a named socket. Any existing file
-at that location will be removed.
+Sets the path where the driver will create a named socket.
+Any existing file at that location will be removed.
 .TP 7
 .BI "Option \*qDeviceType\*q \*q" string \*q
 Sets the type of the device to be emulated.
 .IP
-.BI Keyboard
+.B Keyboard
 Initializes a keyboard device.
 .IP
-.BI Pointer
-Initializes a relative-mode pointer device. It will have four valuators -
-a "Rel X" valuator at axis 0 and a "Rel Y" valuator at axis 1.
+.B Pointer
+Initializes a relative-mode pointer device.
+It will have four valuators \(en
+a "Rel X" valuator at axis 0
+and a "Rel Y" valuator at axis 1.
 A horizontal scroll valuator will be set up at axis 2.
 A vertical scroll valuator will be set up at axis 3.
 .IP
-.BI PointerAbsolute
-Initializes an absolute-mode pointer device. It will have four valuators -
-an "Abs X" valuator at axis 0 and an "Abs Y" valuator at axis 1.
+.B PointerAbsolute
+Initializes an absolute-mode pointer device.
+It will have four valuators \(en
+an "Abs X" valuator at axis 0
+and an "Abs Y" valuator at axis 1.
 A horizontal scroll valuator will be set up at axis 2.
 A vertical scroll valuator will be set up at axis 3.
 .IP
-.BI PointerAbsoluteProximity
+.B PointerAbsoluteProximity
 Initializes an absolute-mode pointer device with proximity support.
-The valuators are initialized in the same way as for \fBPointerAbsolute\fR type.
+The valuators are initialized in the same way
+as for \fBPointerAbsolute\fR type.
 .IP
-.BI Touch
+.B Touch
 Initializes a touch device.
-It will have 5 valuators: an "Abs MT Position X" at axis 0,
+It will have 5 valuators:
+an "Abs MT Position X" at axis 0,
 an "Abs MT Position Y" valuator at axis 1,
 a horizontal scroll valuator on axis 2,
-a vertical scroll valuator on axis 3 and an "Abs MT Pressure" valuator
-at axis 4.
+a vertical scroll valuator on axis 3
+and an "Abs MT Pressure" valuator at axis 4.
 .TP 7
 .BI "Option \*qTouchCount\*q \*q" int \*q
 Sets the maximum number of simultaneous touches for touch devices.
@@ -80,33 +90,47 @@ Selects whether "Abs Pressure" is available at the axis 4 in pointer devices.
 The communication with the driver is a binary protocol defined in
 include/xf86-input-inputtest-protocol.h
 .PP
-At the beginning, the client process that communicates with the driver must
-connect to the socket that is created by the driver at SocketPath.
-Once the connection is established, it must write a xf86ITEventClientVersion
-event and read a xf86ITResponseServerVersion response where the driver
-specifies the protocol version supported by it. If this version is lower than
-requested by the client, then the driver will disconnect.
+At the beginning,
+the client process
+that communicates with the driver must connect to the socket
+that is created by the driver at SocketPath.
+Once the connection is established,
+it must write a xf86ITEventClientVersion event
+and read a xf86ITResponseServerVersion response
+where the driver specifies the protocol version supported by it.
+If this version is lower than requested by the client,
+then the driver will disconnect.
 .PP
 After receiving xf86ITResponseServerVersion message the client may send events
-to the driver. Each event is an instance of one of the
-.BI xf86ITEvent*
-structs. The length field defines the full length of the struct in bytes and
-the event field defines the type of the struct.
+to the driver.
+Each event is an instance of one of the
+.BI xf86ITEvent *
+structs.
+The length field defines the full length of the struct in bytes
+and the event field defines the type of the struct.
 .PP
-The responses from the server follow the same structure. Each response is an
-instance of one of the
-.BI xf86ITResponse*
-structs. The length field defines the full length of the struct in bytes and
-the event field defines the type of the struct.
+The responses from the server follow the same structure.
+Each response is an instance of one of the
+.BI xf86ITResponse *
+structs.
+The length field defines the full length of the struct in bytes
+and the event field defines the type of the struct.
 .PP
 The synchronization with Xorg is performed via
-.BI xf86ITEventWaitForSync
-event. After sending such event, the client must read of a
-.BI xf86ITResponseSyncFinished event from the socket without sending additional
-events. The completion of the read operation indicates that Xorg has fully
-processed all input events sent to it so far.
+.B xf86ITEventWaitForSync
+event.
+After sending such event,
+the client must read a
+.B xf86ITResponseSyncFinished
+event from the socket
+without sending additional events.
+The completion of the read operation indicates
+that Xorg has fully processed all input events sent to it so far.
 
 .SH AUTHORS
 Povilas Kanapickas <povilas at radix.lt>
-.SH "SEE ALSO"
- at xservername@(@appmansuffix@), @xconfigfile@(@filemansuffix@), Xserver(@appmansuffix@), X(@miscmansuffix@)
+.SH SEE ALSO
+.BR @xservername@ (@appmansuffix@),
+.BR @xconfigfile@ (@filemansuffix@),
+.BR Xserver (@appmansuffix@),
+.BR X (@miscmansuffix@)
commit 49378eb510224c91e56c9fd376a00e00dfd68cf0
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sat Feb 8 00:59:16 2025 +0000

    exa.man: editorial changes for this man page
    
    Wrong distance between sentences in the input file.
    
    Separate the sentences and subordinate clauses; each begins on a new
    line.  See man-pages(7) ("Conventions for source file layout") and
    "info groff" ("Input Conventions").
    
    Mark a final abbreviation point as such by suffixing it with "\&".
    
    25:Disables acceleration of uploading pixmap data to the framebuffer. Default: No.
    
    -.-.
    
    Split a punctuation mark from a single argument for a two-font macro
    
    40:.BR xorg.conf(5).
    
    -.-.
    
    Section headings (.SH and .SS) do not need quoting.
    
    38:.SH "SEE ALSO"
    
    -.-.
    
    Output from "test-groff  -mandoc -t -K utf8 -rF0 -rHY=0 -rCHECKSTYLE=10 -ww -z ":
    
    an.tmac:<stdin>:40: misuse, warning: .BR is for at least 2 arguments, got 1
            Use macro '.B' for one argument or split argument.
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095446
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/xfree86/exa/man/exa.man b/hw/xfree86/exa/man/exa.man
index c051b998b..5db7475bf 100644
--- a/hw/xfree86/exa/man/exa.man
+++ b/hw/xfree86/exa/man/exa.man
@@ -5,24 +5,30 @@
 exa \- new 2D acceleration architecture for X.Org
 .SH DESCRIPTION
 .B EXA
-provides a simple API for video drivers to implement for 2D acceleration.  It
-is a module loaded by drivers, and is not intended to be loaded on its own.
+provides a simple API for video drivers to implement for 2D acceleration.
+It is a module loaded by drivers,
+and is not intended to be loaded on its own.
 See your driver's manual page for how to enable
 .BR EXA .
 .PP
 The
 .B EXA
-architecture is designed to make accelerating the Render extension simple and
-efficient, and results in various performance tradeoffs compared to XAA.  Some
-xorg.conf options are available for debugging performance issues or
-driver rendering problems.  They are not intended for general use.
+architecture is designed to make accelerating the Render extension simple
+and efficient,
+and results in various performance tradeoffs compared to XAA.
+Some xorg.conf options are available for debugging performance issues
+or driver rendering problems.
+They are not intended for general use.
 .TP
 .BI "Option \*qEXANoComposite\*q \*q" boolean \*q
-Disables acceleration of the Composite operation, which is at the heart of
-the Render extension.  Not related to the Composite extension.  Default: No.
+Disables acceleration of the Composite operation,
+which is at the heart of the Render extension.
+Not related to the Composite extension.
+Default: No.
 .TP
 .BI "Option \*qEXANoUploadToScreen\*q \*q" boolean \*q
-Disables acceleration of uploading pixmap data to the framebuffer. Default: No.
+Disables acceleration of uploading pixmap data to the framebuffer.
+Default: No.
 .TP
 .BI "Option \*qEXANoDownloadFromScreen\*q \*q" boolean \*q
 Disables acceleration of downloading of pixmap data from the framebuffer.
@@ -31,12 +37,16 @@ Not usable with drivers which rely on DownloadFromScreen succeeding.
 Default: No.
 .TP
 .BI "Option \*qMigrationHeuristic\*q \*q" anystr \*q
-Chooses an alternate pixmap migration heuristic, for debugging purposes.  The
-default is intended to be the best performing one for general use, though others
-may help with specific use cases.  Available options include \*qalways\*q,
-\*qgreedy\*q, and \*qsmart\*q.  Default: always.
-.SH "SEE ALSO"
+Chooses an alternate pixmap migration heuristic,
+for debugging purposes.
+The default is intended to be the best performing one for general use,
+though others may help with specific use cases.
+Available options include \*qalways\*q,
+\*qgreedy\*q,
+and \*qsmart\*q.
+Default: always.
+.SH SEE ALSO
 .BR Xorg (@appmansuffix@),
-.BR xorg.conf(@filemansuffix@).
+.BR xorg.conf (@filemansuffix@).
 .SH AUTHORS
 Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel D\(:anzer
commit 359d12aa0b6ae0f6dd1bdf29d1eb1f12904b1ff6
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sun Jun 2 23:11:36 2024 +0000

    Xserver.man: some remarks and editorial changes for this man page
    
    Output from "mandoc -T lint Xserver.1": (possibly shortened list)
    
    mandoc: Xserver.1:117:4: WARNING: undefined escape, printing literally: \+
    mandoc: Xserver.1:118:81: STYLE: input text line longer than 80 bytes: Allow connections fr...
    mandoc: Xserver.1:122:84: STYLE: input text line longer than 80 bytes: Prohibit connections...
    
    Add a comma (or \&) after "e.g." and "i.e.", or use English words
    (man-pages(7)).
    
    81:sets pointer acceleration (i.e. the ratio of how much is reported to how much
    273:sets pointer acceleration threshold in pixels (i.e. after how many pixels
    468:contain either an Internet hostname (e.g. expo.lcs.mit.edu)
    
    Split lines longer than 80 characters into two or more lines.
    Appropriate break points are the end of a sentence and a subordinate
    clause; after punctuation marks.
    
    Xserver.1: line 118 length 81
    Allow connections from clients with an endianess different to that of the server.
    
    Xserver.1: line 122 length 84
    Prohibit connections from clients with an endianess different to that of the server.
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072500
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/man/Xserver.man b/man/Xserver.man
index b6f44dceb..5043e59b8 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -78,7 +78,7 @@ NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which display number clients should try to use.
 .TP 8
 .B \-a \fInumber\fP
-sets pointer acceleration (i.e.\& the ratio of how much is reported to how much
+sets pointer acceleration (i.e., the ratio of how much is reported to how much
 the user actually moved the pointer).
 .TP 8
 .B \-ac
@@ -116,12 +116,14 @@ This is the default unless \-retro or \-wr is specified.
 .B \-bs
 disables backing store support on all screens.
 .TP 8
-.B \+byteswappedclients
-Allow connections from clients with an endianess different to that of the server.
+.B +byteswappedclients
+Allow connections from clients with an endianess different to that of the
+server.
 .TP 8
 .B \-byteswappedclients
-Prohibit connections from clients with an endianess different to that of the server.
-This is the default unless \fB\+byteswappedclients\fP is specified.
+Prohibit connections from clients with an endianess different to that of the
+server.
+This is the default unless \fB+byteswappedclients\fP is specified.
 .TP 8
 .B \-c
 turns off key-click.
@@ -274,7 +276,7 @@ used to limit the server to expose only a specific subset of devices
 connected to the system.
 .TP 8
 .B \-t \fInumber\fP
-sets pointer acceleration threshold in pixels (i.e.\& after how many pixels
+sets pointer acceleration threshold in pixels (i.e., after how many pixels
 pointer acceleration should take effect).
 .TP 8
 .BR \-terminate " ["\c
@@ -472,7 +474,7 @@ If no other authorization mechanism is being used,
 this list initially consists of the host on which the server is running as
 well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where
 \fBn\fP is the display number of the server.  Each line of the file should
-contain either an Internet hostname (e.g.\& expo.lcs.mit.edu)
+contain either an Internet hostname (e.g., expo.lcs.mit.edu)
 or a complete name in the format
 \fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.
 There should be no leading or trailing spaces on any lines.  For example:
@@ -596,7 +598,7 @@ Unix domain socket for display number \fBn\fP
 .I /usr/adm/X\fBn\fPmsgs
 Error log file for display number \fBn\fP if run from \fIinit\fP(@adminmansuffix@)
 .TP 30
-.I @projectroot@/lib/X11/xdm/xdm-errors
+.I @projectroot@/lib/X11/xdm/xdm\-errors
 Default error log file if the server is run from \fIxdm\fP(1)
 .SH "SEE ALSO"
 General information: \fIX\fP(@miscmansuffix@)
@@ -610,7 +612,7 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 \fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1),
 .I "X Logical Font Description Conventions"
 .PP
-Keyboards: \fIxkeyboard-config\fP(@miscmansuffix@)
+Keyboards: \fIxkeyboard\-config\fP(@miscmansuffix@)
 .PP
 Security: \fIXsecurity\fP(@miscmansuffix@), \fIxauth\fP(1), \fIXau\fP(1),
 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
commit 056b447a33dc42e20a5f4c54614177bbc551dad4
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Fri Jul 14 20:36:07 2023 +0000

    Xserver.man: some editorial fixes for the manual
    
    Wrong distance between sentences.
    
    Separate the sentences and subordinate clauses; each begins on a new
    line.  See man-pages(7) ("Conventions for source file layout") and
    "info groff" ("Input Conventions").
    
    Split lines longer than 100 characters into two or more lines.
    Appropriate break points are the end of a sentence and a subordinate
    clause; after punctuation marks.
    
    "[" and "]", showing optional arguments to options, should be typeset in roman.
    
    Output from "test-groff -b -mandoc -dAD=l -rF0 -rHY=0 -t -w w -z -rSTYLECHECK=3":
    an.tmac:<stdin>:104: style: .BI expects at least 2 arguments, got 1
    troff: backtrace: '/home/bg/git/groff/build/s-tmac/an.tmac':524: macro 'B'
    troff: backtrace: file '<stdin>':167
    troff:<stdin>:167: warning: cannot select font 'F'
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1041094
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/man/Xserver.man b/man/Xserver.man
index 1e6025fd8..b6f44dceb 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -101,7 +101,7 @@ specifies a file which contains a collection of authorization records used
 to authenticate access.  See also the \fIxdm\fP(1) and
 \fIXsecurity\fP(@miscmansuffix@) manual pages.
 .TP 8
-.BI \-background\ none
+.B \-background none
 Asks the driver not to clear the background on startup,
 if the driver supports that.
 May be useful for smooth transition with e.g.\& fbdev driver.
@@ -110,7 +110,8 @@ show a previous user session.
 .TP 8
 .B \-br
 sets the default root window to solid black instead of the standard root weave
-pattern.  This is the default unless \-retro or \-wr is specified.
+pattern.
+This is the default unless \-retro or \-wr is specified.
 .TP 8
 .B \-bs
 disables backing store support on all screens.
@@ -162,18 +163,20 @@ disables DPMS (display power management services).  The default state
 is platform and configuration specific.
 .TP 8
 .BI "\-extension " extensionName
-disables named extension.  If an unknown extension name is specified,
+disables named extension.
+If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
 .BI "+extension " extensionName
-enables named extension.  If an unknown extension name is specified,
+enables named extension.
+If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
 .B \-f \fIvolume\fP
 sets beep (bell) volume (allowable range: 0\(en100).
 .TP 8
-.B \-fakescreenfps \fFps\fP
-sets fake presenter screen default fps (allowable range: 1-600).
+.B \-fakescreenfps \fIfps\fP
+sets fake presenter screen default fps (allowable range: 1\(en600).
 .TP 8
 .B \-fp \fIfontPath\fP
 sets the search path for fonts.  This path is a comma separated list
@@ -274,7 +277,8 @@ connected to the system.
 sets pointer acceleration threshold in pixels (i.e.\& after how many pixels
 pointer acceleration should take effect).
 .TP 8
-.B \-terminate \fI[delay]\fP
+.BR \-terminate " ["\c
+.IR  delay ]
 causes the server to terminate at server reset, instead of continuing to run.
 This overrides a previous
 .B \-noreset
@@ -303,7 +307,7 @@ pattern.
 loads the specified extension at init.
 This is a no-op for most implementations.
 .TP 8
-.B [+\-]xinerama
+.RB [ +\- ] xinerama
 enables(+) or disables(\-) the XINERAMA extension.  The default state is
 platform and configuration specific.
 .SH SERVER DEPENDENT OPTIONS
@@ -368,7 +372,8 @@ enables XDMCP and sends Query packets to the specified
 enable XDMCP and broadcasts BroadcastQuery packets to the network.  The
 first responding display manager will be chosen for the session.
 .TP 8
-.B \-multicast [\fIaddress\fP [\fIhop count\fP]]
+.BR  \-multicast " ["\c
+.IR address " [" "hop count" ]]
 Enable XDMCP and multicast BroadcastQuery packets to the  network.
 The first responding display manager is chosen for the session.  If an
 address is specified, the multicast is sent to that address.  If no
@@ -417,7 +422,8 @@ located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
 .IR @projectroot@/lib/X11/xkb .
 .TP 8
-.BR [+\-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
+.RB [ +\- ] accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \
+\fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
 enables(+) or disables(\-) AccessX key sequences.
 .TP 8
 .B \-xkbdir \fIdirectory\fP
@@ -545,10 +551,10 @@ You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
 The directory specified after the catalogue: prefix will be scanned for symlinks
 and each symlink destination will be added as a local fontfile FPE.
 .PP
-The symlink can be suffixed by attributes such as \&'\fBunscaled\fR', which
-will be passed through to the underlying fontfile FPE.  The only exception is
-the newly introduced \&'\fBpri\fR' attribute, which will be used for ordering
-the font paths specified by the symlinks.
+The symlink can be suffixed by attributes such as \&'\fBunscaled\fR',
+which will be passed through to the underlying fontfile FPE.
+The only exception is the newly introduced \&'\fBpri\fR' attribute,
+which will be used for ordering the font paths specified by the symlinks.
 
 An example configuration:
 
@@ -562,8 +568,8 @@ An example configuration:
 
 This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
 \N'39'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
-the attribute \&'unscaled' etc.  This is functionally equivalent to setting
-the following font path:
+the attribute \&'unscaled' etc.
+This is functionally equivalent to setting the following font path:
 
 .nf
     /usr/share/X11/fonts/misc:unscaled,
commit f544e0df2c67d922dd9826c56c84972a9999f7b1
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sat Jul 22 01:15:46 2017 +0000

    Xserver.man: Fix some textual and formatting issues
    
    Protect . if not end of sentence
    
    Protect an aphostrophe (', 0x27), if it can become a control character
    
    Change a HYPHEN-MINUS (code 0x55, 2D) to a minus (\-), if in front of a name
    for an option.
    
    Adjust space between sentences or protect the indicator.
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869252
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/man/Xserver.man b/man/Xserver.man
index d318d30b2..1e6025fd8 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -31,7 +31,7 @@
 Xserver \- X Window System display server
 .SH SYNOPSIS
 .B X
-[option ...]
+[option \&...\&]
 .SH DESCRIPTION
 .I X
 is the generic name for the X Window System display server.  It is
@@ -54,7 +54,7 @@ The X server may also be started directly by the user, though this
 method is usually reserved for testing and is not recommended for
 normal operation.  On some platforms, the user must have special
 permission to start the X server, often because access to certain
-devices (e.g. \fI/dev/mouse\fP) is restricted.  Where applicable, the
+devices (e.g.\& \fI/dev/mouse\fP) is restricted.  Where applicable, the
 X server notifies systemd when it is ready to process requests.
 .PP
 When the X server starts up, it typically takes over the display.  If
@@ -78,7 +78,7 @@ NAMES section of the \fIX\fP(@miscmansuffix@) manual page to learn how to
 specify which display number clients should try to use.
 .TP 8
 .B \-a \fInumber\fP
-sets pointer acceleration (i.e. the ratio of how much is reported to how much
+sets pointer acceleration (i.e.\& the ratio of how much is reported to how much
 the user actually moved the pointer).
 .TP 8
 .B \-ac
@@ -102,14 +102,15 @@ to authenticate access.  See also the \fIxdm\fP(1) and
 \fIXsecurity\fP(@miscmansuffix@) manual pages.
 .TP 8
 .BI \-background\ none
-Asks the driver not to clear the background on startup, if the driver supports that.
-May be useful for smooth transition with eg. fbdev driver.
+Asks the driver not to clear the background on startup,
+if the driver supports that.
+May be useful for smooth transition with e.g.\& fbdev driver.
 For security reasons this is not the default as the screen contents might
 show a previous user session.
 .TP 8
 .B \-br
 sets the default root window to solid black instead of the standard root weave
-pattern.   This is the default unless -retro or -wr is specified.
+pattern.  This is the default unless \-retro or \-wr is specified.
 .TP 8
 .B \-bs
 disables backing store support on all screens.
@@ -161,11 +162,11 @@ disables DPMS (display power management services).  The default state
 is platform and configuration specific.
 .TP 8
 .BI "\-extension " extensionName
-disables named extension.   If an unknown extension name is specified,
+disables named extension.  If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
 .BI "+extension " extensionName
-enables named extension.   If an unknown extension name is specified,
+enables named extension.  If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
 .B \-f \fIvolume\fP
@@ -254,8 +255,8 @@ turns on auto-repeat.
 .B \-retro
 starts the server with the classic stipple and cursor visible.  The default
 is to start with a black root window, and to suppress display of the cursor
-until the first time an application calls XDefineCursor(). For kdrive
-servers, this implies -zap.
+until the first time an application calls XDefineCursor().
+For kdrive servers, this implies \-zap.
 .TP 8
 .B \-s \fIminutes\fP
 sets screen-saver timeout time in minutes.
@@ -264,13 +265,13 @@ sets screen-saver timeout time in minutes.
 disables save under support on all screens.
 .TP 8
 .B \-seat \fIseat\fP
-seat to run on. Takes a string identifying a seat in a platform
-specific syntax. On platforms which support this feature this may be
+seat to run on.  Takes a string identifying a seat in a platform
+specific syntax.  On platforms which support this feature this may be
 used to limit the server to expose only a specific subset of devices
 connected to the system.
 .TP 8
 .B \-t \fInumber\fP
-sets pointer acceleration threshold in pixels (i.e. after how many pixels
+sets pointer acceleration threshold in pixels (i.e.\& after how many pixels
 pointer acceleration should take effect).
 .TP 8
 .B \-terminate \fI[delay]\fP
@@ -410,7 +411,7 @@ data (not that it is very private, being on the command line!).
 Yet another XDMCP specific value, this one allows the display manager to
 identify each display so that it can locate the shared key.
 .SH XKEYBOARD OPTIONS
-X servers that support the XKEYBOARD (a.k.a. \*qXKB\*q) extension accept the
+X servers that support the XKEYBOARD (a.k.a.\& \*qXKB\*q) extension accept the
 following options.  All layout files specified on the command line must be
 located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
@@ -465,7 +466,7 @@ If no other authorization mechanism is being used,
 this list initially consists of the host on which the server is running as
 well as any machines listed in the file \fI/etc/X\fBn\fI.hosts\fR, where
 \fBn\fP is the display number of the server.  Each line of the file should
-contain either an Internet hostname (e.g. expo.lcs.mit.edu)
+contain either an Internet hostname (e.g.\& expo.lcs.mit.edu)
 or a complete name in the format
 \fIfamily\fP:\fIname\fP as described in the \fIxhost\fP(1) manual page.
 There should be no leading or trailing spaces on any lines.  For example:
@@ -534,8 +535,8 @@ The default font path is
 @default_font_path@ .
 .LP
 A special kind of directory can be specified using the \fBcatalogue\fP:
-prefix. Directories specified this way can contain symlinks pointing to the
-real font directories. See the FONTPATH.D section for details.
+prefix.  Directories specified this way can contain symlinks pointing to the
+real font directories.  See the FONTPATH.D section for details.
 .LP
 The font path can be set with the \fB\-fp\fP option or by \fIxset\fP(1)
 after the server has started.
@@ -544,9 +545,9 @@ You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
 The directory specified after the catalogue: prefix will be scanned for symlinks
 and each symlink destination will be added as a local fontfile FPE.
 .PP
-The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
-will be passed through to the underlying fontfile FPE. The only exception is
-the newly introduced '\fBpri\fR' attribute, which will be used for ordering
+The symlink can be suffixed by attributes such as \&'\fBunscaled\fR', which
+will be passed through to the underlying fontfile FPE.  The only exception is
+the newly introduced \&'\fBpri\fR' attribute, which will be used for ordering
 the font paths specified by the symlinks.
 
 An example configuration:
@@ -561,7 +562,7 @@ An example configuration:
 
 This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
 \N'39'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
-the attribute 'unscaled' etc. This is functionally equivalent to setting
+the attribute \&'unscaled' etc.  This is functionally equivalent to setting
 the following font path:
 
 .nf
commit d7b7789cac570abd3040343866a9831f1ea8babc
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Fri Oct 11 20:00:12 2013 +0000

    Xserver.man: some minor markup changes
    
    Dash for a range is \(en
    
    Change a HYPHEN-MINUS (code 0x55, 2D) to a minus (\-), if in front of a name
    for an option.
    
    Add extra word space
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726063
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/man/Xserver.man b/man/Xserver.man
index a9aad463b..d318d30b2 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -125,7 +125,7 @@ This is the default unless \fB\+byteswappedclients\fP is specified.
 turns off key-click.
 .TP 8
 .B c \fIvolume\fP
-sets key-click volume (allowable range: 0-100).
+sets key-click volume (allowable range: 0\(en100).
 .TP 8
 .B \-cc \fIclass\fP
 sets the visual class for the root window of color screens.
@@ -160,16 +160,16 @@ default state is platform and configuration specific.
 disables DPMS (display power management services).  The default state
 is platform and configuration specific.
 .TP 8
-.BI \-extension extensionName
+.BI "\-extension " extensionName
 disables named extension.   If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
-.BI +extension extensionName
+.BI "+extension " extensionName
 enables named extension.   If an unknown extension name is specified,
 a list of accepted extension names is printed.
 .TP 8
 .B \-f \fIvolume\fP
-sets beep (bell) volume (allowable range: 0-100).
+sets beep (bell) volume (allowable range: 0\(en100).
 .TP 8
 .B \-fakescreenfps \fFps\fP
 sets fake presenter screen default fps (allowable range: 1-600).
@@ -251,7 +251,7 @@ turns off auto-repeat.
 .B r
 turns on auto-repeat.
 .TP 8
-.B -retro
+.B \-retro
 starts the server with the classic stipple and cursor visible.  The default
 is to start with a black root window, and to suppress display of the cursor
 until the first time an application calls XDefineCursor(). For kdrive
@@ -302,8 +302,8 @@ pattern.
 loads the specified extension at init.
 This is a no-op for most implementations.
 .TP 8
-.B [+-]xinerama
-enables(+) or disables(-) the XINERAMA extension.  The default state is
+.B [+\-]xinerama
+enables(+) or disables(\-) the XINERAMA extension.  The default state is
 platform and configuration specific.
 .SH SERVER DEPENDENT OPTIONS
 Some X servers accept the following options:
@@ -416,8 +416,8 @@ located in the XKB base directory or a subdirectory, and specified as the
 relative path from the XKB base directory.  The default XKB base directory is
 .IR @projectroot@/lib/X11/xkb .
 .TP 8
-.BR [+-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
-enables(+) or disables(-) AccessX key sequences.
+.BR [+\-]accessx " [ \fItimeout\fP [ \fItimeout_mask\fP [ \fIfeedback\fP [ \fIoptions_mask\fP ] ] ] ]"
+enables(+) or disables(\-) AccessX key sequences.
 .TP 8
 .B \-xkbdir \fIdirectory\fP
 base directory for keyboard layout files.  This option is not available
@@ -577,10 +577,10 @@ the following font path:
 .I /etc/X\fBn\fP.hosts
 Initial access control list for display number \fBn\fP
 .TP 30
-.IR @datadir@/fonts/X11/misc , @datadir@/fonts/X11/75dpi , @datadir@/fonts/X11/100dpi
+.IR @datadir@/fonts/X11/misc ", " @datadir@/fonts/X11/75dpi ", " @datadir@/fonts/X11/100dpi
 Bitmap font directories
 .TP 30
-.IR @datadir@/fonts/X11/TTF , @datadir@/fonts/X11/Type1
+.IR @datadir@/fonts/X11/TTF ", " @datadir@/fonts/X11/Type1
 Outline font directories
 .TP 30
 .I /tmp/.X11-unix/X\fBn\fP
commit c7b6424eed81caafb259878eb501959e69b188a5
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sun Jan 13 06:31:14 2019 +0000

    xorg.conf.5: Some formatting and word corrections in the manual
    
    see man-pages(7) for a style manual.
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919143
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index ccdc9997f..9a49bd0ef 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -14,8 +14,11 @@ than one way, the highest precedence mechanism is used. The list of
 mechanisms is ordered from highest precedence to lowest. Note that not
 all parameters can be supplied via all methods. The available command
 line options and environment variables (and some defaults) are
-described in the Xserver(@appmansuffix@) and
-Xorg(@appmansuffix@) manual pages. Most configuration file
+described in the
+.BR Xserver (@appmansuffix@)
+and
+.BR Xorg (@appmansuffix@)
+manual pages. Most configuration file
 parameters, with their defaults, are described below. Driver and module
 specific configuration parameters are described in the relevant driver
 or module manual page.
@@ -50,11 +53,11 @@ server is started as a normal user:
 .PP
 where
 .I <cmdline>
-is a relative path (with no \(lq..\(rq 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 \(lq..\(rq 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
@@ -109,7 +112,7 @@ directories when the server is started as a normal user:
 .PP
 where
 .I <cmdline>
-is a relative path (with no \(lq..\(rq components) specified with the
+is a relative path (with no \(lq..\&\(rq components) specified with the
 .B \-configdir
 command line option.
 .PP
@@ -379,7 +382,6 @@ is a number used to order the fontfile FPEs. Examples:
 .I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
 .I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
 .fi
-.PP
 .RE
 .RE
 .RE
@@ -551,9 +553,14 @@ extension) to connect from another host.
 Default: off.
 .TP 7
 .BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q
-This tells the mousedrv(@drivermansuffix@) and vmmouse(@drivermansuffix@)
+This tells the
+.BR mousedrv (@drivermansuffix@)
+and
+.BR vmmouse (@drivermansuffix@)
 drivers to not report failure if the mouse device can't be opened/initialised.
-It has no effect on the evdev(@drivermansuffix@) or other drivers.
+It has no effect on the
+.BR evdev (@drivermansuffix@)
+or other drivers.
 Default: false.
 .TP 7
 .BI "Option \*qBlankTime\*q  \*q" time \*q
@@ -565,7 +572,7 @@ is in minutes.
 This is equivalent to the Xorg server's
 .B \-s
 flag, and the value can be changed at run\-time with
-.BR xset(@appmansuffix@).
+.BR xset (@appmansuffix@).
 Default: 10 minutes.
 .TP 7
 .BI "Option \*qStandbyTime\*q  \*q" time \*q
@@ -574,7 +581,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(@appmansuffix@).
+.BR xset (@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -588,7 +595,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(@appmansuffix@).
+.BR xset (@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -602,7 +609,7 @@ sets the inactivity timeout for the
 phase of DPMS mode.
 .I time
 is in minutes, and the value can be changed at run\-time with
-.BR xset(@appmansuffix@).
+.BR xset (@appmansuffix@).
 Default: 10 minutes.
 This is only suitable for VESA DPMS compatible monitors, and may not be
 supported by all video drivers.
@@ -635,9 +642,9 @@ The default value is
 .BR "typical" ,
 which will setup up a typical subset of
 the GLXFBConfigs provided by the driver as GLX visuals.  Other options are
-.BR "minimal" ,
+.BR minimal ,
 which will set up the minimal set allowed by the GLX specification and
-.BR "all"
+.B all
 which will setup GLX visuals for all GLXFBConfigs.
 .TP 7
 .BI "Option \*qUseDefaultFontPath\*q \*q" boolean \*q
@@ -730,7 +737,7 @@ instruction, the standard name is case-sensitive, and does not include the
 "lib" prefix, or the ".a", ".o", or ".so" suffixes.
 .PP
 The second form of entry is a
-.BR SubSection,
+.BR SubSection ,
 with the subsection name being the module name, and the contents of the
 .B SubSection
 being
@@ -785,7 +792,7 @@ it.
 Entries in this section are listed as Option statements with the name of
 the extension as the first argument, and a boolean value as the second.
 The extension name is case\-sensitive, and matches the form shown in the output
-of \*qXorg -extension ?\*q.
+of \*qXorg \-extension ?\*q.
 .PP
 .RS 7
 Example: the MIT-SHM extension can be disabled with the following entry:
@@ -794,7 +801,7 @@ Example: the MIT-SHM extension can be disabled with the following entry:
 .nf
 .B "Section \*qExtensions\*q"
 .B "    Option \*qMIT-SHM\*q \*qDisable\*q"
-.B "EndSection"
+.B EndSection
 .fi
 .RE
 .RE
@@ -806,7 +813,7 @@ Recent X servers employ HAL or udev backends for input device enumeration
 and input hotplugging. It is usually not
 necessary to provide
 .B InputDevice
-sections in the xorg.conf if hotplugging is in use (i.e. AutoAddDevices is
+sections in the xorg.conf if hotplugging is in use (i.e., AutoAddDevices is
 enabled). If hotplugging is enabled,
 .B InputDevice
 sections using the
@@ -843,7 +850,7 @@ sections have the following format:
 .BI "    Driver     \*q" inputdriver \*q
 .I  "    options"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -885,7 +892,6 @@ and
 .BR mousedrv (@drivermansuffix@)
 on other platforms.
 .PP
-.PP
 .B InputDevice
 sections recognise some driver\-independent
 .BR Options ,
@@ -898,11 +904,11 @@ Always add the device to the ServerLayout section used by this instance of
 the server. This affects implied layouts as well as explicit layouts
 specified in the configuration and/or on the command line.
 .TP 7
-.BI "Option \*qCorePointer\*q"
+.B "Option \*qCorePointer\*q"
 Deprecated, see
 .B Floating
 .TP 7
-.BI "Option \*qCoreKeyboard\*q"
+.B "Option \*qCoreKeyboard\*q"
 Deprecated, see
 .B Floating
 .TP 7
@@ -928,7 +934,7 @@ and
 .B SendCoreEvents,
 are the inverse of option
 .B Floating
-(i.e.
+(i.e.,
 .B SendCoreEvents \*qon\*q
 is equivalent to
 .B Floating \*qoff\*q
@@ -950,8 +956,10 @@ respectively.  The identity matrix is "1 0 0 0 1 0 0 0 1".
 .SS POINTER ACCELERATION
 For pointing devices, the following options control how the pointer
 is accelerated or decelerated with respect to physical device motion. Most of
-these can be adjusted at runtime, see the xinput(1) man page for details. Only
-the most important acceleration options are discussed here.
+these can be adjusted at runtime, see the
+.BR xinput (1)
+man page for details.
+Only the most important acceleration options are discussed here.
 .TP 7
 .BI "Option \*qAccelerationProfile\*q  \*q" integer \*q
 Select the profile. In layman's terms, the profile constitutes the "feeling" of
@@ -962,7 +970,7 @@ is constructed. This is mainly a matter of personal preference.
 .RS 6
 .nf
 .B  " 0      classic (mostly compatible)"
-.B  "-1      none (only constant deceleration is applied)"
+.B  "\-1      none (only constant deceleration is applied)"
 .B  " 1      device-dependent"
 .B  " 2      polynomial (polynomial function)"
 .B  " 3      smooth linear (soft knee, then linear)"
@@ -1004,7 +1012,7 @@ profiles to suit the users needs. The
 .B simple
 and
 .B limited
-profiles use it directly (i.e. they accelerate by the factor), for other
+profiles use it directly (i.e., they accelerate by the factor), for other
 profiles it should hold that a higher acceleration factor leads to a faster
 pointer. Typically, 1 is unaccelerated and values up to 5 are sensible.
 .TP 7
@@ -1035,7 +1043,7 @@ sections have the following format:
 .I  "    ..."
 .I  "    options"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -1079,13 +1087,13 @@ attribute. For example:
 .nf
 .B  "Section \*qInputClass\*q"
 .B  "    Identifier   \*qMy Class\*q"
-.B  "    # product string must contain example and
-.B  "    # either gizmo or gadget
-.B  "    MatchProduct \*qexample\*q
-.B  "    MatchProduct \*qgizmo|gadget\*q
-.B  "    NoMatchDriver \*qdrivername\*q
-.I  "    ..."
-.B  "EndSection"
+.B  "    # product string must contain example and"
+.B  "    # either gizmo or gadget"
+.B  "    MatchProduct \*qexample\*q"
+.B  "    MatchProduct \*qgizmo\^|\^gadget\*q"
+.B  "    NoMatchDriver \*qdrivername\*q"
+.I  "    \&.\|.\|.\&"
+.B  EndSection
 .fi
 .RE
 .TP 7
@@ -1224,7 +1232,7 @@ sections have the following format:
 .BI "    Identifier  \*q" name \*q
 .I  "    entries"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -1268,10 +1276,10 @@ For example:
 .nf
 .B  "Section \*qOutputClass\*q"
 .B  "    Identifier   \*qMy Class\*q"
-.B  "    # kernel driver must be either foo or bar
-.B  "    MatchDriver \*qfoo|bar\*q
-.I  "    ..."
-.B  "EndSection"
+.B  "    # kernel driver must be either foo or bar"
+.B  "    MatchDriver \*qfoo\^|\^bar\*q"
+.I  "    \&.\|.\|.\&"
+.B  EndSection
 .fi
 .RE
 .TP 7
@@ -1344,7 +1352,7 @@ sections have the following format:
 .BI "    Driver     \*q" driver \*q
 .I  "    entries"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -1417,7 +1425,7 @@ section is required for each head, and this
 parameter determines which head each of the
 .B Device
 sections applies to.
-The legal values of
+The valid values of
 .I number
 range from 0 to one less than the total number of heads per entity.
 Most drivers require that the primary screen (0) be present.
@@ -1477,7 +1485,7 @@ For details, see the appropriate driver manual page.
 .BI "VideoRam  " "mem"
 This optional entry specifies the amount of video ram that is installed
 on the graphics board.
-This is measured in kBytes.
+This is measured in kilobytes.
 In most cases this is not required because the Xorg server probes
 the graphics board to determine this quantity.
 The driver-specific documentation should indicate when it might be needed.
@@ -1508,7 +1516,7 @@ when the driver-specific documentation recommends it.
 Only apply this
 .B Device
 section if X server was started with
-.B -seat
+.B \-seat
 .I seat\-id
 option.
 .TP 7
@@ -1566,7 +1574,7 @@ sections have the following format:
 .BI "    Identifier \*q" name \*q
 .I  "    entries"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -1643,7 +1651,7 @@ is added to the end of the line.
 The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
-If this entry is omitted, a default range of 28\-33kHz is used.
+If this entry is omitted, a default range of 28\(en33\ kHz is used.
 .TP 7
 .BI "VertRefresh  " "vertrefresh\-range"
 gives the range(s) of vertical refresh frequencies supported by the
@@ -1662,7 +1670,7 @@ is added to the end of the line.
 The data given here is used by the Xorg server to determine if video
 modes are within the specifications of the monitor.
 This information should be available in the monitor's handbook.
-If this entry is omitted, a default range of 43\-72Hz is used.
+If this entry is omitted, a default range of 43\(en72\ Hz is used.
 .TP 7
 .BI "DisplaySize  " "width height"
 This optional entry gives the width and height, in millimetres, of the
@@ -1683,7 +1691,7 @@ Not all drivers are capable of using this information.
 Include the set of modes listed in the
 .B Modes
 section called
-.IR modesection\-id.
+.IR modesection\-id .
 This makes all of the modes defined in that section available for use by
 this monitor.
 .TP 7
@@ -1938,7 +1946,7 @@ sections have the following format:
 .BI "    Identifier \*q" name \*q
 .I  "    entries"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -1987,12 +1995,12 @@ sections have the following format:
 .BI "    Monitor    \*q" monid \*q
 .I  "    entries"
 .I  "    ..."
-.BI "    SubSection \*qDisplay\*q"
+.B  "    SubSection \*qDisplay\*q"
 .I  "       entries"
-.I  "       ...
+.I  "       \&.\|.\|.\&"
 .B  "    EndSubSection"
-.I  "    ..."
-.B  "EndSection"
+.I  "    \&.\|.\|.\&"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -2030,14 +2038,17 @@ section in the config file.
 .BI "GPUDevice  \*q" device\-id \*q
 This entry specifies the
 .B Device
-section to be used as a secondary GPU device for this screen.  When multiple graphics cards are
-present, this is what ties a specific secondary card to a screen.  The
+section to be used as a secondary GPU device for this screen.
+When multiple graphics cards are present, this is what ties a specific
+secondary card to a screen.
+The
 .I device\-id
 must match the
 .B Identifier
 of a
 .B Device
-section in the config file. This can be specified up to 4 times for a single screen.
+section in the config file.
+This can be specified up to 4 times for a single screen.
 .TP 7
 .BI "Monitor  \*q" monitor\-id \*q
 specifies which monitor description is to be used for this screen.
@@ -2073,7 +2084,7 @@ sparse 32 bit framebuffer layout.
 Only apply this
 .B Screen
 section if X server was started with
-.B -seat
+.B \-seat
 .I seat\-id
 option.
 .TP 7
@@ -2087,7 +2098,7 @@ Some are driver\-specific and are described in the driver documentation.
 Others are driver\-independent, and will eventually be described here.
 .\" XXX These should really be in an xaa man page.
 .TP 7
-.BI "Option \*qAccel\*q"
+.B "Option \*qAccel\*q"
 Enables 2D hardware acceleration.
 This option is on by default, but it may be necessary to turn it off if
 there are bugs in the driver.
@@ -2193,7 +2204,7 @@ This entry specifies the framebuffer format this
 .B Display
 subsection is to be used for.
 This entry is only needed when providing depth 24 configurations that allow
-a choice between a 24 bpp packed framebuffer format and a 32bpp sparse
+a choice between a 24\ bpp packed framebuffer format and a 32\ bpp sparse
 framebuffer format.
 In most cases this entry should not be used.
 .TP 7
@@ -2204,7 +2215,7 @@ formats.
 This may also be specified from the command line with the
 .B \-weight
 option (see
-.BR Xorg(@appmansuffix@)).
+.BR Xorg (@appmansuffix@)).
 .TP 7
 .BI "Virtual  " "xdim ydim"
 This optional entry specifies the virtual screen resolution to be used.
@@ -2255,7 +2266,7 @@ built-in VESA standard modes.
 .BI "Visual  \*q" visual\-name \*q
 This optional entry sets the default root visual type.
 This may also be specified from the command line (see the
-.BR Xserver(@appmansuffix@)
+.BR Xserver (@appmansuffix@)
 man page).
 The visual types available for depth 8 are (default is
 .BR PseudoColor ):
@@ -2362,7 +2373,7 @@ sections have the following format:
 .I  "    ..."
 .I  "    options"
 .I  "    ..."
-.B  "EndSection"
+.B  EndSection
 .fi
 .RE
 .PP
@@ -2484,7 +2495,7 @@ and core keyboard devices respectively.
 Only apply this
 .B ServerLayout
 section if X server was started with
-.B -seat
+.B \-seat
 .I seat\-id
 option.
 .TP 7
@@ -2531,7 +2542,7 @@ section for a dual headed configuration with two mice:
 .B "    InputDevice \*qMouse 1\*q    \*qCorePointer\*q"
 .B "    InputDevice \*qMouse 2\*q    \*qSendCoreEvents\*q"
 .B "    Option      \*qBlankTime\*q  \*q5\*q"
-.B "EndSection"
+.B EndSection
 .fi
 .RE
 .SH "DRI SECTION"
@@ -2551,7 +2562,6 @@ entry and multiple
 .B Option
 flags.
 The data therein is not used in this release.
-.PP
 .SH "SEE ALSO"
 General:
 .BR X (@miscmansuffix@),
commit e4d2de81980666757580366e597455f5d2d43889
Author: Tanguy Ortolo <tanguy+debian at ortolo.eu>
Date:   Tue Jul 29 13:32:07 2014 +0200

    xorg.conf.man: Complete the xorg.conf.5 manpage with Option "Disable"
    
    The xorg.conf.5 manpage mentions an "Enable" option to enable a monitor
    regardless of whether or not it is connected, but gives no indication of how
    to disable it. This patch corrects that by documenting the "Disable" option.
    
    Orignally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755809
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index bf1077add..ccdc9997f 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1877,6 +1877,12 @@ at startup.  By default, the server will attempt to enable all connected
 monitors.
 (RandR 1.2-supporting drivers only)
 .TP 7
+.BI "Option \*qDisable\*q \*q" bool \*q
+This optional entry specifies whether the monitor should be turned off
+at startup.  By default, the server will attempt to enable all connected
+monitors.
+(RandR 1.2-supporting drivers only)
+.TP 7
 .BI "Option \*qDefaultModes\*q \*q" bool \*q
 This optional entry specifies whether the server should add supported default
 modes to the list of modes offered on this monitor. By default, the server
commit 1f8e32ea65e6ad7646e42ee4839b1fe9579c2f13
Author: Bjarni Ingi Gislason <bjarniig at rhi.hi.is>
Date:   Sat Apr 7 20:20:14 2012 +0000

    xorg.conf.man: unprotected period in ellipses
    
    Originally from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667983
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875>

diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index ac214591e..bf1077add 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -156,7 +156,7 @@ Each section has the form:
 .nf
 .BI "Section  \*q" SectionName \*q
 .RI "    " SectionEntry
-    ...
+    \&...
 .B EndSection
 .fi
 .RE
@@ -1548,7 +1548,7 @@ section, and they may also be included here.
 
 .SH "VIDEOADAPTOR SECTION"
 Nobody wants to say how this works.
-Maybe nobody knows ...
+Maybe nobody knows \&...
 
 .SH "MONITOR SECTION"
 The config file may have multiple


More information about the xorg-commit mailing list