Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/dpms.c
	xorg-server/Xext/saver.c
	xorg-server/Xext/security.c
	xorg-server/Xext/shape.c
	xorg-server/Xext/sync.c
	xorg-server/Xi/opendev.c
	xorg-server/fb/wfbrename.h
	xorg-server/glx/glxserver.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/mi/miarc.c
	xorg-server/mi/miwideline.c
	xorg-server/os/io.c
	xorg-server/render/mipict.c

2 files changed, 14 insertions, 29 deletions

diff --git a/X11/xtrans/Xtranslcl.c b/X11/xtrans/Xtranslcl.c
index 59762da1b..a4f3b1062 100644
--- a/X11/xtrans/Xtranslcl.c
+++ b/X11/xtrans/Xtranslcl.c
@@ -748,15 +748,11 @@ TRANS(NAMEDOpenPipe)(const char *server_path)
     struct stat		sbuf;
     int			mode;
 
-#if defined(sun) && defined(X11_t)
-    mode = 0775;	/* Solaris requires uid or gid 0 to create X11 pipes */
-#else
 #ifdef HAS_STICKY_DIR_BIT
     mode = 01777;
 #else
     mode = 0777;
 #endif
-#endif
     if (trans_mkdir(X_STREAMS_DIR, mode) == -1) {
 	PRMSG (1, "NAMEDOpenPipe: mkdir(%s) failed, errno = %d\n",
 	       X_STREAMS_DIR, errno, 0);
diff --git a/X11/xtrans/doc/xtrans.xml b/X11/xtrans/doc/xtrans.xml
index 0fb62eb05..5b01b89be 100644
--- a/X11/xtrans/doc/xtrans.xml
+++ b/X11/xtrans/doc/xtrans.xml
@@ -11,30 +11,28 @@
 <bookinfo>
    <title>X Transport Interface</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
    <authorgroup>
-      <author>
-         <firstname>Stuart</firstname><surname>Anderson</surname>
-         <affiliation><orgname>NCR Corporation</orgname></affiliation>
-      </author>
+     <author>
+       <firstname>Stuart</firstname><surname>Anderson</surname>
+       <affiliation><orgname>NCR Corporation</orgname></affiliation>
+     </author>
+     <othercredit><firstname>Ralph</firstname><surname>Mor</surname>
+       <affiliation><orgname>X Consortium</orgname></affiliation>
+     </othercredit>
+     <othercredit><firstname>Alan</firstname><surname>Coopersmith</surname>
+       <affiliation><orgname>Oracle Corp.</orgname></affiliation>
+     </othercredit>
    </authorgroup>
-   <othercredit><firstname>Ralph</firstname><surname>Mor</surname>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-   </othercredit>
-   <othercredit><firstname>Alan</firstname><surname>Coopersmith</surname>
-   <affiliation><orgname>Oracle Corp.</orgname></affiliation>
-   </othercredit>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
    <releaseinfo>Version 0.7</releaseinfo>
+   <copyright><year>1993</year><year>1994</year>
+     <holder>NCR Corporation - Dayton, Ohio, USA</holder>
+   </copyright>
 
 <legalnotice>
-<para role="multiLicensing">
-Copyright &copy; 1993, 1994 NCR Corporation - Dayton, Ohio, USA
-</para>
-
 <para>
 All Rights Reserved
 </para>
-
 <para>
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted, provided
@@ -46,7 +44,6 @@ written prior permission.  NCR makes no representations about the
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 </para>
-
 <para>
 NCR DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
@@ -56,14 +53,12 @@ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 </para>
-
 </legalnotice>
 
 <legalnotice>
 <para role="multiLicensing">
 Copyright &copy; 1993, 1994, 2002 The Open Group
 </para>
-
 <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the &ldquo;Software&rdquo;), to deal
@@ -72,12 +67,10 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 </para>
-
 <para>
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 </para>
-
 <para>
 THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -86,19 +79,15 @@ OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </para>
-
 <para>
 Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 </para>
-
 <para>
 X Window System is a trademark of The Open Group, Inc.
 </para>
-
 </legalnotice>
-
 </bookinfo>
 
 <preface><title>The X Transport Interface</title>