libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011

2 files changed, 11 insertions, 9 deletions

diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml
index 6b81b771c..c2feccff8 100644
--- a/libX11/specs/i18n/localedb/localedb.xml
+++ b/libX11/specs/i18n/localedb/localedb.xml
@@ -16,10 +16,9 @@
          <affiliation><orgname>IBM Japan</orgname></affiliation>
       </author>
    </authorgroup>
+   <copyright><year>1994</year><holder>IBM Corporation</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
@@ -36,7 +35,9 @@ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER I
 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 © 1994 X Consortium</para>
 <para>
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/libX11/specs/libX11/libX11.xml b/libX11/specs/libX11/libX11.xml
index 812c992bb..4fb057587 100644
--- a/libX11/specs/libX11/libX11.xml
+++ b/libX11/specs/libX11/libX11.xml
@@ -60,10 +60,12 @@
          <affiliation><orgname>Fujitsu OSSI</orgname></affiliation>
       </othercredit>
    </authorgroup>
+   <copyright><year>1985</year><year>1986</year><year>1987</year>
+     <year>1988</year><year>1989</year><year>1991</year><year>1994</year>
+     <year>1996</year><year>2002</year><holder>The Open Group</holder>
+   </copyright>
 
 <legalnotice>
-
-<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 
@@ -73,27 +75,26 @@ 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
+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
 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>
+</legalnotice>
 
+<legalnotice>
 <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
@@ -104,7 +105,7 @@ Digital and Tetronix not be used in in advertising or publicity pertaining
 to distribution of the software without specific, written prior permission.
 Digital and Tetronix make no representations about the suitability of the
 software described herein for any purpose.
-It is provided "as is" without express or implied warranty.
+It is provided &ldquo;as is&rdquo; without express or implied warranty.
 </para>