From a0b4a1330be6a36ad095222d2ea83927cd33514d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 25 Nov 2011 08:22:48 +0100
Subject: mesa xserver pixman git update 25 nov 2011

---
 xorg-server/doc/Xinput.xml                | 2 +-
 xorg-server/doc/Xserver-spec.xml          | 4 ++--
 xorg-server/doc/dtrace/Xserver-DTrace.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'xorg-server/doc')

diff --git a/xorg-server/doc/Xinput.xml b/xorg-server/doc/Xinput.xml
index 0a7ec8dc0..7f576a135 100644
--- a/xorg-server/doc/Xinput.xml
+++ b/xorg-server/doc/Xinput.xml
@@ -15,7 +15,7 @@
          <affiliation><orgname>Hewlett-Packard</orgname></affiliation>
       </author>
    </authorgroup>
-   <releaseinfo>X server version &xserver.version;</releaseinfo>
+   <releaseinfo>X Server Version &xserver.version;</releaseinfo>
    <copyright><year>1989</year><year>1990</year><year>1991</year>
      <holder>Hewlett-Packard Company</holder>
    </copyright>
diff --git a/xorg-server/doc/Xserver-spec.xml b/xorg-server/doc/Xserver-spec.xml
index 2bf4fb3b7..2b11828fc 100644
--- a/xorg-server/doc/Xserver-spec.xml
+++ b/xorg-server/doc/Xserver-spec.xml
@@ -43,7 +43,7 @@
     </author>
     <publisher><publishername>The X.Org Foundation</publishername></publisher>
     <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
-    <releaseinfo>X server version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <copyright><year>1994</year><holder>X Consortium, Inc.</holder></copyright>
     <copyright><year>2004</year><holder>X.org Foundation, Inc.</holder></copyright>
     <legalnotice>
@@ -565,7 +565,7 @@ should be called by InitExtensions.
 	ExtensionEntry *AddExtension(name, NumEvents,NumErrors,
 		MainProc, SwappedMainProc, CloseDownProc, MinorOpcodeProc)
 
-		char *name;  /*Null terminate string; case matters*/
+		const char *name;  /*Null terminate string; case matters*/
 		int NumEvents;
 		int NumErrors;
 		int (* MainProc)(ClientPtr);/*Called if client matches server order*/
diff --git a/xorg-server/doc/dtrace/Xserver-DTrace.xml b/xorg-server/doc/dtrace/Xserver-DTrace.xml
index fa8bc809a..5ef062980 100644
--- a/xorg-server/doc/dtrace/Xserver-DTrace.xml
+++ b/xorg-server/doc/dtrace/Xserver-DTrace.xml
@@ -14,7 +14,7 @@
 	<orgdiv>Solaris Engineering</orgdiv>
       </affiliation>
     </author>
-    <releaseinfo>X.Org Xserver version &xserver.version;</releaseinfo>
+    <releaseinfo>X Server Version &xserver.version;</releaseinfo>
     <copyright><year>2005</year><year>2006</year><year>2007</year><year>2010</year>
       <holder>Oracle and/or its affiliates. All rights reserved.</holder>
     </copyright>
-- 
cgit v1.2.3