Merge remote-tracking branch 'origin/released'

1 files changed, 10 insertions, 7 deletions

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>