More updates to Release Notes for X11R7.5

- Try to explain the katamari & modules better in the introduction
- Add section about build system changes
- Add VPDAU to DRI2 description
- Move driver list after new feature list & server overview
- Update driver list for new & dropped drivers, add missing man page links
- Drop out-of-date XDarwin description
- Drop out-of-date warning that window managers don't support Xinerama
- Move DGA 2.0 to deprecated features section
- Add notes about changes to C-A-B default & blackroot/nocursor (-retro)
- Drop description of Luxi fonts that duplicates fonts.sgml
- Add note about new default font directory & compression options
- Update CID font support section to state it's been removed
- Add to removed features section: fontcache extension, libXaw8 (Xprint),
  kdrive servers (Xvesa and friends)
- Add to future removals: HAL input device support, Xsdl, DGA 2.0
- Updates to contributor lists
- Change from DocBook/SGML 4.2 to DocBook/XML 4.3

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

1 files changed, 757 insertions, 552 deletions

diff --git a/sgml/RELNOTES.sgml b/sgml/RELNOTES.sgml
index 7cad050..d7516ac 100644
--- a/sgml/RELNOTES.sgml
+++ b/sgml/RELNOTES.sgml
@@ -1,54 +1,100 @@
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
 <!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
 ]>
 
 <article>
 
-<articleinfo>
+  <articleinfo>
 
-<title>Release Notes for X11R&relvers;</title>
+    <title>Release Notes for X11R&relvers;</title>
 
-<corpauthor><ulink url="http://www.x.org/wiki/XorgFoundation">
-The X.Org Foundation
-</ulink></corpauthor>
+    <corpauthor>
+      <ulink url="http://www.x.org/wiki/XorgFoundation">
+	The X.Org Foundation
+      </ulink>
+    </corpauthor>
 
-<pubdate>&reldate;</pubdate>
+    <pubdate>&reldate;</pubdate>
 
-<abstract>
+    <abstract>
 
-<para>
-These release notes contains information about features and their status
-in the X.Org Foundation X11R&relvers; release.
-</para>
+      <para>
+	These release notes contains information about features and their
+	status in the X.Org Foundation X11R&relvers; release.
+      </para>
 
-</abstract>
+    </abstract>
 
-</articleinfo>
+  </articleinfo>
 
-<sect1>
-<title>Introduction to the X11R&relvers; Release</title>
+  <sect1>
+    <title>Introduction to the X11R&relvers; Release</title>
 
-<para>
-This release is the &whichfullrel; modular release of the X Window System.
-The next full release will be X11R&nextrelvers; and is expected in
-&nextfullreldate;.
-</para>
+    <para>
+      This release is the &whichfullrel; modular release of the
+      <productname>X Window System</productname>.
+      The next full release will be X11R&nextrelvers; and is expected in
+      &nextfullreldate;.
+    </para>
 
-<para>
-For help with how to build and develop in the modular tree see the <ulink
-URL="http://wiki.x.org/wiki/ModularDevelopersGuide"> Modular Developer's
-Guide</ulink> in the X.Org wiki.
-</para>
+    <para>
+      Unlike X11R1 through X11R6.9, X11R7.x releases are not built from one
+      monolithic source tree, but many individual modules.   These modules
+      are distributed as individual source code releases, and each one is
+      released when it is ready, instead of only when the overall window
+      system is ready for release.  The X11R7.x releases are made by
+      &ldquo;rolling up&rdquo; the individual module releases into a
+      collection that is often affectionately called the
+      &ldquo;<foreignphrase>katamari</foreignphrase>&rdquo; by the developers.
+    </para>
 
-<para>
-We encourage you to submit bug fixes and enhancements to
-freedesktop.org's <ulink URL="https://bugs.freedesktop.org/">
-bug tracking system</ulink> using the xorg product, and to
-discuss them on <email>xorg@lists.freedesktop.org</email>.
-More details on patch submission and review process are available on the
-<ulink url="http://www.x.org/wiki/Development/Documentation/SubmittingPatches">
-SubmittingPatches</ulink> page of the X.Org wiki.
-</para>
+    <para>
+      The X11R&relvers; release does not include all of the software
+      formerly included in the previous X Window System releases.
+      It is designed to be a reasonable baseline from which to start
+      when building the window system for the first time for a new
+      installation, distribution, or package set.  It does not provide
+      a full desktop environment, expecting a more feature rich set of
+      applications to be installed from one of the several excellent
+      desktop environments available for the X Window System.  The
+      X.Org developers continue to maintain and produce new releases
+      of much of the software that was formerly in the main window
+      system releases but is no longer included in the katamari
+      releases, including many of the Athena Widgets desktop
+      applications that were provided as samples in previous window
+      system versions.
+    </para>
+
+    <para>
+      Once their window system build is established, most builders watch for
+      announcements of individual module updates on the <ulink
+	url="http://lists.freedesktop.org/mailman/listinfo/xorg-announce"
+	>xorg-announce mailing list</ulink> and update to those as needed.
+      The X.Org Foundation currently releases the X Window System
+      katamari releases approximately once a year, but many modules,
+      especially the X servers and drivers, are updated more frequently
+      between those releases.
+    </para>
+
+    <para>
+      For help with how to build and develop in the modular tree see the
+      <ulink url="http://wiki.x.org/wiki/ModularDevelopersGuide">Modular
+	Developer's Guide</ulink> in the X.Org wiki.
+    </para>
+
+    <para>
+      We encourage you to submit bug fixes and enhancements to
+      freedesktop.org's <ulink url="https://bugs.freedesktop.org/">
+	bug tracking system</ulink> using the xorg product, and to
+      discuss them on <email>xorg@lists.freedesktop.org</email>.
+      More details on patch submission and review process are available on the
+      <ulink
+       url="http://www.x.org/wiki/Development/Documentation/SubmittingPatches">
+	SubmittingPatches</ulink> page of the X.Org wiki.
+    </para>
 
 <para>
 The release numbering is based on the original MIT X numbering system.
@@ -172,9 +218,11 @@ The next section describes what is new in the latest version
 	    buffers with an X drawable.  It is a essentially a helper
 	    extension to support implementation of direct rendering
 	    drivers/libraries/technologies.
-	    The main consumer of this extension will be a direct
+	    The first consumer of this extension is a direct
 	    rendering OpenGL driver, but the DRI2 extension is not
-	    designed to be OpenGL specific.  Direct rendering
+	    designed to be OpenGL specific.  Work is underway to
+	    utilize DRI2 for the Video Decode and Presentation API for Unix
+	    (<acronym>VPDAU</acronym>) as well.    Direct rendering
 	    implementations of OpenVG, Xv, cairo and other graphics
 	    APIs should find the functionality exposed by this
 	    extension helpful and hopefully sufficient.
@@ -196,10 +244,91 @@ The next section describes what is new in the latest version
         </listitem>
       </itemizedlist>
     </para>
-</sect1>
+  </sect1>
 
-<sect1>
-    <title>Drivers</title>
+  <sect1>
+    <title>Overview of X11R&relvers;</title>
+
+    <para>
+      On most platforms, X11R&relvers; has a single hardware-driving
+      X server binary called <command>Xorg</command>.  This binary can
+      dynamically load the video drivers, input drivers, and other modules
+      that are needed.
+
+      <command>Xorg</command> has currently has support for Linux, Solaris,
+      and some BSD OSs on Alpha, PowerPC, IA-64, AMD64, Intel x86, Sparc,
+      and MIPS platforms.
+
+    </para>
+
+    <para>
+      Additional specialized X server binaries may be found depending on
+      the platform and build configuration, including:
+
+      <glosslist>
+	<glossentry>
+	  <glossterm><command>Xdmx</command></glossterm>
+	  <glossdef><para>
+	    is a proxy X server that uses one or more other X servers as its
+	    display devices.  It provides multi-head X functionality for
+	    displays that might be located on different machines.
+	  </para></glossdef>
+	</glossentry>
+	<glossentry>
+	  <glossterm><command>Xnest</command></glossterm>
+	  <glossdef><para>
+	    is a nested X server, that operates as both an X client and X
+	    server.  <command>Xnest</command> is a client of the real server
+	    which manages windows and graphics requests on its behalf.
+	    <command>Xnest</command> is a server to its own clients, and
+	    manages windows and graphics requests on their behalf.
+	    To these clients, it appears to be a conventional server.
+	  </para></glossdef>
+	</glossentry>
+	<glossentry>
+	  <glossterm><command>Xephyr</command></glossterm>
+	  <glossdef><para>
+	      is a X server that outputs to a window on a pre-existing
+	      &ldquo;host&rdquo; X display.  Unlike <command>Xnest</command>
+	      which is an X proxy, and thus limited to the capabilities of
+	      the host X server, <command>Xephyr</command> is a full X server
+	      which uses the host X server window as a
+	      &ldquo;framebuffer&rdquo; via fast SHM XImages.
+	  </para></glossdef>
+	</glossentry>
+	<glossentry>
+	  <glossterm><command>Xvfb</command></glossterm>
+	  <glossdef><para>
+	    is a virtual framebuffer X server that can run on machines with
+	    no display hardware and no physical input devices.  It emulates
+	    a dumb framebuffer using virtual memory.
+	  </para></glossdef>
+	</glossentry>
+	<glossentry>
+	  <glossterm><command>Xquartz</command></glossterm>
+	  <glossdef><para>
+	    is an X server that interacts with the MacOS X native Aqua window
+	    system, displaying windows on the Mac desktop and accepting
+	    input from the Mac system devices, allowing X11 applications
+	    to be used in a native Mac desktop session.
+	  </para></glossdef>
+	</glossentry>
+	<glossentry>
+	  <glossterm><command>Xwin</command></glossterm>
+	  <glossdef><para>
+	    is an X server that runs under the Cygwin environment,
+	    interacting with the Microsoft Windows native window
+	    system, displaying windows on the Windows desktop and accepting
+	    input from the Windows system devices, allowing X11 applications
+	    to be used in a native Windows desktop session.
+	  </para></glossdef>
+	</glossentry>
+      </glosslist>
+    </para>
+  </sect1>
+
+  <sect1>
+    <title>Details of X11R&relvers; components</title>
 
     <sect2>
     <title>Video Drivers</title>
@@ -210,10 +339,10 @@ The next section describes what is new in the latest version
 
     <para>
     <informaltable id="drivertables" xreflabel="driver tables">
-        <tgroup Cols="3">
-            <colspec Align="Left" Colsep="1">
-            <colspec Align="Left" Colsep="1">
-            <colspec Align="Left" Colsep="1">
+        <tgroup cols="3">
+            <colspec align="left" colsep="1"></colspec>
+            <colspec align="left" colsep="1"></colspec>
+            <colspec align="left" colsep="1"></colspec>
         <tbody>
             <row>
                 <entry>Driver Name</entry>
@@ -221,235 +350,235 @@ The next section describes what is new in the latest version
                 <entry>Further Information</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">apm</Literal></entry>
+                <entry><literal remap="tt">apm</literal></entry>
                 <entry>Alliance Pro Motion</entry>
-                <entry><ulink URL="apm.html">README.apm</ulink></entry>
+                <entry><ulink url="apm.html">README.apm</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">ark</Literal></entry>
+                <entry><literal remap="tt">ark</literal></entry>
                 <entry>Ark Logic</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">ast</Literal></entry>
+                <entry><literal remap="tt">ast</literal></entry>
                 <entry>ASPEED Technology</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">ati</Literal></entry>
-                <entry>ATI Mach64</entry>
-                <entry><ulink URL="ati.html">README.ati</ulink></entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">chips</Literal></entry>
+                <entry><literal remap="tt">chips</literal></entry>
                 <entry>Chips &amp; Technologies</entry>
-                <entry><ulink URL="chips.html">README.chips</ulink>,
-                    <ulink URL="chips.4.html">chips(4)</ulink>
+                <entry><ulink url="chips.html">README.chips</ulink>,
+                    <ulink url="chips.4.html">chips(4)</ulink>
                 </entry>
             </row>
             <row>
-                <entry><Literal remap="tt">cirrus</Literal></entry>
+                <entry><literal remap="tt">cirrus</literal></entry>
                 <entry>Cirrus Logic</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">cyrix</Literal> (*)</entry>
-                <entry>Cyrix MediaGX</entry>
-                <entry><ulink URL="cyrix.html">README.cyrix</ulink></entry>
+                <entry><literal remap="tt">fbdev</literal></entry>
+                <entry>Linux framebuffer device</entry>
+                <entry><ulink url="fbdev.4.html">fbdev(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">fbdev</Literal></entry>
-                <entry>Linux framebuffer device</entry>
-                <entry><ulink URL="fbdev.4.html">fbdev(4)</ulink></entry>
+                <entry><literal remap="tt">geode</literal> (*)</entry>
+                <entry>AMD Geode GX and LX</entry>
+                <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">glint</Literal></entry>
+                <entry><literal remap="tt">glint</literal></entry>
                 <entry>3Dlabs, TI</entry>
-                <entry><ulink URL="glint.4.html">glint(4)</ulink></entry>
+                <entry><ulink url="glint.4.html">glint(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">i128</Literal></entry>
+                <entry><literal remap="tt">i128</literal></entry>
                 <entry>Number Nine</entry>
-                <entry><ulink URL="I128.html">README.I128</ulink>,
-                    <ulink URL="i128.4.html">i128(4)</ulink></entry>
+                <entry><ulink url="I128.html">README.I128</ulink>,
+                    <ulink url="i128.4.html">i128(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">i740</Literal></entry>
+                <entry><literal remap="tt">i740</literal></entry>
                 <entry>Intel i740</entry>
-                <entry><ulink URL="i740.html">README.i740</ulink></entry>
+                <entry><ulink url="i740.html">README.i740</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">intel</Literal></entry>
-                <entry>Intel i8xx/i9xx</entry>
-                <entry><ulink URL="intel.html">README.intel</ulink>,
-                    <ulink URL="intel.4.html">intel(4)</ulink></entry>
+                <entry><literal remap="tt">imstt</literal></entry>
+                <entry>Integrated Micro Solns</entry>
+                <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">impact</Literal></entry>
-                <entry>SGI Indigo Impact</entry>
-                <entry><ulink URL="impact.4.html">impact(4)</ulink></entry>
+                <entry><literal remap="tt">intel</literal></entry>
+                <entry>Intel i8xx/i9xx</entry>
+                <entry><ulink url="intel.html">README.intel</ulink>,
+                    <ulink url="intel.4.html">intel(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">imstt</Literal></entry>
-                <entry>Integrated Micro Solns</entry>
-                <entry>&nbsp;</entry>
+                <entry><literal remap="tt">mach64</literal></entry>
+                <entry>ATI Mach64</entry>
+                <entry><ulink url="ati.html">README.ati</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">mga</Literal></entry>
+                <entry><literal remap="tt">mga</literal></entry>
                 <entry>Matrox</entry>
-                <entry><ulink URL="mga.4.html">mga(4)</ulink></entry>
+                <entry><ulink url="mga.4.html">mga(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">neomagic</Literal></entry>
+                <entry><literal remap="tt">neomagic</literal></entry>
                 <entry>NeoMagic</entry>
-                <entry><ulink URL="neomagic.4.html">neomagic(4)</ulink></entry>
+                <entry><ulink url="neomagic.4.html">neomagic(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">newport</Literal> (-)</entry>
+                <entry><literal remap="tt">newport</literal> (-)</entry>
                 <entry>SGI Newport</entry>
-                <entry><ulink URL="newport.html">README.newport</ulink>,
-                    <ulink URL="newport.4.html">newport(4)</ulink></entry>
+                <entry><ulink url="newport.html">README.newport</ulink>,
+                    <ulink url="newport.4.html">newport(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">nsc</Literal></entry>
+                <entry><literal remap="tt">nsc</literal></entry>
                 <entry>National Semiconductor</entry>
-                <entry><ulink URL="nsc.4.html">nsc(4)</ulink></entry>
+                <entry><ulink url="nsc.4.html">nsc(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">nv</Literal></entry>
+                <entry><literal remap="tt">nv</literal></entry>
                 <entry>NVIDIA</entry>
-                <entry><ulink URL="nv.4.html">nv(4)</ulink></entry>
+                <entry><ulink url="nv.4.html">nv(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">ati</Literal></entry>
+                <entry><literal remap="tt">r128</literal></entry>
                 <entry>ATI Rage128</entry>
-                <entry><ulink URL="r128.html">README.r128</ulink>,
-			<ulink URL="r128.4.html">r128(4)</ulink></entry>
+                <entry><ulink url="r128.html">README.r128</ulink>,
+			<ulink url="r128.4.html">r128(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">radeon</Literal></entry>
+                <entry><literal remap="tt">radeon</literal></entry>
                 <entry>ATI Radeon</entry>
-                <entry><ulink URL="radeon.4.html">radeon(4)</ulink></entry>
+                <entry><ulink url="radeon.4.html">radeon(4)</ulink></entry>
             </row>
 
             <row>
-                <entry><Literal remap="tt">rendition</Literal></entry>
+                <entry><literal remap="tt">rendition</literal></entry>
                 <entry>Rendition</entry>
-                <entry><ulink URL="rendition.html">README.rendition</ulink>,
-                    <ulink URL="rendition.4.html">rendition(4)</ulink></entry>
+                <entry><ulink url="rendition.html">README.rendition</ulink>,
+                    <ulink url="rendition.4.html">rendition(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">s3</Literal></entry>
+                <entry><literal remap="tt">s3</literal></entry>
                 <entry>S3 (not ViRGE or Savage)</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">s3virge</Literal></entry>
+                <entry><literal remap="tt">s3virge</literal></entry>
                 <entry>S3 ViRGE</entry>
-                <entry><ulink URL="s3virge.html">README.s3virge</ulink>,
-                    <ulink URL="s3virge.4.html">s3virge(4)</ulink></entry>
+                <entry><ulink url="s3virge.html">README.s3virge</ulink>,
+                    <ulink url="s3virge.4.html">s3virge(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">savage</Literal></entry>
+                <entry><literal remap="tt">savage</literal></entry>
                 <entry>S3 Savage</entry>
-                <entry><ulink URL="savage.4.html">savage(4)</ulink></entry>
+                <entry><ulink url="savage.4.html">savage(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">siliconmotion</Literal></entry>
+                <entry><literal remap="tt">siliconmotion</literal></entry>
                 <entry>Silicon Motion</entry>
-                <entry><ulink URL="siliconmotion.4.html">siliconmotion(4)</ulink></entry>
+                <entry><ulink url="siliconmotion.4.html">siliconmotion(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">sis</Literal></entry>
+                <entry><literal remap="tt">sis</literal></entry>
                 <entry>SiS</entry>
-                <entry><ulink URL="SiS.html">README.SiS</ulink>,
-                    <ulink URL="sis.4.html">sis(4)</ulink></entry>
+                <entry><ulink url="SiS.html">README.SiS</ulink>,
+                    <ulink url="sis.4.html">sis(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">sisusb</Literal></entry>
+                <entry><literal remap="tt">sisusb</literal></entry>
                 <entry>SiS USB</entry>
-                <entry><ulink URL="sisusb.4.html">sisusb(4)</ulink></entry>
+                <entry><ulink url="sisusb.4.html">sisusb(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">sunbw2</Literal> (+)</entry>
-                <entry>Sun bw2</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">suncg14</Literal> (+)</entry>
+                <entry><literal remap="tt">suncg14</literal> (+)</entry>
                 <entry>Sun cg14</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">suncg3</Literal> (+)</entry>
+                <entry><literal remap="tt">suncg3</literal> (+)</entry>
                 <entry>Sun cg3</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">suncg6</Literal> (+)</entry>
+                <entry><literal remap="tt">suncg6</literal> (+)</entry>
                 <entry>Sun GX and Turbo GX</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">sunffb</Literal> (+)</entry>
+                <entry><literal remap="tt">sunffb</literal> (+)</entry>
                 <entry>Sun Creator/3D, Elite 3D</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">sunleo</Literal> (+)</entry>
+                <entry><literal remap="tt">sunleo</literal> (+)</entry>
                 <entry>Sun Leo (ZX)</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
                 <entry>
-                <Literal remap="tt">suntcx</Literal> (+)</entry>
+                <literal remap="tt">suntcx</literal> (+)</entry>
                 <entry>Sun TCX</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">tdfx</Literal></entry>
-                <entry>3Dfx</entry>
-                <entry><ulink URL="tdfx.4.html">tdfx(4)</ulink></entry>
+                <entry><literal remap="tt">tdfx</literal></entry>
+                <entry>3Dfx Voodoo Banshee, 3, 4 &amp; 5</entry>
+                <entry><ulink url="tdfx.4.html">tdfx(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">tga</Literal></entry>
+                <entry><literal remap="tt">tga</literal></entry>
                 <entry>DEC TGA</entry>
-                <entry><ulink URL="DECtga.html">README.DECtga</ulink></entry>
+                <entry><ulink url="DECtga.html">README.DECtga</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">trident</Literal></entry>
+                <entry><literal remap="tt">trident</literal></entry>
                 <entry>Trident</entry>
-                <entry><ulink URL="trident.4.html">trident(4)</ulink></entry>
+                <entry><ulink url="trident.4.html">trident(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">tseng</Literal></entry>
+                <entry><literal remap="tt">tseng</literal></entry>
                 <entry>Tseng Labs</entry>
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">v4l</Literal></entry>
+                <entry><literal remap="tt">v4l</literal></entry>
                 <entry>Video4Linux</entry>
-                <entry>&nbsp;</entry>
+                <entry><ulink url="v4l.4.html">v4l(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">vesa</Literal></entry>
+                <entry><literal remap="tt">vesa</literal></entry>
                 <entry>VESA</entry>
-                <entry><ulink URL="vesa.4.html">vesa(4)</ulink></entry>
+                <entry><ulink url="vesa.4.html">vesa(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">vmware</Literal></entry>
+                <entry><literal remap="tt">vmware</literal></entry>
                 <entry>VMware guest OS</entry>
-                <entry><ulink URL="vmware.4.html">vmware(4)</ulink></entry>
+                <entry><ulink url="vmware.4.html">vmware(4)</ulink></entry>
             </row>
-            <row>
-                <entry><Literal remap="tt">voodoo</Literal></entry>
-                <entry>3Dfx Voodoo</entry>
-                <entry>&nbsp;</entry>
+	    <row>
+                <entry><literal remap="tt">voodoo</literal></entry>
+                <entry>3Dfx Voodoo 1 &amp; 2</entry>
+                <entry><ulink url="voodoo.4.html">voodoo(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">wsfb</Literal></entry>
+                <entry><literal remap="tt">wsfb</literal></entry>
                 <entry>Workstation Framebuffer</entry>
-                <entry><ulink URL="wsfb.4.html">wsfb(4)</ulink></entry>
+                <entry><ulink url="wsfb.4.html">wsfb(4)</ulink></entry>
+            </row>
+            <row>
+                <entry><literal remap="tt">xgi</literal></entry>
+                <entry>XGI</entry>
+                <entry><ulink url="xgi.4.html">xgi(4)</ulink></entry>
+            </row>
+            <row>
+                <entry><literal remap="tt">xgixp</literal></entry>
+                <entry>XGI XP</entry>
+                <entry><ulink url="xgixp.4.html">xgixp(4)</ulink></entry>
             </row>
 	  </tbody>
        </tgroup>
@@ -468,12 +597,6 @@ The next section describes what is new in the latest version
     <para>
     Drivers marked with (-) are for Linux/mips only.
     </para>
-
-    <para>
-    Darwin/Mac OS X uses IOKit drivers and does not use the module loader
-    drivers listed above. Further information can be found in <ulink
-    URL="Darwin.html"> README.Darwin</ulink>.
-    </para>
     </sect2>
 
     <sect2>
@@ -486,10 +609,10 @@ The next section describes what is new in the latest version
     <para>
 
     <informaltable>
-        <tgroup Cols="3">
-            <colspec Align="Left" Colsep="1">
-            <colspec Align="Left" Colsep="1">
-            <colspec Align="Left" Colsep="1">
+        <tgroup cols="3">
+            <colspec align="left" colsep="1"></colspec>
+            <colspec align="left" colsep="1"></colspec>
+            <colspec align="left" colsep="1"></colspec>
         <tbody>
             <row>
                 <entry>Driver Name</entry>
@@ -497,79 +620,49 @@ The next section describes what is new in the latest version
                 <entry>Further Information</entry>
             </row>
             <row>
-                <entry><Literal remap="tt">acecad</Literal></entry>
+                <entry><literal remap="tt">acecad</literal></entry>
                 <entry>Acecad Flair</entry>
-                <entry><ulink URL="aiptek.4.html">acecad(4)</ulink></entry>
+                <entry><ulink url="aiptek.4.html">acecad(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">aiptek(*)</Literal></entry>
+                <entry><literal remap="tt">aiptek(*)</literal></entry>
                 <entry>Aiptek USB tablet</entry>
-                <entry><ulink URL="aiptek.4.html">aiptek(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">elographics</Literal></entry>
-                <entry>EloGraphics</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">evdev(*)</Literal></entry>
-                <entry>EvDev</entry>
-                <entry><ulink URL="evdev.4.html">evdev(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">fpit</Literal></entry>
-                <entry>Fujitsu Stylistic Tablet PCs</entry>
-                <entry><ulink URL="fpit.4.html">fpit(4)</ulink></entry>
+                <entry><ulink url="aiptek.4.html">aiptek(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">hyperpen</Literal></entry>
-                <entry>Aiptek HyperPen 6000</entry>
-                <entry>&nbsp;</entry>
+                <entry><literal remap="tt">evdev(*)</literal></entry>
+                <entry>Linux kernel EvDev</entry>
+                <entry><ulink url="evdev.4.html">evdev(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">joystick</Literal></entry>
+                <entry><literal remap="tt">joystick</literal></entry>
                 <entry>Joystick</entry>
-                <entry>&nbsp;</entry>
+                <entry><ulink url="joystick.4.html">joystick(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">kbd</Literal></entry>
+                <entry><literal remap="tt">kbd</literal></entry>
                 <entry>generic keyboards (non-evdev systems)</entry>
-                <entry><ulink URL="kbd.4.html">kbd(4)</ulink></entry>
+                <entry><ulink url="kbd.4.html">kbd(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">microtouch</Literal></entry>
-                <entry>MicroTouch</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">mouse</Literal></entry>
+                <entry><literal remap="tt">mouse</literal></entry>
                 <entry>most mouse devices (non-evdev systems)</entry>
-                <entry><ulink URL="mouse.4.html">mouse(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">mutouch</Literal></entry>
-                <entry>MicroTouch</entry>
-                <entry>&nbsp;</entry>
+                <entry><ulink url="mouse.4.html">mouse(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">penmount</Literal></entry>
-                <entry>PenMount</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><Literal remap="tt">synaptics</Literal></entry>
+                <entry><literal remap="tt">synaptics</literal></entry>
                 <entry>Synaptics &amp; ALP touchpads</entry>
-                <entry>&nbsp;</entry>
+                <entry><ulink url="synaptics.4.html">synaptics(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">vmmouse</Literal></entry>
+                <entry><literal remap="tt">vmmouse</literal></entry>
                 <entry>VMWare virtual mouse</entry>
-                <entry>&nbsp;</entry>
+                <entry><ulink url="vmmouse.4.html">vmmouse(4)</ulink></entry>
             </row>
             <row>
-                <entry><Literal remap="tt">void</Literal></entry>
+                <entry><literal remap="tt">void</literal></entry>
                 <entry>dummy device</entry>
-                <entry><ulink URL="void.4.html">void(4)</ulink></entry>
+                <entry><ulink url="void.4.html">void(4)</ulink></entry>
             </row>
         </tbody>
         </tgroup>
@@ -582,97 +675,17 @@ The next section describes what is new in the latest version
 
     </sect2>
 
-</sect1>
-
-<sect1>
-<title>Overview of X11R&relvers;</title>
-
-    <para>
-      On most platforms, X11R&relvers; has a single hardware-driving
-      X server binary called <command>Xorg</command>.  This binary can
-      dynamically load the video drivers, input drivers, and other modules
-      that are needed.
-
-      <command>Xorg</command> has currently has support for Linux, Solaris,
-      and some BSD OSs on Alpha, PowerPC, IA-64, AMD64, Intel x86, Sparc,
-      and MIPS platforms.
-
-    </para>
-
-    <para>
-      Additional specialized X server binaries may be found depending on
-      the platform and build configuration, including:
-
-      <glosslist>
-	<glossentry>
-	  <glossterm><command>Xdmx</command></glossterm>
-	  <glossdef><para>
-	    is a proxy X server that uses one or more other X servers as its
-	    display devices.  It provides multi-head X functionality for
-	    displays that might be located on different machines.
-	  </para></glossdef>
-	</glossentry>
-	<glossentry>
-	  <glossterm><command>Xnest</command></glossterm>
-	  <glossdef><para>
-	    is a nested X server, that operates as both an X client and X
-	    server.  <command>Xnest</command> is a client of the real server
-	    which manages windows and graphics requests on its behalf.
-	    <command>Xnest</command> is a server to its own clients, and
-	    manages windows and graphics requests on their behalf.
-	    To these clients, it appears to be a conventional server.
-	  </para></glossdef>
-	</glossentry>
-	<glossentry>
-	  <glossterm><command>Xephyr</command></glossterm>
-	  <glossdef><para>
-	    is a X server that outputs to a window on a pre-existing "host"
-	    X display.  Unlike <command>Xnest</command> which is an X proxy,
-	    and thus limited to the capabilities of the host X server,
-	    <command>Xephyr</command> is a full X server which uses the host
-	    X server window as "framebuffer" via fast SHM XImages.
-	  </para></glossdef>
-	</glossentry>
-	<glossentry>
-	  <glossterm><command>Xvfb</command></glossterm>
-	  <glossdef><para>
-	    is a virtual framebuffer X server that can run on machines with
-	    no display hardware and no physical input devices.  It emulates
-	    a dumb framebuffer using virtual memory.
-	  </para></glossdef>
-	</glossentry>
-	<glossentry>
-	  <glossterm><command>Xquartz</command></glossterm>
-	  <glossdef><para>
-	    is an X server that interacts with the MacOS X native Aqua window
-	    system, displaying windows on the Mac desktop and accepting
-	    input from the Mac system devices, allowing X11 applications
-	    to be used in a native Mac desktop session.
-	  </para></glossdef>
-	</glossentry>
-	<glossentry>
-	  <glossterm><command>Xwin</command></glossterm>
-	  <glossdef><para>
-	    is an X server that runs under the Cygwin environment,
-	    interacting with the Microsoft Windows native window
-	    system, displaying windows on the Windows desktop and accepting
-	    input from the Windows system devices, allowing X11 applications
-	    to be used in a native Windows desktop session.
-	  </para></glossdef>
-	</glossentry>
-      </glosslist>
-    </para>
-
     <sect2>
+      <title>Xorg server</title>
+      <sect3>
         <title>Loader and Modules</title>
 
         <para>
-        The Xorg server
-        relies on the operating system's native module loader support for
-        handling program modules. The X server makes use of modules for
-        video drivers, X server extensions, font rasterisers, input device
-        drivers, framebuffer layers, and internal components used by some
-        drivers (like XAA).
+	  The Xorg server relies on the operating system's native
+	  module loader support for handling program modules. The X
+	  server makes use of modules for video drivers, X server
+	  extensions, input device drivers, framebuffer layers, and
+	  internal components used by some drivers (like XAA &amp; EXA).
         </para>
 
         <para>
@@ -695,15 +708,15 @@ The next section describes what is new in the latest version
         signing/verifying the modules that we provide available in a
         future release.
         </para></warning>
-    </sect2>
+      </sect3>
 
-    <sect2 id="config">
+      <sect3 id="config">
         <title>Configuration File</title>
 
         <para>
-        The X server uses a configuration file as the primary mechanism
+        The Xorg server uses a configuration file as the primary mechanism
         for providing configuration and run-time parameters.  The configuration
-        file format is described in detail in the <ulink URL="xorg.conf.5.html">
+        file format is described in detail in the <ulink url="xorg.conf.5.html">
         xorg.conf(5)</ulink> manual page.
         </para>
 
@@ -715,10 +728,10 @@ The next section describes what is new in the latest version
 
         <para>
         If you do need to customize the configuration file, see the <ulink
-        URL="xorg.conf.5.html"
+        url="xorg.conf.5.html"
         >xorg.conf manual page</ulink> .  You can also
         check the driver-specific manual pages and the related
-        documentation (found at <xref LinkEnd="drivertables"> also.
+        documentation (found at <xref linkend="drivertables"></xref>) also.
         </para>
 
         <para>
@@ -731,20 +744,20 @@ The next section describes what is new in the latest version
          and follow the instructions.
         </para>
 
-    </sect2>
+      </sect3>
 
-    <Sect2>
+      <sect3>
         <title>Command Line Options</title>
 
         <para>
         Command line options can be used to override some default
         parameters and parameters provided in the configuration file.
         These command line options are described in the <ulink
-        URL="Xorg.1.html">Xorg(1)</ulink> manual page.
+        url="Xorg.1.html">Xorg(1)</ulink> manual page.
         </para>
-    </sect2>
+      </sect3>
 
-    <sect2>
+      <sect3>
         <title>XAA</title>
 
         <para>
@@ -752,27 +765,26 @@ The next section describes what is new in the latest version
         from scratch for XFree86 4.x and is used in X11R&relvers;.
         Most drivers implement acceleration by making use of the XAA module.
         </para>
-    </sect2>
+      </sect3>
 
-    <sect2>
+      <sect3>
         <title>EXA</title>
 
         <para>
         EXA was created as a new driver acceleration architecture to
         replace XAA. EXA was designed specifically to accelerate Render
         operations. This release features improved driver support for EXA.
-        See the individual driver changelogs for details. Users should
-        beware that EXA support is considered to be incomplete in
-        X11R&relvers;.
+        See the individual driver changelogs for details.
         </para>
-    </sect2>
+      </sect3>
 
-    <sect2>
+      <sect3>
         <title>Multi-head</title>
 
         <para>
-        Some multi-head configurations are supported in X11R&relvers;, primarily
-        with multiple PCI/AGP cards.
+	  Some multi-head configurations are supported in X11R&relvers;.
+	  Support for multiple PCI/AGP cards may require a kernel with
+	  changes to support VGA arbitration.
         </para>
 
         <para>
@@ -786,9 +798,9 @@ The next section describes what is new in the latest version
         slot, or by changing the system BIOS's preference for the primary
         card).
         </para>
-    </sect2>
+      </sect3>
 
-    <sect2>
+      <sect3>
         <title>Xinerama</title>
         <para>
         Xinerama is an X server extension that allows multiple physical screens
@@ -804,46 +816,17 @@ The next section describes what is new in the latest version
         <option>+xinerama</option> command line option for the
         X server.
         </para>
+      </sect3>
 
-        <para>
-        Known problems:
-
-        <itemizedlist>
-            <listitem>
-                <para>
-                Most window managers are not Xinerama-aware, and so some
-                operations like window placement and resizing might not behave
-                in an ideal way.  This is an issue that needs to be dealt with
-                in the individual window managers, and isn't specifically an
-                X server problem.
-                </para>
-            </listitem>
-        </itemizedlist>
-
-        </para>
-    </sect2>
-
-    <sect2>
-        <title>DGA version 2</title>
-
-        <para>
-        DGA 2.0 is included in &relvers;.  Documentation for the client
-        libraries can be found in the <ulink
-        URL="XDGA.3.man">XDGA(3)</ulink> man page.  A good degree of
-        backward compatibility with version 1.0 is provided.  DGA should be
-        considered deprecated; if you are relying on it, please let us know
-        what you need it for so we can find better solutions.
-        </para>
-    </sect2>
-
-    <sect2>
+      <sect3>
         <title>DDC</title>
 
         <para>
-        The VESA&reg; Display Data Channel (DDC&trade;) standard allows the
-        monitor to tell the video card (or on some cases the computer
-        directly) about itself; particularly the supported screen
-        resolutions and refresh rates.
+	  The <acronym>VESA</acronym>&reg; Display Data Channel
+	  (<acronym><trademark>DDC</trademark></acronym>) standard allows
+	  the monitor to tell the video card (or in some cases the
+	  computer directly) about itself; particularly the supported
+	  screen resolutions and refresh rates.
         </para>
 
         <para>
@@ -852,7 +835,7 @@ The next section describes what is new in the latest version
         "Device" section entry:  <literal remap="tt">Option
         "NoDDC"</literal>.  We have support for DDC versions 1 and 2; these
         can be disabled independently with <literal remap="tt">Option
-        "NoDDC1"</Literal> and <literal remap="tt">Option
+        "NoDDC1"</literal> and <literal remap="tt">Option
         "NoDDC2"</literal>.
         </para>
 
@@ -863,11 +846,11 @@ The next section describes what is new in the latest version
         configuration file don't match those that are detected.
         </para>
 
-        <sect3>
+        <sect4>
             <title>Changed behavior caused by DDC.</title>
 
             <para>
-            Several drivers uses DDC information to set the screen size and
+            Several drivers use DDC information to set the screen size and
             pitch.  This can be overridden by explicitly resetting it to
             the and non-DDC default value 75 with the <option>-dpi 75</option>
 	    command line option for the X
@@ -875,19 +858,19 @@ The next section describes what is new in the latest version
             "DisplaySize" keyword in the "Monitor" section of the config
             file.
             </para>
-        </sect3>
-    </sect2>
+        </sect4>
+      </sect3>
 
-    <sect2>
+      <sect3>
         <title>GLX and the Direct Rendering Infrastructure (DRI)</title>
 
         <para>
         Direct rendered OpenGL&reg; support is provided for several
         hardware platforms by the Direct Rendering Infrastructure (DRI).
         Further information about DRI can be found at the <ulink
-        URL="http://dri.sf.net/">DRI Project's web site</ulink>.  The 3D
+        url="http://dri.sf.net/">DRI Project's web site</ulink>.  The 3D
         core rendering component is provided by <ulink
-        URL="http://www.mesa3d.org">Mesa</ulink>.
+        url="http://www.mesa3d.org">Mesa</ulink>.
         </para>
 
         <para>
@@ -898,13 +881,56 @@ The next section describes what is new in the latest version
         that the server be built using a version of libdrm of 2.3.0 or
         newer if it is to use DRM.
         </para>
+      </sect3>
+
+      <sect3>
+	<title>Terminate Server keystroke</title>
+
+	<para>
+	  The Xorg server has previously allowed users to exit the server
+	  by pressing the keys
+	  <keycap function="control">Control</keycap> +
+	  <keycap function="alt">Alt</keycap> +
+	  <keycap function="backspace">Backspace</keycap>.
+	  While this function is still enabled by default in this release,
+	  the keymap data usually used with Xorg, from the
+	  xkeyboard-config project, has been modified to not map that
+	  sequence by default, in order to reduce the chance that
+	  inexperienced users will accidentally destroy their work.
+	</para>
+	<para>
+	  Users who wish to have this functionality available by default
+	  may enable it via the XKB configuration option
+	  &ldquo;<option>terminate:ctrl_alt_bksp</option>&rdquo;.  For
+	  instance, the <command>setxkbmap</command> command can be used
+	  to enable this by running:
+	  <screen>
+	setxkbmap -option "terminate:ctrl_alt_bksp"
+	  </screen>
+	  Many desktop environments include XKB configuration options in
+	  their preferences to enable this as well.
+	</para>
+      </sect3>
+
+
+      <sect3>
+	<title>X Server startup state</title>
+
+	<para>
+	  The X servers in the X11R&relvers; release now start by default
+	  with an empty black screen and do not draw the mouse cursor until
+	  a client sets the cursor image.   To restore the classic behavior
+	  of starting with the grey weave pattern and &times; cursor, start
+	  the X server with the <option>-retro</option> option.
+	</para>
+      </sect3>
     </sect2>
 
 <!--
-    <Sect2>
-        <Title>Other extensions</Title>
+    <sect2>
+        <title>Other extensions</title>
         <para></para>
-    </Sect2>
+    </sect2>
 -->
 
 <!--
@@ -923,144 +949,225 @@ The next section describes what is new in the latest version
 </sect1>
 -->
 
-    <Sect2>
-        <Title>Font support</Title>
+    <sect2 id="font">
+        <title>Font support</title>
 
-        <Para>
-        Details about the font support in X11R&relvers;.x can be
-        found in the <ulink URL="fonts.html">README.fonts</ulink>
+        <para>
+        Details about the font support in X11R&relvers; can be
+        found in the <ulink url="fonts/fonts.html">README.fonts</ulink>
         document.
-        </Para>
-    </Sect2>
-
-    <Sect2>
-        <Title>Type1 Font support</Title>
-
-        <Para>
-        Previous versions of X came with two Postscript Type1 font backends.
-	The functionality from the `Type1' backend has been replaced by the
-	Type1 support in the `FreeType' backend.
-        </Para>
-    </Sect2>
-
-    <Sect2 id="luxi">
-        <Title>Luxi fonts from Bigelow and Holmes </Title>
-
-        <Para>
-        The X distribution includes the ``Luxi'' family of Type&nbsp;1
-        fonts and TrueType fonts.  This family consists of the fonts
-        ``Luxi&nbsp;Serif'', ``Luxi&nbsp;Sans'' and ``Luxi&nbsp;Mono'' in
-        Roman, oblique, bold and bold oblique variants.  The TrueType
-        version have glyphs covering the basic ASCII Unicode range, the
-        Latin&nbsp;1 range, as well as the <Emphasis remap="it">Extended
-        Latin</Emphasis> range and some additional punctuation characters.
-        In particular, these fonts include all the glyphs needed for
-        ISO&nbsp;8859 parts 1, 2, 3, 4, 9, 13 and 15, as well as all the
-        glyphs in the Adobe Standard encoding and the Windows 3.1
-        character set.
-        </Para>
-
-        <Para>
-        The glyph coverage of the Type&nbsp;1 versions is somewhat reduced,
-        and only covers ISO&nbsp;8859 parts 1, 2 and 15 as well as the Adobe
-        Standard encoding.
-        </Para>
-
-        <Para>
-        The Luxi fonts are original designs by Kris Holmes and Charles Bigelow
-        from Bigelow and Holmes Inc., who developed the Luxi typeface designs
-        in Ikarus digital format.  URW++ Design and Development GmbH converted
-        the Ikarus format fonts to TrueType and Type&nbsp;1 font programs and
-        implemented the grid-fitting "hints" and kerning tables in the Luxi
-        fonts.
-        </Para>
-
-        <Para>
-        The license terms for the Luxi fonts are included in the file
-        `<Literal remap="tt">COPYRIGHT.BH</Literal>', as well as in the
-        <ulink URL="LICENSE.html">License document</ulink>.  For further
-        information, please contact <EMAIL>design@bigelowandholmes.com</EMAIL>
-        or <EMAIL>info@urwpp.de</EMAIL>, or consult the
-        <ulink URL="http://www.urwpp.de">URW++ web site</ulink>.
-        </Para>
-    </Sect2>
-
-</Sect1>
-
-<Sect1>
-    <Title>Miscellaneous</Title>
-
-    <Para>
+        </para>
+
+	<sect3>
+	  <title>Default font installation directory</title>
+
+	  <para>
+	    Previous versions of X installed font files under the
+	    <filename class="directory">lib/X11/fonts</filename> subdirectory
+	    of the X installation directory (for instance, in X11R6 releases,
+	    <filename class="directory">/usr/X11R6/lib/X11/fonts</filename>
+	    was commonly used).   This release changes the default installation
+	    path to the <filename class="directory">fonts</filename>
+	    subdirectory of the <varname>datadir</varname> setting from the
+	    GNU autoconf configuration.   For instance, if the fonts are
+	    configured with <userinput>./configure --prefix=/usr</userinput>,
+	    they will be installed under subdirectories of
+	    <filename class="directory">/usr/share/fonts/X11</filename>.
+	    The font module configure scripts all take an option of
+	    <option>--with-fontrootdir=<parameter>PATH</parameter></option>
+	    to override the default.   If <option>--with-fontrootdir</option>
+	    is not specified, the <filename>fontutil</filename> pkg-config
+	    file will be consulted to find the <varname>fontrootdir</varname>
+	    specified when the <filename>fontutil</filename> module was
+	    installed.
+	  </para>
+	</sect3>
+
+	<sect3>
+	  <title>Bitmap font compression methods</title>
+
+	  <para>
+	    The X11R&relvers; release supports PCF format bitmap fonts stored
+	    uncompressed or compressed via the <command>compress</command>,
+	    <command>gzip</command>, or <command>bzip2</command> programs.
+	    To utilize bzip2 compression, the <literal>libXfont</literal>
+	    and <command>mkfontscale</command> modules must be built with
+	    the <option>--with-bzip2</option> &mdash; all other methods are
+	    enabled by default.
+	  </para>
+	  <para>
+	    To specify which compression method to use when installing
+	    a font module from X11R&relvers; the configure scripts accept
+	    an option of
+	    <option>--with-compression=<parameter>TYPE</parameter></option>,
+	    where <parameter>TYPE</parameter> may be <literal>none</literal>,
+	    <literal>compress</literal>, <literal>gzip</literal>, or
+	    <literal>bzip2</literal>.
+	  </para>
+	</sect3>
+
+	<sect3>
+	  <title>Type1 Font support</title>
+
+	  <para>
+	    Previous versions of X came with two Postscript Type1 font
+	    backends.  The functionality from the &ldquo;Type1&rdquo;
+	    backend has been replaced by the Type1 support in the
+	    &ldquo;FreeType&rdquo; backend.
+	  </para>
+	</sect3>
+
+	<sect3>
+	  <title>CID Font support</title>
+
+	  <para>
+	    The CID-keyed font format was designed by Adobe Systems for
+	    fonts with large character sets.  The CID-keyed format is
+	    obsolete, as it has been superseded by other formats such as
+	    OpenType/CFF and support for CID-keyed fonts has been removed
+	    from X11.
+	  </para>
+	</sect3>
+
+      </sect2>
+
+  </sect1>
+
+  <sect1>
+    <title>Build changes and issues</title>
+
+    <sect2>
+      <title>Silent build rules</title>
+
+      <para>
+	Most of the modules in this release use the
+	<function>AM_SILENT_RULES</function> option of GNU automake 1.11.
+	When building the software, most output will show an abbreviated
+	format for the commands being run, such as:
+	<screen>
+   CC	xmen.o
+	</screen>
+	To enable verbose output, showing all the arguments to the commands
+	being run, add the flag <option>V=1</option> to the
+	<command>make</command> command line or add the flag
+	<option>--disable-silent-rules</option> to the configure command.
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>New configure options for font modules</title>
+
+      <para>
+	Several new options have been added to the configure scripts
+	for font modules in this release.   See the
+	<link linkend="font">Font support</link> section of this document
+	for details of the
+	<option>--with-fontrootdir=<parameter>PATH</parameter></option>
+	and
+	<option>--with-compression=<parameter>TYPE</parameter></option>
+	options.
+      </para>
+    </sect2>
+
+    <sect2>
+      <title>Changes to extension headers</title>
+
+      <para>
+	The C language header files for a number of X11 protocol
+	extensions were refactored in this release to better split the
+	protocol definitions and the client library definitions.
+	Efforts were made to retain compatibility for existing
+	software, but use of some headers may now trigger warnings
+	suggesting including new or more appropriate headers instead.
+      </para>
+      <para>
+	Since these changes were made to files in both the
+	<literal>proto</literal> and <literal>lib</literal>
+	modules for each extension, builders upgrading individual
+	modules will have to update these modules in unison to avoid
+	breaking builds of software using the headers from these modules.
+      </para>
+    </sect2>
+
+
+  </sect1>
+
+  <sect1>
+    <title>Miscellaneous</title>
+
+    <para>
     This section describes other items of note for the
     X11R&relvers; release.
-    </Para>
+    </para>
 
-    <Sect2>
-        <Title>Socket directory ownership and permissions</Title>
+    <sect2>
+        <title>Socket directory ownership and permissions</title>
 
-        <Para>
-        The socket directories created in <Literal remap="tt">/tmp</Literal> are now required to be
-        owned by root and have their sticky-bit set.  If the permissions are not
-        set correctly, the component using this directory will print an error
-        message and fail to start.  Common socket directories that are known to
-        be affected include:
+      <para>
+	The socket directories created in <filename>/tmp</filename>
+        are now required to be owned by root and have their sticky-bit
+        set.  If the permissions are not set correctly, the component
+        using this directory will print an error message and fail to
+        start.  Common socket directories that are known to be
+        affected include:
 
-        <Screen>
+        <screen>
         /tmp/.font-unix
         /tmp/.ICE-unix
         /tmp/.X11-unix
-        </Screen>
+        </screen>
 
-        These directories are used by the font server, 
-	<command>xfs</command>,	applications using the Inter-Client
-        Exchange protocol (ICE) and the X server, respectively.
-        </Para>
+        These directories are used by the font server
+	(<command>xfs</command>), applications using the Inter-Client
+	Exchange protocol (<acronym>ICE</acronym>) and the X server,
+	respectively.
+      </para>
 
-        <Para>
+      <para>
         There are several solutions to the problem of when to create these
         directories.  They could be created at install time by the system's
-        installer if the <Literal remap="tt">/tmp</Literal> dir is
+        installer if the <filename class="directory">/tmp</filename> dir is
         persistent.  They could be created at boot time by the system's
-        boot scripts (e.g., the <Literal remap="tt">init.d</Literal>
+        boot scripts (e.g., the <filename class="directory" >init.d</filename>
         scripts).  Or, they could be created by PAM modules at service
         startup or user login time.
-        </Para>
+      </para>
 
-        <Para>
+      <para>
         The solution chosen is platform dependent, and the system administrator
         should be able to handle creating those directories on any systems that
         do not have the correct ownership or permissions.
-        </Para>
-    </Sect2>
+      </para>
+    </sect2>
 
-    <Sect2>
-        <Title>Composite exposes extra visuals</Title>
+    <sect2>
+        <title>Composite exposes extra visuals</title>
 
-        <Para>
+        <para>
         When the Composite extension is enabled, a new visual is
         created.  This visual is different from the other visuals used by X
         applications in that it includes an alpha component.  It is used by
         the compositing manager and other Composite aware applications.
-        </Para>
+        </para>
 
-        <Para>
+        <para>
         Most X applications ignore this visual since it is not useful to
         them; however some applications mistakenly try to use it, which
-        will cause them to fail.  An environment variable, 
+        will cause them to fail.  An environment variable,
 	<envar>XLIB_SKIP_ARGB_VISUALS</envar>,
         was added to the X11 library to hide this visual from applications
         that mistakenly try to use it.  If an application fails only when
         the Composite is enabled, try setting this environment variable
         before starting the application.
-        </Para>
+        </para>
 
-    </Sect2>
-</Sect1>
+    </sect2>
+  </sect1>
 
-<Sect1>
-    <Title>Deprecated components and removal plans</Title>
+  <sect1>
+    <title>Deprecated components and removal plans</title>
 
-    <Para>
+    <para>
     This section lists current plans for removal of obsolete or deprecated
     components in the X.Org releases.  As our releases are open source,
     users who continue to require these can find the source in previous
@@ -1069,71 +1176,140 @@ The next section describes what is new in the latest version
     distribution in the core X11 releases outweighs the benefits of doing
     so.  In some cases, this is simply because no one has volunteered to do
     continued maintenance, so if software is listed here that you need, you
-    can contact <EMAIL>xorg@lists.freedesktop.org</EMAIL> to volunteer to
+    can contact <email>xorg@lists.freedesktop.org</email> to volunteer to
     take over maintainership, either inside or outside of the Xorg release
     process.
-    </Para>
-
-    <Para>
-      <VariableList>
-        <VarListEntry>
-	  <Term>Xprint</Term>
-	  <ListItem>
-            <Para>
-	      The Xprint server and extension have been removed in
-	      this release.   Xprint support in a number of client
-	      programs has also been removed.
-            </Para>
-	  </ListItem>
-        </VarListEntry>
-        <VarListEntry>
-	  <Term>Unmaintained extensions</Term>
-	  <ListItem>
-            <Para>
-	      Support has been removed from the X servers for the
-	      following extensions, which were obsolete, not widely
-	      used, or not working:
-	      <ItemizedList>
-		<ListItem><Para>AppGroup</Para></ListItem>
-		<ListItem><Para>EVI</Para></ListItem>
-		<ListItem><Para>MIT-SUNDRY-NONSTANDARD</Para></ListItem>
-		<ListItem><Para>TOG-CUP</Para></ListItem>
-		<ListItem><Para>XTrap</Para></ListItem>
-		<ListItem><Para>XFree86-Misc</Para></ListItem>
-		<ListItem><Para>XEvIE</Para></ListItem>
-	      </ItemizedList>
-            </Para>
-	  </ListItem>
-        </VarListEntry>
-        <VarListEntry>
-	  <Term>Xorg configuration utilities</Term>
-	  <ListItem>
-            <Para>
-	      The <command>xorgcfg</command> GUI and
-	      <command>xorgconfig</command> CLI utilities
-	      have been removed in this release.  See the
-	      <link linkend="config">Configuration File</link> section for
-	      alternative methods of Xorg configuration.
-            </Para>
-	  </ListItem>
-        </VarListEntry>
-        <VarListEntry>
-	  <Term>ioport</Term>
-	  <ListItem>
-            <Para>
-	      The ioport utility and its aliases (inb, inw, inl, outb, outw,
-	      and outl) for manipulating I/O space addresses directly have
-	      been removed in this release.
-            </Para>
-	  </ListItem>
-        </VarListEntry>
-
-      </VariableList>
-    </Para>
-</Sect1>
-
-<Sect1>
-    <Title>Attributions/Acknowledgements/Credits</Title>
+    </para>
+
+
+    <sect2>
+      <title>Future Removals</title>
+
+      <variablelist>
+	<varlistentry>
+	  <term>DGA version 2</term>
+	  <listitem>
+	    <para>
+	      DGA 2.0 is included in &relvers;.  Documentation for the client
+	      libraries can be found in the
+	      <ulink url="XDGA.3.man">XDGA(3)</ulink> man page.  DGA should be
+	      considered deprecated; if you are relying on it, please let us
+	      know what you need it for so we can find better solutions.
+	    </para>
+	  </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <variablelist>
+	<varlistentry>
+	  <term>Input device discovery via HAL</term>
+	  <listitem>
+	    <para>
+	      The Xorg server currently uses the <ulink
+	      url="http://www.freedesktop.org/wiki/Software/hal">HAL
+	      framework</ulink> to discover connected input devices,
+	      receive notification of hotplug events for them, and to
+	      retrieve configuration parameters for them. The HAL
+	      maintainers have deprecated HAL, so the X.Org developers
+	      are investigating alternatives.  As a result, configuration
+	      of input devices via HAL <filename>*.fdi</filename> files
+	      may not be supported in future Xorg server releases.
+	    </para>
+	  </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <variablelist>
+	<varlistentry>
+	  <term>Xsdl server</term>
+	  <listitem>
+	    <para>
+	      The experimental Xsdl server has never been finished or
+	      maintained, and will be removed in future X server releases.
+	    </para>
+	  </listitem>
+        </varlistentry>
+      </variablelist>
+
+    </sect2>
+
+    <sect2>
+      <title>Removed in this Release</title>
+	<para>
+	  <variablelist>
+	    <varlistentry>
+	    <term>Xprint</term>
+	    <listitem>
+	      <para>
+		The Xprint server and extension have been removed in
+		this release.  The libXaw8 variant of the Athena Widgets
+		which added Xprint widgets has been removed from this
+		release.  Xprint support in a number of client programs
+		has also been removed.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term>kdrive servers</term>
+	    <listitem>
+	      <para>
+		The kdrive X servers for vesa, ati, chips, epson, i810,
+		igs, ipaq, itsy, mach64, mga, neomagic, nvidia, pcmcia, pm2,
+		r128, savage, sis300, sis530, smi, trident, trio, ts300, via,
+		and vxworks have been removed in this release.  Most of
+		these have not worked or been maintained in recent releases.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term>Unmaintained extensions</term>
+	    <listitem>
+	      <para>
+		Support has been removed from the X servers for the
+		following extensions, which were obsolete, not widely
+		used, or not working:
+		<itemizedlist>
+		  <listitem><para>AppGroup</para></listitem>
+		  <listitem><para>EVI</para></listitem>
+		  <listitem><para>FontCache</para></listitem>
+		  <listitem><para>MIT-SUNDRY-NONSTANDARD</para></listitem>
+		  <listitem><para>TOG-CUP</para></listitem>
+		  <listitem><para>XTrap</para></listitem>
+		  <listitem><para>XFree86-Misc</para></listitem>
+		  <listitem><para>XEvIE</para></listitem>
+		</itemizedlist>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term>Xorg configuration utilities</term>
+	    <listitem>
+	      <para>
+		The <command>xorgcfg</command> GUI and
+		<command>xorgconfig</command> CLI utilities
+		have been removed in this release.  See the
+		<link linkend="config">Configuration File</link> section for
+		alternative methods of Xorg configuration.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term>ioport</term>
+	    <listitem>
+	      <para>
+		The ioport utility and its aliases (inb, inw, inl, outb, outw,
+		and outl) for manipulating I/O space addresses directly have
+		been removed in this release.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+      </para>
+    </sect2>
+  </sect1>
+
+  <sect1>
+    <title>Attributions/Acknowledgements/Credits</title>
 
     <![ %snapshot [
     <note>
@@ -1146,24 +1322,24 @@ The next section describes what is new in the latest version
     ]]>
 
 
-    <Para>
+    <para>
       This section lists the credits for the X11R&relvers; release.
       For a more detailed breakdown, refer to the ChangeLog file in
       the source tree for each module, the history in <ulink
-	URL="http://cgit.freedesktop.org/xorg/">the xorg product in
+	url="http://cgit.freedesktop.org/xorg/">the xorg product in
 	freedesktop.org's git repositories</ulink> or the
       '<userinput>git log</userinput>' information for individual source files.
-    </Para>
+    </para>
 
-    <Para>
+    <para>
       The X Window System has been a collaborative effort from its inception.
       Our apologies for anyone or organization inadvertently overlooked.
       Many individuals (including major contributors) who worked on X are
       represented by their employers in this list.  If you feel we have left
       anyone out, please let us know.
-    </Para>
+    </para>
 
-    <Para>
+    <para>
       These people contributed in some way to X11R&relvers;:
       <simplelist type='vert' columns='2'>
 	<member>Aaron Plattner</member>
@@ -1228,6 +1404,7 @@ The next section describes what is new in the latest version
 	<member>Christian Koenig</member>
 	<member>Christian Schmitt</member>
 	<member>Christoph Brill</member>
+	<member>Christoph Pfister</member>
 	<member>Coleman Kane</member>
 	<member>Colin Guthrie</member>
 	<member>Colin Harrison</member>
@@ -1264,6 +1441,7 @@ The next section describes what is new in the latest version
 	<member>Eduard Fuchs</member>
 	<member>edward shu</member>
 	<member>Egbert Eich</member>
+	<member>Emilio Jes&uacute;s Gallego Arias</member>
 	<member>Eric Anholt</member>
 	<member>Eric Paris</member>
 	<member>&Eacute;ric Piel</member>
@@ -1276,6 +1454,7 @@ The next section describes what is new in the latest version
 	<member>Fedor P. Goncharov (Fredy)</member>
 	<member>Felix Kuehling</member>
 	<member>Fernando Carrijo</member>
+	<member>Filippo Giunchedi</member>
 	<member>Francis Giraldeau</member>
 	<member>Francisco Jerez</member>
 	<member>Fredrik H&ouml;glund</member>
@@ -1300,12 +1479,14 @@ The next section describes what is new in the latest version
 	<member>Jakob Bornecrantz</member>
 	<member>Jakub Bogusz</member>
 	<member>James Cloos</member>
+	<member>Jamey Sharp</member>
 	<member>Jamie Lentin</member>
 	<member>Jason Vas Dias</member>
 	<member>Jasper Lievisse Adriaanse</member>
 	<member>Jay Cotton</member>
 	<member>Jeff Smith</member>
 	<member>Jens Granseuer</member>
+	<member>Jens Herden</member>
 	<member>Jeremy C. Reed</member>
 	<member>Jeremy Huddleston</member>
 	<member>Jeremy Jay</member>
@@ -1328,6 +1509,7 @@ The next section describes what is new in the latest version
 	<member>Jon TURNEY</member>
 	<member>Jordan Crouse</member>
 	<member>Joseph Adams</member>
+	<member>Josh Triplett</member>
 	<member>Juan RP</member>
 	<member>Julien Cristau</member>
 	<member>Julien Plissonneau Duquene</member>
@@ -1337,7 +1519,9 @@ The next section describes what is new in the latest version
 	<member>Kees Cook</member>
 	<member>Keith Packard</member>
 	<member>Kel Modderman</member>
+	<member>Ken Thomases</member>
 	<member>Kevin E Martin</member>
+	<member>Khaled Hosny</member>
 	<member>Kim Woelders</member>
 	<member>Kristian H&oslash;gsberg</member>
 	<member>Krzysztof Halasa</member>
@@ -1346,6 +1530,7 @@ The next section describes what is new in the latest version
 	<member>Lee Leahu</member>
 	<member>Li Peng</member>
 	<member>Li Shao Hua</member>
+	<member>Lubos Lunak</member>
 	<member>Luc Verhaegen</member>
 	<member>Luk&aacute;&scaron; Hejtm&aacute;nek</member>
 	<member>Lukasz Kurylo</member>
@@ -1356,6 +1541,7 @@ The next section describes what is new in the latest version
 	<member>Magnus Vigerl&ouml;f</member>
 	<member>Manuel Bouyer</member>
 	<member>Marcel Dejean</member>
+	<member>Marcin Baczy&nacute;ski</member>
 	<member>Marcin 'Qrczak' Kowalczyk</member>
 	<member>Mark Kettenis</member>
 	<member>Mark van Doesburg</member>
@@ -1366,32 +1552,38 @@ The next section describes what is new in the latest version
 	<member>Mathieu B&eacute;rard</member>
 	<member>Matt Helsley</member>
 	<member>Matt Turner</member>
+	<member>Matthias Clasen</member>
 	<member>Matthias Hopf</member>
 	<member>Matthieu Herrb</member>
 	<member>Mattia Dongili</member>
 	<member>Maxim Levitsky</member>
 	<member>Micah Dowty</member>
 	<member>Michael Chapman</member>
+	<member>Michael Cree</member>
 	<member>Michael Lorenz</member>
 	<member>Michael Scherer</member>
+	<member>Michael Verret</member>
 	<member>Michael Vogt</member>
 	<member>Michael Witrant</member>
 	<member>Michael Witten</member>
 	<member>Michel D&auml;nzer</member>
 	<member>Mikhail Gusarov</member>
+	<member>Mikko Niskanen</member>
+	<member>Milos Komarcevic</member>
 	<member>Nathael Pajani</member>
 	<member>Nathaniel McCallum</member>
 	<member>Neale Pickett</member>
 	<member>Nicolai H&auml;hnle</member>
 	<member>Nicos Gollan</member>
 	<member>Niels de Vos</member>
+	<member>Nirbheek Chauhan</member>
 	<member>Oliver McFadden</member>
 	<member>Olivier Blin</member>
 	<member>Olivier Fourdan</member>
 	<member>Otavio Salvador</member>
-	<member>Owain G. Ainsworth</member>
-	<member>Owen Taylor</member>
+	<member>Owain Gordon Ainsworth</member>
 	<member>Owen W. Taylor</member>
+	<member>parag</member>
 	<member>Patrick Haller</member>
 	<member>Paul Bender</member>
 	<member>Paul Menzel</member>
@@ -1410,6 +1602,7 @@ The next section describes what is new in the latest version
 	<member>Pierre Ossman</member>
 	<member>Pierre Willenbrock</member>
 	<member>Pierre-Loup A. Griffais</member>
+	<member>Rafael &Aacute;vila de Esp&iacute;ndola</member>
 	<member>RALOVICH, Krist&oacute;f</member>
 	<member>Rami Ylimaki</member>
 	<member>Ramon van der Stelt</member>
@@ -1439,6 +1632,7 @@ The next section describes what is new in the latest version
 	<member>Stuart Bennett</member>
 	<member>Stuart Kreitman</member>
 	<member>Tero Saarni</member>
+	<member>Theppitak Karoonboonyanan</member>
 	<member>Thomas Bodzar</member>
 	<member>Thomas Jaeger</member>
 	<member>Thomas Klausner</member>
@@ -1453,29 +1647,35 @@ The next section describes what is new in the latest version
 	<member>Tomas Janousek</member>
 	<member>Topi Kanerva</member>
 	<member>Tormod Volden</member>
+	<member>vehemens</member>
 	<member>Vincent Mussard</member>
+	<member>walter</member>
 	<member>Werner LEMBERG</member>
+	<member>Will Thompson</member>
 	<member>William Grant</member>
 	<member>Winfried Gr&uuml;newald</member>
 	<member>Wolke Liu</member>
 	<member>Wu Fengguang</member>
+	<member>Xake</member>
 	<member>Xavier Bestel</member>
 	<member>Xiang, Haihao</member>
+	<member>Xue Wei</member>
 	<member>Y.C. Chen</member>
 	<member>Yaakov Selkowitz</member>
 	<member>Yan Li</member>
 	<member>Yang Zhao</member>
 	<member>Yann Droneaud</member>
 	<member>Yannick Heneault</member>
+	<member>Yinan Shen</member>
 	<member>&#50724;&#50976;&#50672;(Yu-yeon Oh)</member>
 	<member>Zdenek Kabelac</member>
 	<member>Zhao Yakui</member>
 	<member>Zhenyu Wang</member>
 	<member>Zou Nan hai</member>
       </simplelist>
-    </Para>
+    </para>
 
-    <Para>
+    <para>
       This product includes software developed by:
       <simplelist type='vert' columns='2'>
 	<member>2d3d Inc.</member>
@@ -1598,6 +1798,7 @@ The next section describes what is new in the latest version
 	<member>Glenn G. Lai</member>
 	<member>GNOME Foundation</member>
 	<member>Go Watanabe</member>
+	<member>Google Summer of Code participants</member>
 	<member>Greg Kroah-Hartman</member>
 	<member>Gregory Mokhin</member>
 	<member>Greg Parker</member>
@@ -1706,16 +1907,19 @@ The next section describes what is new in the latest version
 	<member>Nicolai Haehnle</member>
 	<member>Noah Levitt</member>
 	<member>Nolan Leake</member>
+	<member>Nokia Corporation</member>
 	<member>Novell Inc.</member>
 	<member>Nozomi YTOW</member>
 	<member>NTT Software Corporation</member>
 	<member>Number Nine Computer Corp.</member>
 	<member>Number Nine Visual Technologies</member>
-	<member>NVIDIA Corp.</member>
+	<member>NVIDIA Corporation</member>
 	<member>Oivier Danet</member>
 	<member>Oki Technosystems Laboratory Inc.</member>
+	<member>Olivetti Research Limited</member>
 	<member>OMRON Corporation</member>
 	<member>Open Software Foundation</member>
+	<member>OpenedHand Ltd</member>
 	<member>Orest Zborowski</member>
 	<member>Owen Taylor</member>
 	<member>Pablo Saratxaga</member>
@@ -1821,6 +2025,7 @@ The next section describes what is new in the latest version
 	<member>Unicode Inc.</member>
 	<member>UniSoft Group Limited</member>
 	<member>University of California</member>
+	<member>University of South Australia</member>
 	<member>University of Utah</member>
 	<member>University of Wisconsin</member>
 	<member>UNIX System Laboratories Inc.</member>
@@ -1842,38 +2047,38 @@ The next section describes what is new in the latest version
 	<member>Zack Rusin</member>
 	<member>Zephaniah E. Hull</member>
 	<member>Zhenyu Wang</member>
-      </SimpleList>
-    </Para>
+      </simplelist>
+    </para>
 
-    <Para>
+    <para>
     This product includes software developed by The XFree86 Project, Inc
-    (<ulink URL="http://www.xfree86.org/"></ulink>) and its contributors.
-    </Para>
+    (<ulink url="http://www.xfree86.org/"></ulink>) and its contributors.
+    </para>
 
-    <Para>
+    <para>
     This product includes software that is based in part of the work of the
-    FreeType Team (<ulink URL="http://www.freetype.org/"></ulink>).
-    </Para>
+    FreeType Team (<ulink url="http://www.freetype.org/"></ulink>).
+    </para>
 
-    <Para>
+    <para>
     This product includes software developed by the University of California,
     Berkeley and its contributors.
-    </Para>
+    </para>
 
-    <Para>
+    <para>
     This product includes software developed by Christopher G. Demetriou.
-    </Para>
+    </para>
 
-    <Para>
+    <para>
     This product includes software developed by the NetBSD Foundation, Inc.
-      (<ulink URL="http://www.netbsd.org/"></ulink>) and its contributors.
-    </Para>
+      (<ulink url="http://www.netbsd.org/"></ulink>) and its contributors.
+    </para>
 
-    <Para>
+    <para>
     This product includes software developed by X-Oz Technologies
-      (<ulink URL="http://www.x-oz.com/"></ulink>).
-    </Para>
+      (<ulink url="http://www.x-oz.com/"></ulink>).
+    </para>
 
-</Sect1>
+  </sect1>
 
-</Article>
+</article>