--- a/open-src/doc/xorg-docs/Makefile Thu Oct 29 17:12:46 2015 -0700
+++ b/open-src/doc/xorg-docs/Makefile Fri Oct 30 16:33:32 2015 -0700
@@ -38,6 +38,7 @@
TARBALL_SHA256= 24b8677c3462c10465cf50d40576d76682acd5835526093a575865b2aa242c4b
# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES += upstream-manpages.patch,-p1
SOURCE_PATCHES += solaris-manpages.patch,-p1
# Man pages to apply distro customizations to
--- a/open-src/doc/xorg-docs/solaris-manpages.patch Thu Oct 29 17:12:46 2015 -0700
+++ b/open-src/doc/xorg-docs/solaris-manpages.patch Fri Oct 30 16:33:32 2015 -0700
@@ -27,24 +27,27 @@
display managers, you will normally see a window on the screen welcoming you
to the system and asking for your login information. Simply type them in as
you would at a normal terminal. If you make a mistake, the display manager
-@@ -362,10 +363,12 @@ to explicitly draw the window's region on the screen with the pointer, for
+@@ -362,13 +363,12 @@ to explicitly draw the window's region on the screen with the pointer, for
example).
.PP
Since window managers are regular (albeit complex) client programs,
--a variety of different user interfaces can be built. The X.Org Foundation distribution
--comes with a window manager named \fItwm\fP which supports overlapping windows,
+-a variety of different user interfaces can be built. The X.Org Foundation
+-provides a window manager named \fItwm\fP which supports overlapping windows,
-popup menus, point-and-click or click-to-type input models, title bars, nice
-icons (and an icon manager for those who don't like separate icon windows).
+-.PP
+-See your distro package manager for other
+-popular window managers.
+a variety of different user interfaces can be built.
+__distroname__ includes several window managers, including the
+GNOME window manager
+.IR metacity (1),
+and the X.Org classic window manager
+.IR twm (1).
- .PP
- See the user-contributed software in the X.Org Foundation distribution for other
- popular window managers.
-@@ -1265,14 +1268,22 @@ the appropriate instance name can be placed before the asterisk:
+ .SH "FONT NAMES"
+ Collections of characters for displaying text and symbols in X are known as
+ \fIfonts\fP. A font typically contains images that share a common appearance
+@@ -1265,10 +1268,14 @@ the appropriate instance name can be placed before the asterisk:
.BR Xdmx (__appmansuffix__),
.BR Xephyr (__appmansuffix__),
.BR Xnest (__appmansuffix__),
@@ -58,14 +61,6 @@
+.BR metacity (1),
+.BR locale (__miscmansuffix__).
+
+ .PP
.\" specifications
.I "Xlib \- C Language X Interface\fR,\fP"
- and
- .I "X Toolkit Intrinsics \- C Language Interface"
-+.PP
-+Those specifications, and additional specifications & documentation for the
-+X Window System may also be found in /usr/share/doc/ or on the X.Org
-+Foundation website at http://www.x.org/
- .SH TRADEMARKS
- .PP
- X Window System is a trademark of The Open Group.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/doc/xorg-docs/upstream-manpages.patch Fri Oct 30 16:33:32 2015 -0700
@@ -0,0 +1,410 @@
+From cdf00c1095f9e7dd26dccad3049442684768da62 Mon Sep 17 00:00:00 2001
+From: Ingo Schwarze <[email protected]>
+Date: Sun, 30 Aug 2015 15:22:10 +0200
+Subject: [PATCH:xorg-docs 1/5] remove bogus \/ escapes
+
+some X manuals use then escape sequence \/ when they want to render
+a slash. That's bad because \/ is not a slash but an italic
+correction, never producing any output, having no effect at all in
+terminal output, and only changing spacing in a minor way in typeset
+output.
+
+Reviewed-by: Mark Kettenis <[email protected]>
+Signed-off-by: Matthieu Herrb <[email protected]>
+---
+ man/X.man | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/X.man b/man/X.man
+index 16b4c96..bc9fc1a 100644
+--- a/man/X.man
++++ b/man/X.man
+@@ -224,7 +224,7 @@ The hostname part of the display name should be the empty string.
+ For example: \fI:0\fP, \fI:1\fP, and \fI:0.1\fP. The most efficient
+ local transport will be chosen.
+ .TP 8
+-.I TCP\/IP
++.I TCP/IP
+ .br
+ The hostname part of the display name should be the server machine's
+ hostname or IP address. Full Internet names, abbreviated names, IPv4
+@@ -487,7 +487,7 @@ implementation dependent.
+ If the name is not found, the color is looked up in the
+ X server's database.
+ The text form of this database is commonly stored in the file
+-\fI\__datadir__/X11/rgb.txt\fP.
++\fI__datadir__/X11/rgb.txt\fP.
+ .PP
+ A numerical color specification
+ consists of a color space name and a set of values in the following syntax:
+@@ -1164,7 +1164,7 @@ A wide variety of error messages are generated from various programs.
+ The default error handler in \fIXlib\fP (also used by many toolkits) uses
+ standard resources to construct diagnostic messages when errors occur. The
+ defaults for these messages are usually stored in
+-\fI\__datadir__/X11/XErrorDB\fP. If this file is not present,
++\fI__datadir__/X11/XErrorDB\fP. If this file is not present,
+ error messages will be rather terse and cryptic.
+ .PP
+ When the X Toolkit Intrinsics encounter errors converting resource strings to
+--
+1.7.9.2
+
+From 02a513c7847ce37ba3bc1e6f2f5ed5a77062a60d Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 17:49:44 -0700
+Subject: [PATCH:xorg-docs 2/5] X.man: give pointers to specs & other docs
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ man/X.man | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/man/X.man b/man/X.man
+index bc9fc1a..057a7b8 100644
+--- a/man/X.man
++++ b/man/X.man
+@@ -76,6 +76,20 @@ the \fIXlib - C Language X Interface\fP manual,
+ the \fIX Window System Protocol\fP specification,
+ the \fIX Toolkit Intrinsics - C Language Interface\fP manual,
+ and various toolkit documents.
++.\" Use .UR macro from groff's man(7) if available, otherwise just
++.\" display URL as plain text for other processors.
++.if !d UR \{
++.de UR
++.RI < \\$1 >
++..
++.de UE
++.RI \\$1
++.. \}
++.\"
++Those manuals, specifications, & documents may be found in
++__datadir__/doc or on the X.Org Foundation website at
++.UR "http://www.x.org/releases/current/doc/"
++.UE .
+ .PP
+ The number of programs that use \fIX\fP is quite large.
+ Programs provided in the core X.Org Foundation distribution include:
+@@ -1269,10 +1283,17 @@ the appropriate instance name can be placed before the asterisk:
+ .BR Xvfb (__appmansuffix__),
+ .BR Xvnc (__appmansuffix__),
+ .BR XWin (__appmansuffix__).
++.PP
+ .\" specifications
+ .I "Xlib \- C Language X Interface\fR,\fP"
+ and
+ .I "X Toolkit Intrinsics \- C Language Interface"
++.PP
++Those specifications, and additional specifications & documentation for the
++X Window System may also be found in __datadir__/doc or on the X.Org Foundation
++website at
++.UR "http://www.x.org/releases/current/doc/"
++.UE .
+ .SH TRADEMARKS
+ .PP
+ X Window System is a trademark of The Open Group.
+--
+1.7.9.2
+
+From b0348bd9f9c79b87c93e2d71dba674ebcb31d8f7 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 18:15:06 -0700
+Subject: [PATCH:xorg-docs 3/5] X.man: update program lists/info for modern
+ era
+
+We no longer have a monolithic X.Org distribution, nor a separate
+user-contributed distribution from X.Org, but instead many OS distros.
+
+Also stop recommending so much abandonware, but do point out the programs
+we've added over the years and still maintain.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ man/X.man | 53 +++++++++++++++++++++++++----------------------------
+ 1 file changed, 25 insertions(+), 28 deletions(-)
+
+diff --git a/man/X.man b/man/X.man
+index 057a7b8..d07e69e 100644
+--- a/man/X.man
++++ b/man/X.man
+@@ -92,42 +92,37 @@ __datadir__/doc or on the X.Org Foundation website at
+ .UE .
+ .PP
+ The number of programs that use \fIX\fP is quite large.
+-Programs provided in the core X.Org Foundation distribution include:
++Sample programs provided by the X.Org Foundation include:
+ a terminal emulator, \fIxterm\fP;
+ a window manager, \fItwm\fP;
++a compositing manager, \fIxcompmgr\fP;
+ a display manager, \fIxdm\fP;
+ a console redirect program, \fIxconsole\fP;
+-a mail interface, \fIxmh\fP;
+-a bitmap editor, \fIbitmap\fP;
++utilities for managing input and output devices, \fIxinput\fP and \fIxrandr\fP;
+ resource listing/manipulation tools, \fIappres\fP, \fIeditres\fP;
+ access control programs, \fIxauth\fP, \fIxhost\fP, and \fIiceauth\fP;
+-user preference setting programs, \fIxrdb\fP, \fIxcmsdb\fP,
++user preference setting programs, \fItransset\fP, \fIxrdb\fP, \fIxcmsdb\fP,
+ \fIxset\fP, \fIxsetroot\fP, \fIxstdcmap\fP, and \fIxmodmap\fP;
+ clocks, \fIxclock\fP and \fIoclock\fP;
+-a font displayer, \fIxfd\fP;
+-utilities for listing information about fonts, windows, and displays,
+-\fIxlsfonts\fP, \fIxwininfo\fP, \fIxlsclients\fP,
+-\fIxdpyinfo\fP, \fIxlsatoms\fP, and \fIxprop\fP;
++font display utilities, \fIxfd\fP and \fIxfontsel\fP;
++utilities for listing information about displays, extensions, and resources,
++\fIxdpyinfo\fP, \fIxdriinfo\fP, \fIxvinfo\fP, \fIxwininfo\fP, \fIxlsclients\fP,
++\fIxprop\fP, \fIxlsatoms\fP, \fIxlsclients\fP, and \fIxlsfonts\fP;
+ screen image manipulation utilities, \fIxwd\fP, \fIxwud\fP, and \fIxmag\fP;
+ a performance measurement utility, \fIx11perf\fP;
+ a font compiler, \fIbdftopcf\fP;
+-a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP;
++a font server and related utilities, \fIxfs\fP, \fIxfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP;
+ a display server and related utilities, \fIXserver\fP, \fIrgb\fP, \fImkfontdir\fP;
+ a clipboard manager, \fIxclipboard\fP;
+ keyboard description compiler and related utilities, \fIxkbcomp\fP, \fIsetxkbmap\fP
+ \fIxkbprint\fP, \fIxkbbell\fP, \fIxkbevd\fP, \fIxkbvleds\fP, and \fIxkbwatch\fP;
+ a utility to terminate clients, \fIxkill\fP;
+-a firewall security proxy, \fIxfwp\fP;
+-a proxy manager to control them, \fIproxymngr\fP;
+-a utility to find proxies, \fIxfindproxy\fP;
+-web browser plug-ins, \fIlibxrx.so\fP and \fIlibxrxnest.so\fP;
+-an RX MIME-type helper program, \fIxrx\fP;
+ and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP.
+ .PP
+ Many other utilities, window managers, games, toolkits, etc. are included
+-as user-contributed software in the X.Org Foundation distribution, or are
++as packages in many operating system distributions, or are
+ available on the Internet.
+-See your site administrator for details.
++See your site administrator or distro package manager for details.
+ .SH "STARTING UP"
+ .PP
+ There are two main ways of getting the X server and an initial set of
+@@ -376,12 +371,12 @@ to explicitly draw the window's region on the screen with the pointer, for
+ example).
+ .PP
+ Since window managers are regular (albeit complex) client programs,
+-a variety of different user interfaces can be built. The X.Org Foundation distribution
+-comes with a window manager named \fItwm\fP which supports overlapping windows,
++a variety of different user interfaces can be built. The X.Org Foundation
++provides a window manager named \fItwm\fP which supports overlapping windows,
+ popup menus, point-and-click or click-to-type input models, title bars, nice
+ icons (and an icon manager for those who don't like separate icon windows).
+ .PP
+-See the user-contributed software in the X.Org Foundation distribution for other
++See your distro package manager for other
+ popular window managers.
+ .SH "FONT NAMES"
+ Collections of characters for displaying text and symbols in X are known as
+@@ -1218,19 +1213,16 @@ the appropriate instance name can be placed before the asterisk:
+ .BR bdftopcf (__appmansuffix__),
+ .BR bitmap (__appmansuffix__),
+ .BR editres (__appmansuffix__),
+-.BR fsinfo (__appmansuffix__),
+ .BR fslsfonts (__appmansuffix__),
+ .BR fstobdf (__appmansuffix__),
+ .BR iceauth (__appmansuffix__),
+-.BR imake (__appmansuffix__),
+-.BR makedepend (__appmansuffix__),
+ .BR mkfontdir (__appmansuffix__),
++.BR mkfontscale (__appmansuffix__),
+ .BR oclock (__appmansuffix__),
+-.BR proxymngr (__appmansuffix__),
+ .BR rgb (__appmansuffix__),
+ .BR resize (__appmansuffix__),
+-.BR rstart (__appmansuffix__),
+ .BR smproxy (__appmansuffix__),
++.BR transset (__appmansuffix__),
+ .BR twm (__appmansuffix__),
+ .BR x11perf (__appmansuffix__),
+ .BR x11perfcomp (__appmansuffix__),
+@@ -1238,13 +1230,16 @@ the appropriate instance name can be placed before the asterisk:
+ .BR xclipboard (__appmansuffix__),
+ .BR xclock (__appmansuffix__),
+ .BR xcmsdb (__appmansuffix__),
++.BR xcompmgr (__appmansuffix__),
+ .BR xconsole (__appmansuffix__),
+ .BR xdm (__appmansuffix__),
+ .BR xdpyinfo (__appmansuffix__),
++.BR xdriinfo (__appmansuffix__),
++.BR xev (__appmansuffix__),
+ .BR xfd (__appmansuffix__),
+-.BR xfindproxy (__appmansuffix__),
++.BR xfontsel (__appmansuffix__),
+ .BR xfs (__appmansuffix__),
+-.BR xfwp (__appmansuffix__),
++.BR xfsinfo (__appmansuffix__),
+ .BR xhost (__appmansuffix__),
+ .BR xinit (__appmansuffix__),
+ .BR xkbbell (__appmansuffix__),
+@@ -1259,17 +1254,19 @@ the appropriate instance name can be placed before the asterisk:
+ .BR xlsclients (__appmansuffix__),
+ .BR xlsfonts (__appmansuffix__),
+ .BR xmag (__appmansuffix__),
+-.BR xmh (__appmansuffix__),
+ .BR xmodmap (__appmansuffix__),
+ .BR xprop (__appmansuffix__),
++.BR xrandr (__appmansuffix__),
+ .BR xrdb (__appmansuffix__),
+ .BR xrefresh (__appmansuffix__),
+-.BR xrx (__appmansuffix__),
++.BR xrestop (__appmansuffix__),
++.BR xscope (__appmansuffix__),
+ .BR xset (__appmansuffix__),
+ .BR xsetroot (__appmansuffix__),
+ .BR xsm (__appmansuffix__),
+ .BR xstdcmap (__appmansuffix__),
+ .BR xterm (__appmansuffix__),
++.BR xvinfo (__appmansuffix__),
+ .BR xwd (__appmansuffix__),
+ .BR xwininfo (__appmansuffix__),
+ .BR xwud (__appmansuffix__).
+--
+1.7.9.2
+
+From 9e48239436c256ff695cefea1433cdb2868667a9 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 19:06:53 -0700
+Subject: [PATCH:xorg-docs 4/5] X.man: document protocol/ syntax in display
+ string
+
+See http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Opening_the_Display
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ man/X.man | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/man/X.man b/man/X.man
+index d07e69e..a4f4614 100644
+--- a/man/X.man
++++ b/man/X.man
+@@ -1,4 +1,4 @@
+-.\" t
++'\" t
+ .\"
+ .\" Copyright (c) 1994, 2004 The Open Group
+ .\" Copyright \(co 2000 The XFree86 Project, Inc.
+@@ -165,15 +165,34 @@ form:
+ .RS
+ \fIhostname:displaynumber.screennumber\fP
+ .RE
++or
++.RS
++\fIprotocol/hostname:displaynumber.screennumber\fP
++.RE
+ .sp
+ This information is used by the application to determine how it should
+ connect to the server and which screen it should use by default
+ (on displays with multiple monitors):
+ .TP 8
++.I protocol
++The \fIprotocol\fP specifies the protocol to use for communication.
++Exactly which protocols are supported is platform dependent, but most
++commonly supported ones are:
++.TS
++l l.
++tcp TCP over IPv4 or IPv6
++inet TCP over IPv4 only
++inet6 TCP over IPv6 only
++unix UNIX Domain Sockets (same host only)
++local Platform preferred local connection method
++.TE
++If the protocol is not specified, Xlib uses whatever it believes is the
++most efficient transport.
++.TP 8
+ .I hostname
+ The \fIhostname\fP specifies the name of the machine to which the display is
+-physically connected. If the hostname is not given, the most efficient way of
+-communicating to a server on the same machine will be used.
++physically connected. If the hostname is not given, a connection to a server
++on the same machine will be used.
+ .TP 8
+ .I displaynumber
+ The phrase "display" is usually used to refer to a collection of monitors that
+--
+1.7.9.2
+
+From 299e213f14d8d1586eb5d47d974c4fcffc807679 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 19:27:49 -0700
+Subject: [PATCH:xorg-docs 5/5] X.man: move XLOCAL documentation from Xorg(1)
+ man page
+
+These settings affect clients, not server, so belong here, next to
+the information about how to set $DISPLAY.
+
+Also updated to drop ISC and correct description of Unix domain sockets.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ man/X.man | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+
+diff --git a/man/X.man b/man/X.man
+index a4f4614..8aa4014 100644
+--- a/man/X.man
++++ b/man/X.man
+@@ -260,6 +260,55 @@ addresses, and IPv6 addresses are all allowed. For example:
+ \fIx.org:0\fP, \fIexpo:0\fP, \fI[::1]:0\fP,
+ \fI198.112.45.11:0\fP, \fIbigmachine:1\fP, and \fIhydra:0.1\fP.
+ .PP
++.SH "LOCAL CONNECTIONS"
++For operating systems that support local connections other than Unix
++Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
++the order in which local connections should be attempted. This list
++can be overridden by the
++.I XLOCAL
++environment variable described below. If the display name indicates a
++best-choice connection should be made (e.g.
++.BR :0.0 ),
++each connection mechanism is tried until a connection succeeds or no
++more mechanisms are available.
++.PP
++The
++.I XLOCAL
++environment variable should contain a list of one more
++more of the following:
++.PP
++.RS 8
++.nf
++NAMED
++PTS
++SCO
++UNIX
++.fi
++.RE
++.PP
++which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
++SCO XSight Streams pipe, and Unix domain sockets, respectively. You can
++select a single mechanism (e.g.
++.IR XLOCAL=NAMED ),
++or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
++This variable overrides the compiled-in defaults. For SVR4 it is
++recommended that
++.I NAMED
++be the first preference connection. The default setting is
++platform-dependent.
++.PP
++To globally override the compiled-in defaults, you should define (and
++export if using
++.B sh
++or
++.BR ksh )
++.I XLOCAL
++globally. If you use startx(1) or xinit(1), the definition should be
++at the top of your
++.I .xinitrc
++file. If you use xdm(1), the definitions should be early on in the
++.I __projectroot__/lib/X11/xdm/Xsession
++script.
+ .SH "ACCESS CONTROL"
+ An X server can use several types of access control. Mechanisms provided
+ in Release 7 are:
+--
+1.7.9.2
+
--- a/open-src/xserver/xorg/patch-list Thu Oct 29 17:12:46 2015 -0700
+++ b/open-src/xserver/xorg/patch-list Fri Oct 30 16:33:32 2015 -0700
@@ -1,3 +1,4 @@
+upstream-manpage.patch,-p1
osaudit.patch,-p1
sun-paths.patch,-p1
sun-extramodes.patch,-p1
--- a/open-src/xserver/xorg/sun-manpage.patch Thu Oct 29 17:12:46 2015 -0700
+++ b/open-src/xserver/xorg/sun-manpage.patch Fri Oct 30 16:33:32 2015 -0700
@@ -1,8 +1,9 @@
diff --git a/man/Xserver.man b/man/Xserver.man
-index 3bf844f..310202b 100644
+index ba65c9e..53c7912 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
-@@ -1,3 +1,25 @@
+@@ -1,4 +1,26 @@
+ '\" t
+.\"
+.\" Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+.\"
@@ -25,9 +26,9 @@
+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+.\" DEALINGS IN THE SOFTWARE.
+.\"
- .\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
- .\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
+ .\"
.\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
+ .\"
@@ -32,14 +54,22 @@ Xserver \- X Window System display server
.SH SYNOPSIS
.B X
@@ -53,21 +54,24 @@
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.
-@@ -205,6 +235,13 @@ with
+@@ -205,13 +235,14 @@ with
.BR "\-nolisten tcp" .
This option may be issued multiple times to disable listening to different
transport types.
+-Supported transport types are platform dependent, but commonly include:
+The current transport names supported on __distroname__ are as follows:
-+.sp
-+.nf
-+tcp TCP over IPv4 or IPv6
+ .TS
+ l l.
+ tcp TCP over IPv4 or IPv6
+ inet TCP over IPv4 only
+ inet6 TCP over IPv6 only
+-unix UNIX Domain Sockets
+unix UNIX Domain Sockets (/tmp/.X11-unix/X\fIn\fP)
+pipe Named pipes (/tmp/.X11-pipe/X\fIn\fP)
-+.fi
+ local Platform preferred local connection method
+ .TE
.TP 8
- .B \-listen \fItrans-type\fP
- enables a transport type. For example, TCP/IP connections can be enabled
-@@ -408,7 +445,7 @@ located in the XKB base directory or a subdirectory, and specified as the
+@@ -417,7 +448,7 @@ 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
@@ -76,7 +80,7 @@
enables(+) or disables(-) AccessX key sequences.
.TP 8
.B \-xkbdir \fIdirectory\fP
-@@ -564,6 +601,110 @@ the following font path:
+@@ -572,6 +603,110 @@ the following font path:
/usr/share/fonts/default/Type1,
/usr/share/fonts/default/ghostscript
.fi
@@ -187,7 +191,7 @@
.SH FILES
.TP 30
-@@ -579,8 +720,12 @@ Outline font directories
+@@ -587,8 +722,12 @@ Outline font directories
.I /tmp/.X11-unix/X\fBn\fP
Unix domain socket for display number \fBn\fP
.TP 30
@@ -202,7 +206,7 @@
.TP 30
.I __projectroot__/lib/X11/xdm/xdm-errors
Default error log file if the server is run from \fIxdm\fP(1)
-@@ -602,14 +747,21 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
+@@ -610,14 +749,21 @@ Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1),
\fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
.I "Security Extension Specification"
.PP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/upstream-manpage.patch Fri Oct 30 16:33:32 2015 -0700
@@ -0,0 +1,323 @@
+From 6916d32ab3ec1aa922094abce7fac22884ee4e83 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sun, 19 Jul 2015 08:24:39 -0700
+Subject: [PATCH:xserver 1/8] Xserver.man: -retro is used when starting the
+ server, not the stipple
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Michel Dänzer <[email protected]>
+Signed-off-by: Eric Anholt <[email protected]>
+---
+ man/Xserver.man | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/Xserver.man b/man/Xserver.man
+index 3bf844f..ac410cd 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -238,7 +238,7 @@ turns off auto-repeat.
+ turns on auto-repeat.
+ .TP 8
+ .B -retro
+-starts the stipple with the classic stipple and cursor visible. The default
++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.
+--
+1.7.9.2
+
+From 634e357be2ec400f63bd5c42f706b709b6ddabc3 Mon Sep 17 00:00:00 2001
+From: Ingo Schwarze <[email protected]>
+Date: Sun, 30 Aug 2015 15:26:40 +0200
+Subject: [PATCH:xserver 3/8] remove bogus \/ escapes
+
+some X manuals use then escape sequence \/ when they want to render
+a slash. That's bad because \/ is not a slash but an italic
+correction, never producing any output, having no effect at all in
+terminal output, and only changing spacing in a minor way in typeset
+output.
+
+Signed-off-by: Matthieu Herrb <[email protected]>
+Reviewed-by: Mark Kettenis <[email protected]>
+Signed-off-by: Keith Packard <[email protected]>
+---
+ hw/xfree86/man/Xorg.man | 2 +-
+ man/Xserver.man | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
+index ddf1358..646a90c 100644
+--- a/hw/xfree86/man/Xorg.man
++++ b/hw/xfree86/man/Xorg.man
+@@ -46,7 +46,7 @@ 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.
+ .TP 4
+-.I TCP\/IP
++.I TCP/IP
+ .B Xorg
+ listens on port
+ .RI 6000+ n ,
+diff --git a/man/Xserver.man b/man/Xserver.man
+index dc4b07e..8a09888 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -433,7 +433,7 @@ elapse between autorepeat-generated keystrokes).
+ 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, DECnet,
++the following transport types: TCP/IP, Unix Domain sockets, DECnet,
+ and several varieties of SVR4 local connections. See the DISPLAY
+ NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
+ specify which transport type clients should try to use.
+--
+1.7.9.2
+
+From 9d65a0de95a20632f2a6a04ba596dcdd76d9f5e2 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 18 Sep 2015 08:44:07 -0700
+Subject: [PATCH:xserver 4/8] Remove DECnet from Xserver.man
+
+DECnet support died in modularization (X11R7.0)
+
+Reviewed-by: Adam Jackson <[email protected]>
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ man/Xserver.man | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/man/Xserver.man b/man/Xserver.man
+index 8a09888..ea000e1 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -433,7 +433,7 @@ elapse between autorepeat-generated keystrokes).
+ 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, DECnet,
++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
+ specify which transport type clients should try to use.
+@@ -462,8 +462,8 @@ 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) or a DECnet
+-hostname in double colon format (e.g. hydra::) or a complete name in the format
++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:
+ .sp
+@@ -471,7 +471,6 @@ There should be no leading or trailing spaces on any lines. For example:
+ .nf
+ joesworkstation
+ corporate.company.com
+-star::
+ inet:bigcpu
+ local:
+ .fi
+--
+1.7.9.2
+
+From 4803f7139131cee7bbf50b32d667d6e60302df09 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <[email protected]>
+Date: Sun, 5 Jun 2011 23:32:26 +0200
+Subject: [PATCH:xserver 5/8] man: Fix case for MIT-unspecified.
+
+include/site.h says that COMPILEDDISPLAYCLASS is MIT-unspecified, rather
+than MIT-Unspecified. Fix the manpage accordingly.
+
+Signed-off-by: Cyril Brulebois <[email protected]>
+Reviewed-by: Alan Coopersmith <[email protected]>
+---
+ man/Xserver.man | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/Xserver.man b/man/Xserver.man
+index ea000e1..d927913 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -396,7 +396,7 @@ ends.
+ .B \-class \fIdisplay-class\fP
+ XDMCP has an additional display qualifier used in resource lookup for
+ display-specific options. This option sets that value, by default it
+-is "MIT-Unspecified" (not a very useful value).
++is "MIT-unspecified" (not a very useful value).
+ .TP 8
+ .B \-cookie \fIxdm-auth-bits\fP
+ When testing XDM-AUTHENTICATION-1, a private key is shared between the
+--
+1.7.9.2
+
+From 75157b7dbf4ed4db0492328a44e4e67dda83f769 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 19:44:26 -0700
+Subject: [PATCH:xserver 6/8] Xorg.man: move XLOCAL details to X(7) man page
+ instead
+
+These settings affect clients, not server, so belong there, next to
+the information about how to set $DISPLAY.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ hw/xfree86/man/Xorg.man | 55 ++---------------------------------------------
+ 1 file changed, 2 insertions(+), 53 deletions(-)
+
+diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
+index 646a90c..b23db3d 100644
+--- a/hw/xfree86/man/Xorg.man
++++ b/hw/xfree86/man/Xorg.man
+@@ -44,7 +44,8 @@ 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.
++STREAMS pipes, named pipes, and some other mechanisms. See the
++"LOCAL CONNECTIONS" section of X(__miscmansuffix__) for details.
+ .TP 4
+ .I TCP/IP
+ .B Xorg
+@@ -55,58 +56,6 @@ where
+ is the display number. This connection type can be disabled with the
+ .B \-nolisten
+ option (see the Xserver(1) man page for details).
+-.SH "ENVIRONMENT VARIABLES"
+-For operating systems that support local connections other than Unix
+-Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
+-the order in which local connections should be attempted. This list
+-can be overridden by the
+-.I XLOCAL
+-environment variable described below. If the display name indicates a
+-best-choice connection should be made (e.g.
+-.BR :0.0 ),
+-each connection mechanism is tried until a connection succeeds or no
+-more mechanisms are available. Note: for these OSs, the Unix Domain
+-socket connection is treated differently from the other local connection
+-types. To use it the connection must be made to
+-.BR unix:0.0 .
+-.PP
+-The
+-.I XLOCAL
+-environment variable should contain a list of one more
+-more of the following:
+-.PP
+-.RS 8
+-.nf
+-NAMED
+-PTS
+-SCO
+-ISC
+-.fi
+-.RE
+-.PP
+-which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
+-SCO XSight Streams pipe, and ISC Streams pipe, respectively. You can
+-select a single mechanism (e.g.
+-.IR XLOCAL=NAMED ),
+-or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
+-his variable overrides the compiled-in defaults. For SVR4 it is
+-recommended that
+-.I NAMED
+-be the first preference connection. The default setting is
+-.IR PTS:NAMED:ISC:SCO .
+-.PP
+-To globally override the compiled-in defaults, you should define (and
+-export if using
+-.B sh
+-or
+-.BR ksh )
+-.I XLOCAL
+-globally. If you use startx(1) or xinit(1), the definition should be
+-at the top of your
+-.I .xinitrc
+-file. If you use xdm(1), the definitions should be early on in the
+-.I __projectroot__/lib/X11/xdm/Xsession
+-script.
+ .SH OPTIONS
+ .B Xorg
+ supports several mechanisms for supplying/obtaining configuration and
+--
+1.7.9.2
+
+From 8fc295bde9a736f3c8c047031a6698d140d5266f Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 19:44:27 -0700
+Subject: [PATCH:xserver 7/8] Xorg.man: update to reflect -nolisten tcp
+ becoming default
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ hw/xfree86/man/Xorg.man | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
+index b23db3d..def9bfc 100644
+--- a/hw/xfree86/man/Xorg.man
++++ b/hw/xfree86/man/Xorg.man
+@@ -53,8 +53,9 @@ listens on port
+ .RI 6000+ n ,
+ where
+ .I n
+-is the display number. This connection type can be disabled with the
+-.B \-nolisten
++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).
+ .SH OPTIONS
+ .B Xorg
+--
+1.7.9.2
+
+From 478efe285a440c33b053bdf0bfbfdd482f429f01 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Tue, 27 Oct 2015 19:44:28 -0700
+Subject: [PATCH:xserver 8/8] Xserver.man: document more transports for
+ -nolisten & -listen options
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
+---
+ man/Xserver.man | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/man/Xserver.man b/man/Xserver.man
+index d927913..506e5bb 100644
+--- a/man/Xserver.man
++++ b/man/Xserver.man
+@@ -1,5 +1,5 @@
+-.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $
+-.\" $XdotOrg: xserver/xorg/doc/Xserver.man.pre,v 1.4 2005/12/23 20:11:12 alanc Exp $
++'\" t
++.\"
+ .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group
+ .\"
+ .\" Permission to use, copy, modify, distribute, and sell this software and its
+@@ -205,6 +205,15 @@ with
+ .BR "\-nolisten tcp" .
+ This option may be issued multiple times to disable listening to different
+ transport types.
++Supported transport types are platform dependent, but commonly include:
++.TS
++l l.
++tcp TCP over IPv4 or IPv6
++inet TCP over IPv4 only
++inet6 TCP over IPv6 only
++unix UNIX Domain Sockets
++local Platform preferred local connection method
++.TE
+ .TP 8
+ .B \-listen \fItrans-type\fP
+ enables a transport type. For example, TCP/IP connections can be enabled
+--
+1.7.9.2
+