summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-22 09:20:38 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-09-22 09:20:38 -0400
commitd86d8f34f5c2ac5c80230aea2de49bb97eaf5f92 (patch)
treec698a3b2b4b18e88e4b5c811d47ec19947d04986
parent43d587d89bee679850bb18ff25aa77c961712728 (diff)
doc: refactor legal text for multi licensing copyrights
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--doc/fontlib.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/fontlib.xml b/doc/fontlib.xml
index 8e53424..48b8aa2 100644
--- a/doc/fontlib.xml
+++ b/doc/fontlib.xml
@@ -18,8 +18,6 @@
<title>
The X Font Library
</title>
- <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
- <pubdate>July 27, 1991</pubdate>
<authorgroup>
<author>
<firstname>Keith</firstname>
@@ -36,11 +34,11 @@
</affiliation>
</author>
</authorgroup>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <copyright><year>1993</year><holder>Network Computing Devices</holder></copyright>
+
<legalnotice>
<para>
- Copyright 1993 <orgname>Network Computing Devices</orgname>
- </para>
- <para>
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby
granted without fee, provided that the above copyright
@@ -54,8 +52,8 @@
any purpose. It is provided &ldquo;as is&rdquo; without
express or implied warranty.
</para>
- <para>
- Copyright 1993, 1994 <orgname>X Consortium</orgname>
+ <para role="multiLicensing">
+ Copyright &copy;1993, 1994 X Consortium
</para>
<para>
Permission is hereby granted, free of charge, to any person
@@ -84,7 +82,9 @@
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>
+ <pubdate>July 27, 1991</pubdate>
</articleinfo>
<warning>