diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-09-20 15:11:13 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-09-20 15:11:13 -0400 |
| commit | a43c0a5d2a6cf80df314c96e0b58804dd87868be (patch) | |
| tree | dc703ad17370b9dbe21bc6b52b3ae0a82f151f05 | |
| parent | 552f60789263ad2a1d983cf5b479af63d90f7591 (diff) | |
specs: refactor and complete copyright legal text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | specs/inputlib.xml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/specs/inputlib.xml b/specs/inputlib.xml index 4be875a..0c562a2 100644 --- a/specs/inputlib.xml +++ b/specs/inputlib.xml @@ -23,16 +23,10 @@ </authorgroup> <copyright><year>1989</year><year>1990</year><year>1991</year> <holder>Hewlett-Packard Company</holder> - </copyright> - <copyright><year>1989</year><year>1990</year><year>1991</year> <holder>Ardent Computer</holder> </copyright> - <copyright><year>1989</year><year>1990</year><year>1991</year><year>1992</year> - <holder>X Consortium</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 copyright notice and this permission notice appear @@ -40,12 +34,23 @@ in all copies. Ardent and Hewlett-Packard make no representations about the suit purpose of the information in this document. It is provided "as is" without express or implied warranty. </para> +</legalnotice> +<legalnotice> +<para role="multiLicensing"> +Copyright © 1989, 1990, 1991, 1992 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 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 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 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -55,17 +60,15 @@ 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 +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 X Consortium, Inc.</para> - +<para>X Window System is a trademark of The Open Group.</para> </legalnotice> </bookinfo> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="library.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="encoding.xml"/> </book> |