summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-21 10:35:58 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-09-21 10:35:58 -0400
commit77f8d11c0d2e521b1dfbd27acfde381a4dcfb135 (patch)
treebcab0ad4ced64445ce3fee4ba3b216ec7977a553
parentac60c5c5081690e2984192a8aeed7790c8b98297 (diff)
security: fix X Consortium copyrigh legal text and minor markups
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--specs/security.xml43
1 files changed, 32 insertions, 11 deletions
diff --git a/specs/security.xml b/specs/security.xml
index a380987..228d350 100644
--- a/specs/security.xml
+++ b/specs/security.xml
@@ -13,26 +13,47 @@ xhtml,docbook,html,refcaption -->
<bookinfo>
<title>Security Extension Specification</title>
<subtitle>X Consortium Standard</subtitle>
- <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
- <date>November 15, 1996</date>
<authorgroup>
<author>
- <firstname>David</firstname><surname>Wiggins</surname>
+ <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
+ <affiliation><orgname>X Consortium</orgname></affiliation>
</author>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <copyright><year>1996</year><holder>X Consortium</holder></copyright>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 7.1</releaseinfo>
- <affiliation><orgname>X Consortium</orgname></affiliation>
+ <copyright><year>1996</year><holder>X Consortium</holder></copyright>
<legalnotice>
-
-<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, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM 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 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>
+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
+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 &ldquo;AS IS&rdquo;, 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 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 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 The OpenGroup.</para>
</legalnotice>
+<pubdate>November 15, 1996</pubdate>
+
</bookinfo>
<chapter id="introduction">