From daf6658219cac1fb1bde12f9e827a7832162536a Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Wed, 21 Sep 2011 15:31:39 -0400
Subject: shm spec: fix author affiliation and copyright text

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 specs/shm.xml | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'specs')

diff --git a/specs/shm.xml b/specs/shm.xml
index 8a0fd56..027aa54 100644
--- a/specs/shm.xml
+++ b/specs/shm.xml
@@ -12,12 +12,13 @@
 <bookinfo>
    <title>MIT-SHM(The MIT Shared Memory Extension)</title>
    <subtitle>How the shared memory extension works</subtitle>
-   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-   <releaseinfo>Version 1.0</releaseinfo>
    <authorgroup>
       <author>
          <firstname>Jonathan</firstname><surname>Corbet</surname>
-         <affiliation><orgname>Atmospheric Technology Division National Center for Atmospheric Research</orgname></affiliation>
+         <affiliation>
+            <orgname>National Center for Atmospheric Research</orgname>
+            <orgdiv>Atmospheric Technology Division</orgdiv>
+         </affiliation>
       <email>corbet@ncar.ucar.edu</email>
       </author>
       <editor>
@@ -25,20 +26,9 @@
          <affiliation><orgname>MIT X Consortium</orgname></affiliation>
       </editor>
    </authorgroup>
-   <corpname>X Consortium Standard</corpname>
+   <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+   <releaseinfo>Version 1.0</releaseinfo>
    <copyright><year>1991</year><holder>X Consortium</holder></copyright>
-   <affiliation><orgname>X Consortium</orgname></affiliation>
-
-<abstract>
-<para>
-This document briefly describes how to use the MIT-SHM shared memory
-extension.  I have tried to make it accurate, but it would not surprise me
-if some errors remained.  If you find anything wrong, do let me know and I
-will incorporate the corrections.  Meanwhile, please take this document "as
-is" (eman improvement over what was there before, but certainly not the
-definitive word.)
-</para>
-</abstract>
 
 <legalnotice>
 <para>
@@ -54,7 +44,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 OR
+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
@@ -66,7 +56,20 @@ 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>
+
+<abstract>
+<para>
+This document briefly describes how to use the MIT-SHM shared memory
+extension.  I have tried to make it accurate, but it would not surprise me
+if some errors remained.  If you find anything wrong, do let me know and I
+will incorporate the corrections.  Meanwhile, please take this document "as
+is" (eman improvement over what was there before, but certainly not the
+definitive word.)
+</para>
+</abstract>
+
 </bookinfo>
 
 <chapter id="REQUIREMENTS">
-- 
cgit v1.2.1