xserver: Branch 'master' - 3 commits

[Adam Jackson]

 hw/xfree86/man/Xorg.man |   60 ++++--------------------------------------------
 man/Xserver.man         |   13 ++++++++--
 2 files changed, 16 insertions(+), 57 deletions(-)

New commits:
commit 478efe285a440c33b053bdf0bfbfdd482f429f01
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Oct 27 19:44:28 2015 -0700

    Xserver.man: document more transports for -nolisten & -listen options
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

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
commit 8fc295bde9a736f3c8c047031a6698d140d5266f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Oct 27 19:44:27 2015 -0700

    Xorg.man: update to reflect -nolisten tcp becoming default
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

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
commit 75157b7dbf4ed4db0492328a44e4e67dda83f769
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Oct 27 19:44:26 2015 -0700

    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 <alan.coopersmith at oracle.com>
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

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