xserver: Branch 'master' - 5 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jun 2 01:53:45 UTC 2025


 hw/kdrive/Xkdrive.man                          |    2 -
 hw/kdrive/ephyr/man/Xephyr.man                 |   23 ++++++-------
 hw/vfb/man/Xvfb.man                            |    2 -
 hw/xfree86/drivers/modesetting/modesetting.man |    6 +--
 hw/xfree86/man/Xorg.man                        |    4 --
 hw/xfree86/man/xorg.conf.man                   |    2 -
 hw/xquartz/man/Xquartz.man                     |    3 -
 hw/xwayland/man/Xwayland.man                   |    4 +-
 hw/xwin/man/XWin.man                           |    4 +-
 hw/xwin/man/XWinrc.man                         |    1 
 man/Xserver.man                                |   44 ++++++++++++-------------
 11 files changed, 42 insertions(+), 53 deletions(-)

New commits:
commit 0d2213ec4485753448850bf317e6ca9e3f86249f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 15:15:13 2025 -0700

    Xephyr.man: Use \- to get ASCII hyphens instead of Unicode dashes
    
    Used in command-line arguments and email addresses
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009>

diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index 89eb32116..765e43f2d 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -43,32 +43,32 @@ The server accepts all the standard options of
 .BR Xserver (@appmansuffix@)
 and the following additional options:
 .TP 8
-.BI -screen " width" x height
+.BI \-screen " width" x height
 sets the screen size.
 .TP 8
-.BI -parent " id"
+.BI \-parent " id"
 uses existing window
 .I id .
 If a
-.B -screen
+.B \-screen
 argument follows a
-.B -parent
+.B \-parent
 argument, this screen is embedded into the given window.
 .TP 8
-.B -host-cursor
+.B \-host\-cursor
 set 'cursor acceleration':
 The host's cursor is reused. This is only really there to aid
 debugging by avoiding server paints for the cursor. Performance
 improvement is negligible.
 .TP 8
-.B -resizeable
+.B \-resizeable
 Allow the Xephyr window to be resized, even if not embedded into a parent
 window. By default, the Xephyr window has a fixed size.
 .TP 8
-.B -no-host-grab
+.B \-no\-host\-grab
 Disable grabbing the keyboard and mouse.
 .SH "SIGNALS"
-Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
+Send a SIGUSR1 to the server (e.g. pkill \-USR1 Xephyr) to
 toggle the debugging mode.
 In this mode red rectangles are painted to
 screen areas getting painted before painting the actual content.
@@ -81,9 +81,9 @@ Rotated displays are currently updated via full blits. This
 is slower than a normal orientated display. Debug mode will
 therefore not be of much use rotated.
 .IP \(bu 2
-The '-host-cursor' cursor is static in its appearance.
+The '\-host\-cursor' cursor is static in its appearance.
 .IP \(bu 2
-The build gets a warning about 'nanosleep'. I think the various '-D'
+The build gets a warning about 'nanosleep'. I think the various '\-D'
 build flags are causing this. I haven't figured as yet how to work
 round it. It doesn't appear to break anything however.
 .IP \(bu 2
@@ -94,4 +94,4 @@ Mouse button 5 probably won't work.
 .BR X (@miscmansuffix@),
 .BR Xserver (@appmansuffix@)
 .SH AUTHOR
-Matthew Allum <mallum at o-hand.com> 2004
+Matthew Allum <mallum at o\-hand.com> 2004
commit ff4f2f718bfdca705953f7f0a4ba3e75a09ff49d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 15:10:35 2025 -0700

    man pages: don't use .BI macro with a single argument
    
    Clears warnings from groff -rCHECKSTYLE=10:
    
    an.tmac: Xephyr.man:53: style: .BI expects at least 2 arguments, got 1
    an.tmac: Xephyr.man:55: style: .BI expects at least 2 arguments, got 1
    an.tmac: Xwayland.man:151: style: .BI expects at least 2 arguments, got 1
    an.tmac: Xwayland.man:166: style: .BI expects at least 2 arguments, got 1
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009>

diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index 617f2cdaa..89eb32116 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -50,9 +50,9 @@ sets the screen size.
 uses existing window
 .I id .
 If a
-.BI -screen
+.B -screen
 argument follows a
-.BI -parent
+.B -parent
 argument, this screen is embedded into the given window.
 .TP 8
 .B -host-cursor
diff --git a/hw/xwayland/man/Xwayland.man b/hw/xwayland/man/Xwayland.man
index 1a35a6828..ea6d78eed 100644
--- a/hw/xwayland/man/Xwayland.man
+++ b/hw/xwayland/man/Xwayland.man
@@ -148,7 +148,7 @@ Run \fIXwayland\fP rootless, so that X clients integrate seamlessly with
 Wayland clients in a Wayland desktop. That requires the Wayland server
 to be an X window manager as well.
 .TP 8
-.BI \-shm
+.B \-shm
 Force the shared memory backend instead of glamor (if available) for passing
 buffers to the Wayland server.
 
@@ -163,7 +163,7 @@ verbosity level.  When the
 value is supplied, the verbosity level is set to that value.  The default
 verbosity level is 0.
 .TP 8
-.BI \-version
+.B \-version
 Show the server version and exit.
 .TP 8
 .B \-wm \fIfd\fP
commit 286578e83ed6519fb654547b70b6d9d58708f095
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 15:06:23 2025 -0700

    XWin.man: fix typos in font change escapes
    
    Fixes warnings from `mandoc -T lint`:
    
    mandoc: XWin.man:332:28: WARNING: invalid escape sequence: \fp
    mandoc: XWin.man:397:1: WARNING: invalid escape sequence: \fX
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009>

diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index d84d95e30..385e90ceb 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -329,7 +329,7 @@ values will yield a still more detailed debug output.
 .TP 8
 .B "\-xkbrules \fIrule\fP"
 .TP 8
-.B "\-xkbvariant \fIvariant\fp"
+.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
@@ -394,7 +394,7 @@ window, in both the generic case and for particular programs.
 \fIXWin -multiwindow\fP produces for each top-level X-window.
 .br
 * To change the style that is associated to the \fIWindows\fP window that
-\fXWin I-multiwindow\fP produces for each top-level X window.
+\fIXWin -multiwindow\fP produces for each top-level X window.
 .PP
 The format of the \fI.XWinrc\fP file is given in the
 .BR XWinrc (5)
commit bd08e04fcb43465fe8d2fe371b7b40bf78e94fa9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 15:01:49 2025 -0700

    man pages: remove extraneous PP macros
    
    Clears warnings from `mandoc -T lint` of the forms:
    mandoc: Xorg.man:26:2: WARNING: skipping paragraph macro: PP after SH
    mandoc: Xorg.man:40:2: WARNING: skipping paragraph macro: PP empty
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009>

diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index 0ebd4e92c..617f2cdaa 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -76,7 +76,6 @@ The
 delay between this can be altered by setting a XEPHYR_PAUSE env var to
 a value in micro seconds.
 .SH CAVEATS
-.PP
 .IP \(bu 2
 Rotated displays are currently updated via full blits. This
 is slower than a normal orientated display. Debug mode will
diff --git a/hw/vfb/man/Xvfb.man b/hw/vfb/man/Xvfb.man
index 82bb8137e..8d040a4c7 100644
--- a/hw/vfb/man/Xvfb.man
+++ b/hw/vfb/man/Xvfb.man
@@ -48,7 +48,6 @@ rendering engine, load testing, as an aid to porting the X server to a
 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
 .BR Xserver (1)
 manual page, \fIXvfb\fP accepts the following command line switches:
@@ -119,7 +118,6 @@ and will use memory mapped files in /var/tmp for the framebuffer.
 xwud -in /var/tmp/Xvfb_screen0
 Displays screen 0 of the server started by the preceding example.
 .SH "SEE ALSO"
-.PP
 .BR X (@miscmansuffix@),
 .BR Xserver (1),
 .BR xwd (1),
diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index b928d535b..a77b4ffaa 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -23,7 +23,6 @@ The XFree86 release was originally derived from
 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
 Consulting Service.
 .SH PLATFORMS
-.PP
 .B Xorg
 operates under a wide range of operating systems and hardware platforms.
 The Intel x86 (IA32) architecture is the most widely supported hardware
@@ -37,7 +36,6 @@ GNU Hurd.  Mac OS X is supported with the
 X server.  Win32/Cygwin is supported with the
 .BR XWin (@appmansuffix@)
 X server.
-.PP
 .SH "NETWORK CONNECTIONS"
 .B Xorg
 supports connections made using the following reliable
@@ -400,7 +398,6 @@ Print out the server version, patchlevel, release date, the operating
 system/platform it was built on, and whether it includes module loader
 support.
 .SH "KEYBOARD"
-.PP
 The
 .B Xorg
 server is normally configured to recognize various special combinations
@@ -657,7 +654,6 @@ information can be found from the X.Org web site
 \fI<https://www.x.org/>\fP.
 
 .SH LEGAL
-.PP
 .B Xorg
 is copyright software, provided under licenses that permit modification
 and redistribution in source and binary form without fee.
diff --git a/hw/xquartz/man/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 5d2eea017..43d5969dd 100644
--- a/hw/xquartz/man/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man
@@ -91,7 +91,6 @@ This option defaults to false and is only accessible through the command line.
 .B defaults write @bundle_id_prefix at .X11 scroll_in_device_direction -boolean true
 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
 .BR Xserver (1)
 manual page, \fIXquartz\fP accepts the following command line switches:
@@ -145,7 +144,6 @@ and ASL_LEVEL_NOTICE respectively.  In order to see these messages in syslog,
 you will need to adjust XQuartz's asl mask as above but using -i or -n
 instead of -d.
 .SH "SEE ALSO"
-.PP
 .BR X (@miscmansuffix@),
 .BR Xserver (1),
 .BR xdm (1),
@@ -154,7 +152,6 @@ instead of -d.
 .BR syslogd (8)
 .PP
 https://www.xquartz.org/
-.PP
 .SH AUTHORS / HISTORY
 X11 was originally ported to Mac OS X Server by John Carmack.  Dave
 Zarzycki used this as the basis of his port of XFree86 4.0 to Darwin 1.0.
diff --git a/hw/xwin/man/XWinrc.man b/hw/xwin/man/XWinrc.man
index 71d59f99f..bff8f96d6 100644
--- a/hw/xwin/man/XWinrc.man
+++ b/hw/xwin/man/XWinrc.man
@@ -136,7 +136,6 @@ such items should be included at the start or at the end of the menu.
 
 .SH Icon Instructions
 When specifying an \fIicon-specifier\fP in the following commands several different formats are allowed:
-.PP
 .IP \fI"NAME.ICO"\fP 16
 filename of an .ico format file
 .br
commit 6dfe3e7db663f3432b4f6aa63078b5f5d6fd93aa
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat May 31 14:51:24 2025 -0700

    man pages: strip trailing whitespace
    
    Gets rid of many warnings from `mandoc -T lint` of the form:
    mandoc: ./man/Xserver.man:621:7: STYLE: whitespace at end of input line
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009>

diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man
index 8f465b850..2111e2b86 100644
--- a/hw/kdrive/Xkdrive.man
+++ b/hw/kdrive/Xkdrive.man
@@ -10,7 +10,7 @@ Xkdrive \- tiny X server
 .SH DESCRIPTION
 .B Xkdrive
 is a family of X servers designed to be particularly small.  This
-manual page describes the common functionality of the 
+manual page describes the common functionality of the
 .B Xkdrive
 servers; for information on a specific X server, please refer to the
 relevant manual page.
diff --git a/hw/xfree86/drivers/modesetting/modesetting.man b/hw/xfree86/drivers/modesetting/modesetting.man
index 6a2935919..26212725c 100644
--- a/hw/xfree86/drivers/modesetting/modesetting.man
+++ b/hw/xfree86/drivers/modesetting/modesetting.man
@@ -22,7 +22,7 @@ If glamor is not enabled, a shadow framebuffer is configured based on the
 KMS drivers' preference (unless the framebuffer is 24 bits per pixel, in
 which case the shadow framebuffer is always used).
 .SH SUPPORTED HARDWARE
-The 
+The
 .B modesetting
 driver supports all hardware where a KMS driver is available.
 modesetting uses the Linux DRM KMS ioctls and dumb object create/map.
@@ -32,7 +32,7 @@ Please refer to
 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 
+For this driver it is not required to specify modes in the screen
 section of the config file.  The
 .B modesetting
 driver can pick up the currently used video mode from the kernel
@@ -41,7 +41,7 @@ driver and will use it if there are no video modes configured.
 For PCI boards you might have to add a BusID line to the Device
 section.  See above for a sample line.
 .PP
-The following driver 
+The following driver
 .B Options
 are supported:
 .TP
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 9a49bd0ef..b677f5d4a 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -2116,7 +2116,7 @@ Default: mesa.
 .TP 7
 .BI "Option \*RenderingAPI\*q \*q" string \*q
 This option specifies an rendering API for use in conjunction with Glamor
-accel method. You can specify OpenGL with a value "gl" and OpenGL ES with a 
+accel method. You can specify OpenGL with a value "gl" and OpenGL ES with a
 value "es", and the default is both, when Glamor fallbacks to GLES if GL 2.1 is
 not available. This may be useful for embedded and old cards, where GL ES
 feature set works faster than GL feature set.
diff --git a/man/Xserver.man b/man/Xserver.man
index 13f774fa4..e21cc4a25 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -618,46 +618,46 @@ Protocols:
 .I "The X Font Service Protocol,"
 .I "X Display Manager Control Protocol"
 .PP
-Fonts: 
-.BR bdftopcf (1), 
-.BR mkfontdir (1), 
+Fonts:
+.BR bdftopcf (1),
+.BR mkfontdir (1),
 .BR mkfontscale (1),
-.BR xfs (1), 
-.BR xlsfonts (1), 
-.BR xfontsel (1), 
+.BR xfs (1),
+.BR xlsfonts (1),
+.BR xfontsel (1),
 .BR xfd (1),
 .I "X Logical Font Description Conventions"
 .PP
-Keyboards: 
+Keyboards:
 .BR xkeyboard\-config (@miscmansuffix@)
 .PP
-Security: 
-.BR Xsecurity (@miscmansuffix@), 
-.BR xauth (1), 
+Security:
+.BR Xsecurity (@miscmansuffix@),
+.BR xauth (1),
 .BR Xau (3),
-.BR xdm (1), 
+.BR xdm (1),
 .BR xhost (1),
 .I "Security Extension Specification"
 .PP
-Starting the server: 
-.BR startx (1), 
-.BR xdm (1), 
+Starting the server:
+.BR startx (1),
+.BR xdm (1),
 .BR xinit (1)
 .PP
-Controlling the server once started: 
-.BR xset (1), 
+Controlling the server once started:
+.BR xset (1),
 .BR xsetroot (1),
-.BR xhost (1), 
-.BR xinput (1), 
+.BR xhost (1),
+.BR xinput (1),
 .BR xrandr (1)
 .PP
 Server-specific man pages:
-.BR Xorg (1), 
+.BR Xorg (1),
 .BR Xwayland (1),
-.BR Xephyr (1), 
+.BR Xephyr (1),
 .BR Xnest (1),
-.BR Xvfb (1), 
-.BR Xquartz (1), 
+.BR Xvfb (1),
+.BR Xquartz (1),
 .BR XWin (1).
 .PP
 Server internal documentation:


More information about the xorg-commit mailing list