diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-09-21 20:17:03 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-09-21 20:17:03 -0400 |
| commit | bd90a4a32fb9028d1d0479116e5f0537004046d3 (patch) | |
| tree | 3c44ba43168a283ffaa1d8485d878aaa92a50c98 | |
| parent | c362660a862c0c50306a989e7a45e926824ac571 (diff) | |
icccm: refactor copyright license text for multi licensing
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | specs/ICCCM/icccm.xml | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/specs/ICCCM/icccm.xml b/specs/ICCCM/icccm.xml index 69f348a..02d8919 100644 --- a/specs/ICCCM/icccm.xml +++ b/specs/ICCCM/icccm.xml @@ -11,8 +11,6 @@ <bookinfo> <title>Inter-Client Communication Conventions Manual</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> - <releaseinfo>Version 2.0</releaseinfo> <authorgroup> <author> <firstname>David</firstname><surname>Rosenthal</surname> @@ -23,21 +21,14 @@ <affiliation><orgname>SunSoft, Inc.</orgname></affiliation> </editor> </authorgroup> - <corpname>X Consortium Standard</corpname> - <affiliation><orgname>X Consortium</orgname></affiliation> - - -<legalnotice> -<para> -X Window System is a trademark of The Open Group -</para> -</legalnotice> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <releaseinfo>Version 2.0</releaseinfo> + <copyright><year>1988</year><year>1991</year><year>1993</year><year>1994</year> + <holder>X Consortium</holder> + </copyright> <legalnotice> <para> -Copyright © 1988, 1991, 1993, 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 "Software"), to deal in the Software without restriction, including @@ -51,7 +42,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 “AS IS”, 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 @@ -65,10 +56,11 @@ 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> +<para role="multiLicensing"> Copyright © 1987, 1988, 1989, 1993, 1994 Sun Microsystems, Inc </para> <para> |