Update sgml usage to be consistent with other docs, and to work correctlyX_4_0_1b-20000816-merge

with the XFree86 doctools.  Fix some typos.

2 files changed, 45 insertions, 44 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
index 2ab86b366..55d2a0d9e 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml
@@ -1,7 +1,8 @@
-<!doctype linuxdoc system>
+<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <!-- Created: Sun Mar 12 13:00:00 2000 by brian@precisioninsight.com -->
 <!-- Revised: Fri May 19 09:36:02 2000 by martin@valinux.com -->
-<!-- $Id: DRIcomp.sgml,v 1.13 2000/08/08 16:59:18 brianp Exp $ -->
 
   <article>
 
@@ -17,10 +18,10 @@
 
     <toc>
 
-    <sect>Preamble
+    <sect>Preamble <p>
+
+      <sect1>Copyright <p>
 
-      <sect1>Copyright
-        <p>
           <bf>Copyright &copy; 2000 by Precision Insight, Inc.,
           Cedar Park, Texas.
           All Rights Reserved.</bf>
@@ -29,8 +30,8 @@
           of this document provided the copyright notice and this permission
           notice are preserved on all copies.</bf>
           
-      <sect1>Trademarks
-        <p>
+      <sect1>Trademarks <p>
+
           OpenGL is a registered trademark and SGI is a trademark of
           Silicon Graphics, Inc.
           Unix is a registered trademark of The Open Group.
@@ -48,8 +49,8 @@
           respective owners.
 
 
-    <sect>Introduction
-      <p>
+    <sect>Introduction <p>
+
         This document describes how to download, compile and install the
         DRI project.
         This information is intended for experienced Linux developers.
@@ -66,9 +67,9 @@
           <item>At least 400MB of free disk space.  More is needed if you want
             to build with debugging information or keep several build trees.
           <item>A fast system.  Using a PIII-550 it takes about 1/2 hour to
-            build everthing.
+            build everything.
           <item>GCC compiler and related tools.
-          <item>ssh (secure shell) for registed developer downloading of the
+          <item>ssh (secure shell) for registered developer downloading of the
             DRI source tree
         </itemize>
 
@@ -106,12 +107,12 @@
         </itemize>
 
 
-    <sect>Kernel preparation
-      <p>
+    <sect>Kernel preparation <p>
+
         You may have to upgrade your Linux kernel in order to use the DRI.
         This is because you need a kernel version which supports AGP.
         Building a new Linux kernel can be difficult for beginners but
-        there are resouces on the Internet to help.
+        there are resources on the Internet to help.
         This document assumes experience with configuring, building and
         installing Linux kernels.
       <p>
@@ -152,7 +153,7 @@
 
       <p>
         Configure the rest of the kernel as required for your system
-        (i.e. ethernet, scsi, etc)
+        (i.e. Ethernet, SCSI, etc)
       <p>
         Exit, saving your kernel configuration.
       <p>
@@ -185,8 +186,8 @@
         Now reboot to use this new kernel.
 
 
-    <sect>Downloading the XFree86/DRI CVS Sources
-      <p>
+    <sect>Downloading the XFree86/DRI CVS Sources <p>
+
         The DRI project is hosted by VA Linux Systems'
         <htmlurl url="http://sourceforge.net/project/?group_id=387"
         name="SourceForge">.
@@ -196,11 +197,11 @@
         The DRI CVS sources may be accessed either anonymously or as a
         registered SourceForge user.
         It's recommended that you become a registered SourceForge user so
-        that you may submit non-annonymous bug reports and can participate
+        that you may submit non-anonymous bug reports and can participate
         in the mailing lists.
 
-      <sect1>Anonymous CVS download:
-      <p>
+      <sect1>Anonymous CVS download: <p>
+
         <enum>
           <item>Create a directory to store the CVS files:
             <p>
@@ -225,8 +226,8 @@
         </enum>
 
 
-      <sect1>Registered CVS download:
-      <p>
+      <sect1>Registered CVS download: <p>
+
         <enum>
           <item>Create a directory to store the CVS files:
             <p>
@@ -257,8 +258,8 @@
         </enum>
 
 
-      <sect1>Updating your CVS sources
-	<p>
+      <sect1>Updating your CVS sources <p>
+
 	  In the future you'll want to occasionally update your local copy of
 	  the DRI source code to get the latest changes.
 	  This can be done with:
@@ -270,8 +271,8 @@
 	  most recent trunc sources to be fetched, not branch sources.
 
 
-    <sect>Mesa
-      <p>
+    <sect>Mesa <p>
+
         Most of the DRI 3D drivers are based on Mesa (the free implmentation
         of the OpenGL API).
         The relevant files from Mesa are already included in the XFree86/DRI
@@ -287,9 +288,9 @@
         The DRI developers will upgrade Mesa when appropriate.
       <p>
 
-    <sect>Compiling the XFree86/DRI tree
-      <sect1>Make a build tree
-        <p>
+    <sect>Compiling the XFree86/DRI tree <p>
+      <sect1>Make a build tree <p>
+
           Rather than placing object files and library files right in the
           source tree, they're instead put into a parallel <em>build</em> tree.
           The build tree is made with the <tt>lndir</tt> command:
@@ -307,7 +308,7 @@
           Advanced users may have several build trees for compiling and
           testing with different options.
 
-      <sect1>Edit the host.def file
+      <sect1>Edit the host.def file <p>
         <p>
           The <tt>~/DRI-CVS/build/xc/config/cf/host.def</tt> file is used
           to configure the XFree86 build process.
@@ -352,8 +353,8 @@
           line in <tt>host.def</tt>.
         <p>
 
-      <sect1>Compile
-        <p>
+      <sect1>Compile <p>
+
           To compile the complete DRI tree:
           <verb>
             cd ~/DRI-CVS/build/xc/
@@ -375,8 +376,8 @@
           It's reported that it does not work with XFree86/DRI.
         <p>
 
-      <sect1>Check for compilation errors
-        <p>
+      <sect1>Check for compilation errors <p>
+
           Using your text editor, examine <tt>World.LOG</tt> for errors
           by searching for the pattern <tt>***</tt>.
         <p>
@@ -412,13 +413,13 @@
           important that the whole tree will build first.
 
 
-    <sect>Installing
-      <p>
+    <sect>Installing <p>
+
         After the DRI tree has been compiled you can install the XFree86
         headers, libraries, programs, etc for testing.
 
-      <sect1>X Installation
-	<p>
+      <sect1>X Installation <p>
+
 	  As mentioned above, the install directory is specified by the
 	  <tt>ProjectRoot</tt> variable in the <tt>host.def</tt> file.
 	  Create that directory now if it doesn't already exist:
@@ -461,8 +462,8 @@
           This will prevent a locale error message from being printed
           when you run Xlib programs.
 
-    <sect>X Server Configuration
-      <p>
+    <sect>X Server Configuration <p>
+
         If your X server is currently running you'll have to stop it
         and return to a virtual terminal.
       <p>
@@ -500,8 +501,8 @@
         </verb>
       <p>
 
-    <sect>X Server Start-up
-      <p>
+    <sect>X Server Start-up <p>
+
         The X server can be started with:
       <p>
         <verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
index 8c0a80702..e9f8c6747 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
@@ -1196,7 +1196,7 @@ Here is a copy of modeplot:
 #
 # Do `modeplot -?' to see the control options.
 #
-# ($Id: VidModes.sgml,v 1.4 2000/03/16 03:37:30 jhartmann Exp $)
+# (Id: video-modes.sgml,v 1.2 1997/08/08 15:07:24 esr Exp $)
 
 # Monitor description. Bandwidth in MHz, horizontal frequencies in kHz
 # and vertical frequencies in Hz.
@@ -1235,7 +1235,7 @@ output can be redirected to a printer.  See gnuplot(1) for  details.
 The modeplot tool was created by Eric S. Raymond <esr@thyrsus.com> based on
 analysis and scratch code by Martin Lottermoser <Martin.Lottermoser@mch.sni.de>
 
-This is modeplot $Revision: 1.4 $
+This is modeplot Revision: 1.2 $
 EOF
 		exit;;
 	esac