summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-09-21 20:34:06 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-09-21 20:34:06 -0400
commitdc5bf2c6fb0d2096aa16358291d6405f0381ea0d (patch)
treee71660992a69f1e8fa4e063ff4063b0335c0ec8d
parentc20f068d6fda35b33d5acd785d648bfbcf990a24 (diff)
analysis: fix author affiliation and copyright text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--specs/Xserver/analysis.xml43
1 files changed, 34 insertions, 9 deletions
diff --git a/specs/Xserver/analysis.xml b/specs/Xserver/analysis.xml
index ce044eb..a53dbdc 100644
--- a/specs/Xserver/analysis.xml
+++ b/specs/Xserver/analysis.xml
@@ -14,24 +14,49 @@ xhtml,docbook,html,refcaption
<bookinfo>
<title>Analysis of the X Protocol for Security Concerns</title>
- <subtitle>Draft Version 2</subtitle>
- <date>May 10, 1996</date>
+ <pubdate>May 10, 1996</pubdate>
<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>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <releaseinfo>Draft Version 2</releaseinfo>
<copyright><year>1996</year><holder>X Consortium</holder></copyright>
- <affiliation><orgname>X Consortium</orgname></affiliation>
<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
+"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 &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 Open Group.</para>
</legalnotice>
+
<abstract>
<para>
This paper attempts to list all instances of certain types of security