From c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 22 Sep 2011 15:20:09 +0200
Subject: libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011
---
X11/xtrans/doc/xtrans.xml | 39 ++++++++++++++-------------------------
1 file changed, 14 insertions(+), 25 deletions(-)
(limited to 'X11/xtrans/doc')
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 © 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 © 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 “Software”), 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 “AS IS”, 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>
--
cgit v1.2.3