summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-20 15:47:09 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-09-20 15:47:09 -0400
commit1ad48fb9bc18d0c7a8fbec1d2cd232877e945047 (patch)
tree40cd097896188ce0ab0f5cc3933d9fb988401564
parentbd93bf86fd914a9cc54e2bedec5b063e5a38b732 (diff)
specs: refactor copyright legal text for multi licensing
we can use <copyright> markup for the first holder Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--doc/xtrans.xml17
1 files changed, 3 insertions, 14 deletions
diff --git a/doc/xtrans.xml b/doc/xtrans.xml
index 0fb62eb..ffbba9d 100644
--- a/doc/xtrans.xml
+++ b/doc/xtrans.xml
@@ -25,16 +25,14 @@
<affiliation><orgname>Oracle Corp.</orgname></affiliation>
</othercredit>
<releaseinfo>Version 0.7</releaseinfo>
+ <copyright><year>1993</year><year>1994</year>
+ <holder>NCR Corporation - Dayton, Ohio, USA</holder>
+ </copyright>
<legalnotice>
-<para role="multiLicensing">
-Copyright &copy; 1993, 1994 NCR Corporation - Dayton, Ohio, USA
-</para>
-
<para>
All Rights Reserved
</para>
-
<para>
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted, provided
@@ -46,7 +44,6 @@ written prior permission. NCR makes no representations about the
suitability of this software for any purpose. It is provided "as is"
without express or implied warranty.
</para>
-
<para>
NCR DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
@@ -56,14 +53,12 @@ OF USE, DATA OR PROFITS, WHETHER IN 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 &copy; 1993, 1994, 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 (the &ldquo;Software&rdquo;), to deal
@@ -72,12 +67,10 @@ 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 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 MERCHANTABILITY,
@@ -86,19 +79,15 @@ 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>
-
<para>
X Window System is a trademark of The Open Group, Inc.
</para>
-
</legalnotice>
-
</bookinfo>
<preface><title>The X Transport Interface</title>