summaryrefslogtreecommitdiff
path: root/specs/recordlib.xml
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-20 15:30:22 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-09-20 15:30:22 -0400
commit262904c22154d5a703ef92a7f954e52956b13663 (patch)
tree382c4608ba02840068f06b8f5e8e31fa03aa2755 /specs/recordlib.xml
parent8f68b59f2b66f035ad97e3fe99e9eae983d1f44b (diff)
specs: refactor copyright legal text for multi licensing
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'specs/recordlib.xml')
-rw-r--r--specs/recordlib.xml22
1 files changed, 10 insertions, 12 deletions
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>