xlfd: fix author affiliation and refactor legal text for multi licensing

Note that "X Window System is a trademark of The Open Group" is part
of the X Consortium license as opposed to free standing information.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

1 files changed, 32 insertions, 38 deletions

diff --git a/specs/XLFD/xlfd.xml b/specs/XLFD/xlfd.xml
index a6d9763..a467192 100644
--- a/specs/XLFD/xlfd.xml
+++ b/specs/XLFD/xlfd.xml
@@ -11,53 +11,21 @@
 <bookinfo>
    <title>X Logical Font Description Conventions</title>
    <subtitle>X Consortium Standard</subtitle>
-   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-   <releaseinfo>Version 1.5</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Jim</firstname><surname>Flowers</surname>
-         <affiliation><orgname>
-Digital Equipment Corporation
-         </orgname></affiliation>
+         <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation>
       </author>
       <editor>
          <firstname>Stephen </firstname><surname>Gildea</surname>
+         <affiliation><orgname>X Consortium</orgname></affiliation>
       </editor>
    </authorgroup>
-   <corpname>X Consortium Standard</corpname>
-   <copyright><year>1988,1994</year><holder>X Consortium</holder></copyright>
-   <copyright>
-      <year>1988,1994</year>
-      <holder>Digital Equipment Corporation</holder>
-   </copyright>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.5</releaseinfo>
+   <copyright><year>1988</year><year>1994</year><holder>X Consortium</holder></copyright>
 
 <legalnotice>
-
-<para>
-<emphasis remap='I'>X Window System</emphasis> is a trademark of The Open Group.
-</para>
-<para>
-Helvetica and Times are registered trademarks of Linotype Company.
-</para>
-<para>
-ITC Avant Garde Gothic is a registered trademark of International
-Typeface Corporation.
-</para>
-<para>
-Times Roman is a registered trademark of Monotype Corporation.
-</para>
-<para>
-Bitstream Amerigo is a registered trademark of Bitstream Inc.
-</para>
-<para>
-Stone is a registered trademark of Adobe Systems Inc.
-</para>
-
-<para>
-Copyright 1988, 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
@@ -72,7 +40,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
+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
@@ -86,6 +54,10 @@ 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>
+
+<legalnotice>
 <para>
 Copyright 1988, 1989
 Digital Equipment Corporation, Maynard MA.  All rights reserved.
@@ -102,6 +74,28 @@ This documentation is provided as is without express or implied warranty.
 </para>
 
 </legalnotice>
+
+
+<legalnotice>
+<para>
+Helvetica and Times are registered trademarks of Linotype Company.
+</para>
+<para>
+ITC Avant Garde Gothic is a registered trademark of International
+Typeface Corporation.
+</para>
+<para>
+Times Roman is a registered trademark of Monotype Corporation.
+</para>
+<para>
+Bitstream Amerigo is a registered trademark of Bitstream Inc.
+</para>
+<para>
+Stone is a registered trademark of Adobe Systems Inc.
+</para>
+</legalnotice>
+
+
 </bookinfo>
 <chapter id="introduction">
 <title>Introduction</title>