diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-09-20 09:57:26 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-09-20 09:57:26 -0400 |
| commit | ca39a358c35ea364c10fa7c16b6a584171d27600 (patch) | |
| tree | 2d4857689636a3f8e7b3b3e04b1643673e391d88 | |
| parent | 877e74e518ec74a07cb8998a3f517ab043cf76be (diff) | |
synclib: refactor copyright legal text for multiple licensing
One sentence added as per the xorg License doc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | specs/synclib.xml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/specs/synclib.xml b/specs/synclib.xml index 51b7cf5..12145eb 100644 --- a/specs/synclib.xml +++ b/specs/synclib.xml @@ -45,12 +45,12 @@ <affiliation><orgname>X Consortium, Inc.</orgname></affiliation> </author> </authorgroup> -<legalnotice> - -<para> -Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts -</para> + <copyright><year>1991</year> + <holder>Olivetti Research Limited, Cambridge England</holder> + <holder>Digital Equipment Corporation, Maynard, Massachusetts</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 @@ -62,11 +62,7 @@ is without express or implied warranty. </legalnotice> <legalnotice> - -<para> -Copyright © 1991 X Consortium, Inc. -</para> - +<para role="multiLicensing">Copyright © 1991 X Consortium, Inc.</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -82,7 +78,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, +<para>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 @@ -97,6 +93,7 @@ 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 OpenGroup.</para> </legalnotice> </bookinfo> |