libX11 libxtrans mesa git update 20 sep 2011

6 files changed, 71 insertions, 47 deletions

diff --git a/libX11/specs/XIM/xim.xml b/libX11/specs/XIM/xim.xml
index dc4b8c804..23558ea39 100644
--- a/libX11/specs/XIM/xim.xml
+++ b/libX11/specs/XIM/xim.xml
@@ -13,6 +13,7 @@
    <title>The Input Method Protocol</title>
    <subtitle>X Consortium Standard</subtitle>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Masahiko</firstname><surname>Narita</surname>
@@ -23,10 +24,10 @@
          <affiliation><orgname>SunSoft, Inc.</orgname></affiliation>
       </author>
    </authorgroup>
-   <copyright><year>1993</year><year>1994</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1993</year><year>1994</year><holder>FUJITSU LIMITED</holder></copyright>
-   <copyright><year>1993</year><year>1994</year><holder>Oracle and/or its affiliates</holder></copyright>
-   <releaseinfo>Version 1.0</releaseinfo>
+   <copyright><year>1993</year><year>1994</year>
+      <holder>FUJITSU LIMITED</holder>
+      <holder>Oracle and/or its affiliates</holder>
+   </copyright>
 
 <abstract>
 <para>
@@ -35,19 +36,38 @@ This specifies a protocol between IM library and IM (Input Method) Server for in
 </abstract>
 
 <legalnotice>
-<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 in the Software without restriction, including without limitation the rights 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, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X CONSORTIUM 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 X Consortium 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 X Consortium.</para>
-
-<para>X Window System is a trademark of The Open Group.</para>
-
-<para>Permission to use,copy and distribute this documetation for any purpose and without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.  Fujitsu and Sun Microsystems make no representation about the suitability for any purpose of the information in this documen.  This documentation is provided as is without express implied warranty.
+<para>Permission to use,copy and distribute this documetation for any purpose
+and without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.  Fujitsu and Sun Microsystems
+make no representation about the suitability for any purpose of the information in this document.
+This documentation is provided as is without express implied warranty.
 </para>
+</legalnotice>
 
+<legalnotice>
+<para role="multiLicensing">Copyright © 1993, 1994 X Consortium</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 in
+the Software without restriction, including without limitation the rights 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,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
+CONSORTIUM 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 X Consortium 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 X Consortium.
+</para>
+<para>X Window System is a trademark of The Open Group.</para>
 </legalnotice>
 
 </articleinfo>
diff --git a/libX11/specs/XKB/xkblib.xml b/libX11/specs/XKB/xkblib.xml
index 1ca6f3e58..e4aa58741 100644
--- a/libX11/specs/XKB/xkblib.xml
+++ b/libX11/specs/XKB/xkblib.xml
@@ -64,7 +64,7 @@ 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
+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,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
diff --git a/libX11/specs/i18n/framework/framework.xml b/libX11/specs/i18n/framework/framework.xml
index fd88688bc..a6ec1d9c4 100644
--- a/libX11/specs/i18n/framework/framework.xml
+++ b/libX11/specs/i18n/framework/framework.xml
@@ -34,6 +34,7 @@ IBM Corporation make no representations about the suitability for any purpose of
 This documentation is provided as is without express or implied warranty.
 </para>
 
+<para role="multiLicensing">Copyright © 1994 X Consortium</para>
 <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files
@@ -60,7 +61,7 @@ THE SOFTWARE.
 </para>
 
 <para>
-Except as contained in this notice, the name of The Open Group shall not
+Except as contained in this notice, the name of X Consortium shall not
 be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from X Consortium.
 </para>
diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml
index c4f6d1377..6b81b771c 100644
--- a/libX11/specs/i18n/localedb/localedb.xml
+++ b/libX11/specs/i18n/localedb/localedb.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 <book id="localedb">
 
 <bookinfo>
    <title>X Locale Database Specification</title>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Yoshio</firstname><surname>Horiuchi</surname>
          <affiliation><orgname>IBM Japan</orgname></affiliation>
       </author>
    </authorgroup>
-   <copyright><year>1994</year><holder>IBM Corporation</holder></copyright>
-   <copyright><year>1994</year><holder>X Consortium</holder></copyright>
-
 
 <legalnotice>
 
+<para role="multiLicensing">Copyright © 1994 IBM Corporation</para>
 <para>
 License to use, copy, modify, and distribute this software and its documentation for
 any purpose and without fee is hereby granted, provided that the above copyright notice
@@ -35,6 +37,7 @@ AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 </para>
 
+<para role="multiLicensing">Copyright © 1994 X Consortium</para>
 <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files
@@ -61,9 +64,9 @@ 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 X Consortium.
+Except as contained in this notice, the name of the X Consortium 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 X Consortium.
 </para>
 
 <para>X Window System is a trademark of The Open Group.</para>
diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml
index 6f1a15c50..fe16c1d98 100644
--- a/libX11/specs/i18n/trans/trans.xml
+++ b/libX11/specs/i18n/trans/trans.xml
@@ -17,12 +17,7 @@
          <affiliation><orgname>FUJITSU LIMITED</orgname></affiliation>
       </author>
    </authorgroup>
-   <copyright>
-     <year>1994</year>
-     <holder>FUJITSU LIMITED</holder>
-     <holder>X Consortium</holder>
-   </copyright>
-
+   <copyright><year>1994</year><holder>FUJITSU LIMITED</holder></copyright>
 
 <abstract>
 <title>Abstract</title>
@@ -35,6 +30,16 @@ which makes various channels usable such as X protocol or TCP/IP, DECnet and etc
 <legalnotice>
 
 <para>
+Permission to use, copy, modify, and distribute this documentation for any purpose 
+and without fee is hereby granted, provided that the above copyright notice and
+this permission notice appear in all copies.
+Fujitsu makes no representations about the suitability for any purpose of the
+information in this document. This documentation is provided as is
+without express or implied warranty.
+</para>
+
+<para role="multiLicensing">Copyright © 1994 X Consortium</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 in the Software without restriction,
@@ -60,9 +65,9 @@ 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 X Consortium.
+Except as contained in this notice, the name of the X Consortium 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 X Consortium.
 </para>
 
 <para>X Window System is a trademark of The Open Group.</para>
diff --git a/libX11/specs/libX11/libX11.xml b/libX11/specs/libX11/libX11.xml
index 782c14ffa..812c992bb 100644
--- a/libX11/specs/libX11/libX11.xml
+++ b/libX11/specs/libX11/libX11.xml
@@ -10,7 +10,7 @@
 
 <bookinfo>
    <title>Xlib - C Language X Interface</title>
-   <subtitle>X Window System Standard</subtitle>
+   <subtitle>X Consortium Standard</subtitle>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
    <authorgroup>
       <author>
@@ -63,9 +63,7 @@
 
 <legalnotice>
 
-<formalpara>
-<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991, 1994, 1996, 2002 The Open Group</title>
-<para></para></formalpara>
+<para role="multiLicensing">Copyright © 1985, 1986, 1987, 1988, 1989, 1991, 1994, 1996, 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 
@@ -82,13 +80,12 @@ 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, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN 
-NO EVENT SHALL THE X CONSORTIUM 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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+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>
@@ -97,9 +94,7 @@ 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>
 
-<formalpara>
-<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991 Digital Equipment Corporation</title>
-<para></para></formalpara>
+<para role="multiLicensing">Copyright © 1985, 1986, 1987, 1988, 1989, 1991 Digital Equipment Corporation</para>
 <para>
 Permission to use, copy, modify and distribute this documentation for any
 purpose and without fee is hereby granted, provided that the above copyright