xserver: Branch 'master' - 3 commits

[Keith Packard]

 hw/xfree86/doc/ddxDesign.xml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ee3e26079e120bf9914cc27871d50501b35e75df
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Sep 30 07:16:34 2011 -0400

    ddxDesign: drop the url in the coporate authors list
    
    It was such an eyesore once rendered in html.
    Now it looks like other authors.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index af8f901..a4baad5 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -23,10 +23,8 @@
     <title>XFree86 DDX Design</title>
 
     <authorgroup>
-      <corpauthor><ulink url="http://www.xfree86.org/">
-	The XFree86 Project, Inc.</ulink></corpauthor>
-      <corpauthor><ulink url="http://www.x.org/">
-	The X.Org Foundation, Inc.</ulink></corpauthor>
+      <corpauthor>The XFree86 Project</corpauthor>
+      <corpauthor>The X.Org Foundation</corpauthor>
 
       <othercredit>
 	<firstname>Jim</firstname><surname>Gettys</surname>
commit 0ed71b48c0c7bd65cd05eda6c06b9c29b4e3f607
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Sep 30 07:16:33 2011 -0400

    ddxDesign: remove server version from the document title
    
    Such version information is already written in the appropriate location
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index a564716..af8f901 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -20,7 +20,7 @@
 <article id="ddxDesign">
   <articleinfo>
 
-    <title>XFree86 DDX Design (Xorg server version &xserver.version;)</title>
+    <title>XFree86 DDX Design</title>
 
     <authorgroup>
       <corpauthor><ulink url="http://www.xfree86.org/">
commit 83ec3bf1aa72848421660c44c4503fec655f5924
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Fri Sep 30 07:16:32 2011 -0400

    ddx-Design: add X Version and Release information
    
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index bc25c56..a564716 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+ <!ENTITY % xorg-defs SYSTEM "defs.ent"> %xorg-defs;
  <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs;
  <!-- config file keyword markup -->
  <!-- specific config file keywords -->
@@ -34,6 +35,7 @@
     </authorgroup>
 
     <pubdate>&xserver.reldate;</pubdate>
+    <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
     <releaseinfo>Xorg server version &xserver.version;</releaseinfo>
 
   </articleinfo>