upstream-manpages.patch revision 1578
1578N/AFrom cdf00c1095f9e7dd26dccad3049442684768da62 Mon Sep 17 00:00:00 2001
1578N/AFrom: Ingo Schwarze <schwarze@usta.de>
1578N/ADate: Sun, 30 Aug 2015 15:22:10 +0200
1578N/ASubject: [PATCH:xorg-docs 1/5] remove bogus \/ escapes
1578N/A
1578N/Asome X manuals use then escape sequence \/ when they want to render
1578N/Aa slash. That's bad because \/ is not a slash but an italic
1578N/Acorrection, never producing any output, having no effect at all in
1578N/Aterminal output, and only changing spacing in a minor way in typeset
1578N/Aoutput.
1578N/A
1578N/AReviewed-by: Mark Kettenis <kettenis@openbsd.org>
1578N/ASigned-off-by: Matthieu Herrb <matthieu@herrb.eu>
1578N/A---
1578N/A man/X.man | 6 +++---
1578N/A 1 file changed, 3 insertions(+), 3 deletions(-)
1578N/A
1578N/Adiff --git a/man/X.man b/man/X.man
1578N/Aindex 16b4c96..bc9fc1a 100644
1578N/A--- a/man/X.man
1578N/A+++ b/man/X.man
1578N/A@@ -224,7 +224,7 @@ The hostname part of the display name should be the empty string.
1578N/A For example: \fI:0\fP, \fI:1\fP, and \fI:0.1\fP. The most efficient
1578N/A local transport will be chosen.
1578N/A .TP 8
1578N/A-.I TCP\/IP
1578N/A+.I TCP/IP
1578N/A .br
1578N/A The hostname part of the display name should be the server machine's
1578N/A hostname or IP address. Full Internet names, abbreviated names, IPv4
1578N/A@@ -487,7 +487,7 @@ implementation dependent.
1578N/A If the name is not found, the color is looked up in the
1578N/A X server's database.
1578N/A The text form of this database is commonly stored in the file
1578N/A-\fI\__datadir__/X11/rgb.txt\fP.
1578N/A+\fI__datadir__/X11/rgb.txt\fP.
1578N/A .PP
1578N/A A numerical color specification
1578N/A consists of a color space name and a set of values in the following syntax:
1578N/A@@ -1164,7 +1164,7 @@ A wide variety of error messages are generated from various programs.
1578N/A The default error handler in \fIXlib\fP (also used by many toolkits) uses
1578N/A standard resources to construct diagnostic messages when errors occur. The
1578N/A defaults for these messages are usually stored in
1578N/A-\fI\__datadir__/X11/XErrorDB\fP. If this file is not present,
1578N/A+\fI__datadir__/X11/XErrorDB\fP. If this file is not present,
1578N/A error messages will be rather terse and cryptic.
1578N/A .PP
1578N/A When the X Toolkit Intrinsics encounter errors converting resource strings to
1578N/A--
1578N/A1.7.9.2
1578N/A
1578N/AFrom 02a513c7847ce37ba3bc1e6f2f5ed5a77062a60d Mon Sep 17 00:00:00 2001
1578N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/ADate: Tue, 27 Oct 2015 17:49:44 -0700
1578N/ASubject: [PATCH:xorg-docs 2/5] X.man: give pointers to specs & other docs
1578N/A
1578N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/AReviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1578N/A---
1578N/A man/X.man | 21 +++++++++++++++++++++
1578N/A 1 file changed, 21 insertions(+)
1578N/A
1578N/Adiff --git a/man/X.man b/man/X.man
1578N/Aindex bc9fc1a..057a7b8 100644
1578N/A--- a/man/X.man
1578N/A+++ b/man/X.man
1578N/A@@ -76,6 +76,20 @@ the \fIXlib - C Language X Interface\fP manual,
1578N/A the \fIX Window System Protocol\fP specification,
1578N/A the \fIX Toolkit Intrinsics - C Language Interface\fP manual,
1578N/A and various toolkit documents.
1578N/A+.\" Use .UR macro from groff's man(7) if available, otherwise just
1578N/A+.\" display URL as plain text for other processors.
1578N/A+.if !d UR \{
1578N/A+.de UR
1578N/A+.RI < \\$1 >
1578N/A+..
1578N/A+.de UE
1578N/A+.RI \\$1
1578N/A+.. \}
1578N/A+.\"
1578N/A+Those manuals, specifications, & documents may be found in
1578N/A+__datadir__/doc or on the X.Org Foundation website at
1578N/A+.UR "http://www.x.org/releases/current/doc/"
1578N/A+.UE .
1578N/A .PP
1578N/A The number of programs that use \fIX\fP is quite large.
1578N/A Programs provided in the core X.Org Foundation distribution include:
1578N/A@@ -1269,10 +1283,17 @@ the appropriate instance name can be placed before the asterisk:
1578N/A .BR Xvfb (__appmansuffix__),
1578N/A .BR Xvnc (__appmansuffix__),
1578N/A .BR XWin (__appmansuffix__).
1578N/A+.PP
1578N/A .\" specifications
1578N/A .I "Xlib \- C Language X Interface\fR,\fP"
1578N/A and
1578N/A .I "X Toolkit Intrinsics \- C Language Interface"
1578N/A+.PP
1578N/A+Those specifications, and additional specifications & documentation for the
1578N/A+X Window System may also be found in __datadir__/doc or on the X.Org Foundation
1578N/A+website at
1578N/A+.UR "http://www.x.org/releases/current/doc/"
1578N/A+.UE .
1578N/A .SH TRADEMARKS
1578N/A .PP
1578N/A X Window System is a trademark of The Open Group.
1578N/A--
1578N/A1.7.9.2
1578N/A
1578N/AFrom b0348bd9f9c79b87c93e2d71dba674ebcb31d8f7 Mon Sep 17 00:00:00 2001
1578N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/ADate: Tue, 27 Oct 2015 18:15:06 -0700
1578N/ASubject: [PATCH:xorg-docs 3/5] X.man: update program lists/info for modern
1578N/A era
1578N/A
1578N/AWe no longer have a monolithic X.Org distribution, nor a separate
1578N/Auser-contributed distribution from X.Org, but instead many OS distros.
1578N/A
1578N/AAlso stop recommending so much abandonware, but do point out the programs
1578N/Awe've added over the years and still maintain.
1578N/A
1578N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/AReviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1578N/A---
1578N/A man/X.man | 53 +++++++++++++++++++++++++----------------------------
1578N/A 1 file changed, 25 insertions(+), 28 deletions(-)
1578N/A
1578N/Adiff --git a/man/X.man b/man/X.man
1578N/Aindex 057a7b8..d07e69e 100644
1578N/A--- a/man/X.man
1578N/A+++ b/man/X.man
1578N/A@@ -92,42 +92,37 @@ __datadir__/doc or on the X.Org Foundation website at
1578N/A .UE .
1578N/A .PP
1578N/A The number of programs that use \fIX\fP is quite large.
1578N/A-Programs provided in the core X.Org Foundation distribution include:
1578N/A+Sample programs provided by the X.Org Foundation include:
1578N/A a terminal emulator, \fIxterm\fP;
1578N/A a window manager, \fItwm\fP;
1578N/A+a compositing manager, \fIxcompmgr\fP;
1578N/A a display manager, \fIxdm\fP;
1578N/A a console redirect program, \fIxconsole\fP;
1578N/A-a mail interface, \fIxmh\fP;
1578N/A-a bitmap editor, \fIbitmap\fP;
1578N/A+utilities for managing input and output devices, \fIxinput\fP and \fIxrandr\fP;
1578N/A resource listing/manipulation tools, \fIappres\fP, \fIeditres\fP;
1578N/A access control programs, \fIxauth\fP, \fIxhost\fP, and \fIiceauth\fP;
1578N/A-user preference setting programs, \fIxrdb\fP, \fIxcmsdb\fP,
1578N/A+user preference setting programs, \fItransset\fP, \fIxrdb\fP, \fIxcmsdb\fP,
1578N/A \fIxset\fP, \fIxsetroot\fP, \fIxstdcmap\fP, and \fIxmodmap\fP;
1578N/A clocks, \fIxclock\fP and \fIoclock\fP;
1578N/A-a font displayer, \fIxfd\fP;
1578N/A-utilities for listing information about fonts, windows, and displays,
1578N/A-\fIxlsfonts\fP, \fIxwininfo\fP, \fIxlsclients\fP,
1578N/A-\fIxdpyinfo\fP, \fIxlsatoms\fP, and \fIxprop\fP;
1578N/A+font display utilities, \fIxfd\fP and \fIxfontsel\fP;
1578N/A+utilities for listing information about displays, extensions, and resources,
1578N/A+\fIxdpyinfo\fP, \fIxdriinfo\fP, \fIxvinfo\fP, \fIxwininfo\fP, \fIxlsclients\fP,
1578N/A+\fIxprop\fP, \fIxlsatoms\fP, \fIxlsclients\fP, and \fIxlsfonts\fP;
1578N/A screen image manipulation utilities, \fIxwd\fP, \fIxwud\fP, and \fIxmag\fP;
1578N/A a performance measurement utility, \fIx11perf\fP;
1578N/A a font compiler, \fIbdftopcf\fP;
1578N/A-a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP;
1578N/A+a font server and related utilities, \fIxfs\fP, \fIxfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP;
1578N/A a display server and related utilities, \fIXserver\fP, \fIrgb\fP, \fImkfontdir\fP;
1578N/A a clipboard manager, \fIxclipboard\fP;
1578N/A keyboard description compiler and related utilities, \fIxkbcomp\fP, \fIsetxkbmap\fP
1578N/A \fIxkbprint\fP, \fIxkbbell\fP, \fIxkbevd\fP, \fIxkbvleds\fP, and \fIxkbwatch\fP;
1578N/A a utility to terminate clients, \fIxkill\fP;
1578N/A-a firewall security proxy, \fIxfwp\fP;
1578N/A-a proxy manager to control them, \fIproxymngr\fP;
1578N/A-a utility to find proxies, \fIxfindproxy\fP;
1578N/A-web browser plug-ins, \fIlibxrx.so\fP and \fIlibxrxnest.so\fP;
1578N/A-an RX MIME-type helper program, \fIxrx\fP;
1578N/A and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP.
1578N/A .PP
1578N/A Many other utilities, window managers, games, toolkits, etc. are included
1578N/A-as user-contributed software in the X.Org Foundation distribution, or are
1578N/A+as packages in many operating system distributions, or are
1578N/A available on the Internet.
1578N/A-See your site administrator for details.
1578N/A+See your site administrator or distro package manager for details.
1578N/A .SH "STARTING UP"
1578N/A .PP
1578N/A There are two main ways of getting the X server and an initial set of
1578N/A@@ -376,12 +371,12 @@ to explicitly draw the window's region on the screen with the pointer, for
1578N/A example).
1578N/A .PP
1578N/A Since window managers are regular (albeit complex) client programs,
1578N/A-a variety of different user interfaces can be built. The X.Org Foundation distribution
1578N/A-comes with a window manager named \fItwm\fP which supports overlapping windows,
1578N/A+a variety of different user interfaces can be built. The X.Org Foundation
1578N/A+provides a window manager named \fItwm\fP which supports overlapping windows,
1578N/A popup menus, point-and-click or click-to-type input models, title bars, nice
1578N/A icons (and an icon manager for those who don't like separate icon windows).
1578N/A .PP
1578N/A-See the user-contributed software in the X.Org Foundation distribution for other
1578N/A+See your distro package manager for other
1578N/A popular window managers.
1578N/A .SH "FONT NAMES"
1578N/A Collections of characters for displaying text and symbols in X are known as
1578N/A@@ -1218,19 +1213,16 @@ the appropriate instance name can be placed before the asterisk:
1578N/A .BR bdftopcf (__appmansuffix__),
1578N/A .BR bitmap (__appmansuffix__),
1578N/A .BR editres (__appmansuffix__),
1578N/A-.BR fsinfo (__appmansuffix__),
1578N/A .BR fslsfonts (__appmansuffix__),
1578N/A .BR fstobdf (__appmansuffix__),
1578N/A .BR iceauth (__appmansuffix__),
1578N/A-.BR imake (__appmansuffix__),
1578N/A-.BR makedepend (__appmansuffix__),
1578N/A .BR mkfontdir (__appmansuffix__),
1578N/A+.BR mkfontscale (__appmansuffix__),
1578N/A .BR oclock (__appmansuffix__),
1578N/A-.BR proxymngr (__appmansuffix__),
1578N/A .BR rgb (__appmansuffix__),
1578N/A .BR resize (__appmansuffix__),
1578N/A-.BR rstart (__appmansuffix__),
1578N/A .BR smproxy (__appmansuffix__),
1578N/A+.BR transset (__appmansuffix__),
1578N/A .BR twm (__appmansuffix__),
1578N/A .BR x11perf (__appmansuffix__),
1578N/A .BR x11perfcomp (__appmansuffix__),
1578N/A@@ -1238,13 +1230,16 @@ the appropriate instance name can be placed before the asterisk:
1578N/A .BR xclipboard (__appmansuffix__),
1578N/A .BR xclock (__appmansuffix__),
1578N/A .BR xcmsdb (__appmansuffix__),
1578N/A+.BR xcompmgr (__appmansuffix__),
1578N/A .BR xconsole (__appmansuffix__),
1578N/A .BR xdm (__appmansuffix__),
1578N/A .BR xdpyinfo (__appmansuffix__),
1578N/A+.BR xdriinfo (__appmansuffix__),
1578N/A+.BR xev (__appmansuffix__),
1578N/A .BR xfd (__appmansuffix__),
1578N/A-.BR xfindproxy (__appmansuffix__),
1578N/A+.BR xfontsel (__appmansuffix__),
1578N/A .BR xfs (__appmansuffix__),
1578N/A-.BR xfwp (__appmansuffix__),
1578N/A+.BR xfsinfo (__appmansuffix__),
1578N/A .BR xhost (__appmansuffix__),
1578N/A .BR xinit (__appmansuffix__),
1578N/A .BR xkbbell (__appmansuffix__),
1578N/A@@ -1259,17 +1254,19 @@ the appropriate instance name can be placed before the asterisk:
1578N/A .BR xlsclients (__appmansuffix__),
1578N/A .BR xlsfonts (__appmansuffix__),
1578N/A .BR xmag (__appmansuffix__),
1578N/A-.BR xmh (__appmansuffix__),
1578N/A .BR xmodmap (__appmansuffix__),
1578N/A .BR xprop (__appmansuffix__),
1578N/A+.BR xrandr (__appmansuffix__),
1578N/A .BR xrdb (__appmansuffix__),
1578N/A .BR xrefresh (__appmansuffix__),
1578N/A-.BR xrx (__appmansuffix__),
1578N/A+.BR xrestop (__appmansuffix__),
1578N/A+.BR xscope (__appmansuffix__),
1578N/A .BR xset (__appmansuffix__),
1578N/A .BR xsetroot (__appmansuffix__),
1578N/A .BR xsm (__appmansuffix__),
1578N/A .BR xstdcmap (__appmansuffix__),
1578N/A .BR xterm (__appmansuffix__),
1578N/A+.BR xvinfo (__appmansuffix__),
1578N/A .BR xwd (__appmansuffix__),
1578N/A .BR xwininfo (__appmansuffix__),
1578N/A .BR xwud (__appmansuffix__).
1578N/A--
1578N/A1.7.9.2
1578N/A
1578N/AFrom 9e48239436c256ff695cefea1433cdb2868667a9 Mon Sep 17 00:00:00 2001
1578N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/ADate: Tue, 27 Oct 2015 19:06:53 -0700
1578N/ASubject: [PATCH:xorg-docs 4/5] X.man: document protocol/ syntax in display
1578N/A string
1578N/A
1578N/ASee http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Opening_the_Display
1578N/A
1578N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/AReviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1578N/A---
1578N/A man/X.man | 25 ++++++++++++++++++++++---
1578N/A 1 file changed, 22 insertions(+), 3 deletions(-)
1578N/A
1578N/Adiff --git a/man/X.man b/man/X.man
1578N/Aindex d07e69e..a4f4614 100644
1578N/A--- a/man/X.man
1578N/A+++ b/man/X.man
1578N/A@@ -1,4 +1,4 @@
1578N/A-.\" t
1578N/A+'\" t
1578N/A .\"
1578N/A .\" Copyright (c) 1994, 2004 The Open Group
1578N/A .\" Copyright \(co 2000 The XFree86 Project, Inc.
1578N/A@@ -165,15 +165,34 @@ form:
1578N/A .RS
1578N/A \fIhostname:displaynumber.screennumber\fP
1578N/A .RE
1578N/A+or
1578N/A+.RS
1578N/A+\fIprotocol/hostname:displaynumber.screennumber\fP
1578N/A+.RE
1578N/A .sp
1578N/A This information is used by the application to determine how it should
1578N/A connect to the server and which screen it should use by default
1578N/A (on displays with multiple monitors):
1578N/A .TP 8
1578N/A+.I protocol
1578N/A+The \fIprotocol\fP specifies the protocol to use for communication.
1578N/A+Exactly which protocols are supported is platform dependent, but most
1578N/A+commonly supported ones are:
1578N/A+.TS
1578N/A+l l.
1578N/A+tcp TCP over IPv4 or IPv6
1578N/A+inet TCP over IPv4 only
1578N/A+inet6 TCP over IPv6 only
1578N/A+unix UNIX Domain Sockets (same host only)
1578N/A+local Platform preferred local connection method
1578N/A+.TE
1578N/A+If the protocol is not specified, Xlib uses whatever it believes is the
1578N/A+most efficient transport.
1578N/A+.TP 8
1578N/A .I hostname
1578N/A The \fIhostname\fP specifies the name of the machine to which the display is
1578N/A-physically connected. If the hostname is not given, the most efficient way of
1578N/A-communicating to a server on the same machine will be used.
1578N/A+physically connected. If the hostname is not given, a connection to a server
1578N/A+on the same machine will be used.
1578N/A .TP 8
1578N/A .I displaynumber
1578N/A The phrase "display" is usually used to refer to a collection of monitors that
1578N/A--
1578N/A1.7.9.2
1578N/A
1578N/AFrom 299e213f14d8d1586eb5d47d974c4fcffc807679 Mon Sep 17 00:00:00 2001
1578N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/ADate: Tue, 27 Oct 2015 19:27:49 -0700
1578N/ASubject: [PATCH:xorg-docs 5/5] X.man: move XLOCAL documentation from Xorg(1)
1578N/A man page
1578N/A
1578N/AThese settings affect clients, not server, so belong here, next to
1578N/Athe information about how to set $DISPLAY.
1578N/A
1578N/AAlso updated to drop ISC and correct description of Unix domain sockets.
1578N/A
1578N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1578N/AReviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1578N/A---
1578N/A man/X.man | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1578N/A 1 file changed, 49 insertions(+)
1578N/A
1578N/Adiff --git a/man/X.man b/man/X.man
1578N/Aindex a4f4614..8aa4014 100644
1578N/A--- a/man/X.man
1578N/A+++ b/man/X.man
1578N/A@@ -260,6 +260,55 @@ addresses, and IPv6 addresses are all allowed. For example:
1578N/A \fIx.org:0\fP, \fIexpo:0\fP, \fI[::1]:0\fP,
1578N/A \fI198.112.45.11:0\fP, \fIbigmachine:1\fP, and \fIhydra:0.1\fP.
1578N/A .PP
1578N/A+.SH "LOCAL CONNECTIONS"
1578N/A+For operating systems that support local connections other than Unix
1578N/A+Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
1578N/A+the order in which local connections should be attempted. This list
1578N/A+can be overridden by the
1578N/A+.I XLOCAL
1578N/A+environment variable described below. If the display name indicates a
1578N/A+best-choice connection should be made (e.g.
1578N/A+.BR :0.0 ),
1578N/A+each connection mechanism is tried until a connection succeeds or no
1578N/A+more mechanisms are available.
1578N/A+.PP
1578N/A+The
1578N/A+.I XLOCAL
1578N/A+environment variable should contain a list of one more
1578N/A+more of the following:
1578N/A+.PP
1578N/A+.RS 8
1578N/A+.nf
1578N/A+NAMED
1578N/A+PTS
1578N/A+SCO
1578N/A+UNIX
1578N/A+.fi
1578N/A+.RE
1578N/A+.PP
1578N/A+which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
1578N/A+SCO XSight Streams pipe, and Unix domain sockets, respectively. You can
1578N/A+select a single mechanism (e.g.
1578N/A+.IR XLOCAL=NAMED ),
1578N/A+or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
1578N/A+This variable overrides the compiled-in defaults. For SVR4 it is
1578N/A+recommended that
1578N/A+.I NAMED
1578N/A+be the first preference connection. The default setting is
1578N/A+platform-dependent.
1578N/A+.PP
1578N/A+To globally override the compiled-in defaults, you should define (and
1578N/A+export if using
1578N/A+.B sh
1578N/A+or
1578N/A+.BR ksh )
1578N/A+.I XLOCAL
1578N/A+globally. If you use startx(1) or xinit(1), the definition should be
1578N/A+at the top of your
1578N/A+.I .xinitrc
1578N/A+file. If you use xdm(1), the definitions should be early on in the
1578N/A+.I __projectroot__/lib/X11/xdm/Xsession
1578N/A+script.
1578N/A .SH "ACCESS CONTROL"
1578N/A An X server can use several types of access control. Mechanisms provided
1578N/A in Release 7 are:
1578N/A--
1578N/A1.7.9.2
1578N/A