From 262904c22154d5a703ef92a7f954e52956b13663 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Tue, 20 Sep 2011 15:30:22 -0400
Subject: specs: refactor copyright legal text for multi licensing

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 specs/recordlib.xml | 22 ++++++++++------------
 specs/xtestlib.xml  | 11 +++--------
 2 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'specs')

diff --git a/specs/recordlib.xml b/specs/recordlib.xml
index f60afbc..85cdaf4 100644
--- a/specs/recordlib.xml
+++ b/specs/recordlib.xml
@@ -13,22 +13,20 @@
    <title>X Record Extension Library</title>
    <subtitle>X Consortium Standard</subtitle>
    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.13</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Martha</firstname><surname>Zimet</surname>
          <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
       </author>
-   </authorgroup>
-   <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder></copyright>
-   <copyright><year>1995</year><holder>X Consortium</holder></copyright>
-   <releaseinfo>Version 1.13</releaseinfo>
-   <editor>
+      <editor>
          <firstname>Stephen</firstname><surname>Gildea</surname>
          <affiliation><orgname>X Consortium</orgname></affiliation>
-   </editor>
+      </editor>
+   </authorgroup>
+   <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder></copyright>
 
 <legalnotice>
-
 <para>
 Permission to use, copy, modify, distribute, and sell this
 documentation for any purpose is hereby granted without fee,
@@ -38,18 +36,20 @@ 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>
+</legalnotice>
 
+<legalnotice>
+<para role="multiLicensing">Copyright © 1995 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
+(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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+<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
@@ -57,14 +57,12 @@ 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>
 </bookinfo>
diff --git a/specs/xtestlib.xml b/specs/xtestlib.xml
index 303d59c..ff4877c 100644
--- a/specs/xtestlib.xml
+++ b/specs/xtestlib.xml
@@ -21,11 +21,8 @@
       </author>
    </authorgroup>
    <copyright><year>1992</year><holder>UniSoft Group Ltd.</holder></copyright>
-   <copyright><year>1992</year><holder>X Consortium</holder></copyright>
-   <copyright><year>1994</year><holder>X Consortium</holder></copyright>
 
 <legalnotice>
-
 <para>
 Permission to use, copy, modify, and distribute this documentation for
 any purpose and without fee is hereby granted, provided that the above
@@ -34,7 +31,10 @@ makes no representations about the suitability for any purpose of the
 information in this document.  This documentation is provided
 &ldquo;as is&rdquo; without express or implied warranty.
 </para>
+</legalnotice>
 
+<legalnotice>
+<para role="multiLicensing">Copyright © 1992,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
@@ -44,12 +44,10 @@ 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
@@ -59,15 +57,12 @@ 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>
 </bookinfo>
 
-- 
cgit v1.2.3