Thu Apr 15 03:16:20 PDT 2004

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/doc/sgml

Modified Files:
      Tag: XORG-CURRENT
	BUILD.sgml DECtga.sgml DESIGN.sgml Darwin.sgml I128.sgml 
	Imakefile Install.sgml LICENSE.sgml LynxOS.sgml NetBSD.sgml 
	OS2Notes.sgml OpenBSD.sgml README.sgml RELNOTES.sgml SCO.sgml 
	SiS.sgml Solaris.sgml Status.sgml Versions.sgml 
	XKB-Config.sgml XKB-Enhancing.sgml apm.sgml ati.sgml 
	chips.sgml cyrix.sgml defs.ent dps.sgml fonts.sgml i740.sgml 
	i810.sgml index.pre mouse.sgml newport.sgml r128.sgml 
	rendition.sgml s3virge.sgml 
Removed Files:
      Tag: XORG-CURRENT
	DRI.sgml DRIcomp.sgml isc.sgml 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: BUILD.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5

--- a/BUILD.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.4
+++ b/BUILD.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -1,19 +1,22 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>Building XFree86 from a Source Distribution
-<author>David Dawes, Matthieu Herrb
-<Date>23 February 2004
+<title>Building the X Window System 
+from the 
+X.org Source Distribution
+<author>Jim Gettys and Keith Packard (for X11R6.7)
+<and>David Dawes and Matthieu Herrb (for XFree86 4.4 RC2)
+<Date>6 April 2004
 
 <ident>
-$XdotOrg$
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.13 2003/12/05 15:51:44 dawes Exp $
+$Id: BUILD.sgml,v 1.1.4.3.4.2 2004/04/02 21:47:18 eich Exp $ 
 </ident>
 
 <abstract>
-This document describes how to build XFree86 from the <bf>source</bf>
+This document describes how to build the X Window System from the 
+X.Org monolithic <bf>source</bf>
 distribution and is designed to
 be used in conjunction with the operating system (OS) specific README files.
 </abstract>
@@ -23,112 +26,116 @@
 <p>
 <quote>
 <bf/NOTE:/  Refer to the appropriate OS-specific README file before attempting
-       to build XFree86.  These files often contain additional information that 
+       to build the X distribution.  These files often contain additional information that 
        you need to successfully build for your OS.
 </quote>
 
-
-We highly recommend using gcc to build XFree86, but XFree86 also
+We highly recommend using gcc to build the X distribution, but X also
 generally builds with the native compiler for each OS platform; 
+The build tools known to be required include: gcc, make, C library development
+package, bison, flex, zlib (development package), ncurses (development
+package), fontconfig (development package), expat (development package),
+and Perl.
 
-<sect>How to get the XFree86 &relvers; source
+<sect>How to get the X11R&relvers; distribution source
 <p>
 
-The recommended way of getting the XFree86 &relvers; source is to
-obtain it directly from the XFree86 CVS repository.  There are several
-ways of doing that, and they are described at our <url name="CVS web page"
-url="http://www.xfree86.org/cvs/">  The CVS tag for this release is
+One way of getting the X11R&relvers; source is to
+obtain it directly from the X.Org CVS repository.  There are several
+ways of doing that, and they are described in the CVS section of our <url
+name="wiki"
+url="http://wiki.x.org"> The CVS tag for this release is
 "<tt>&reltag;</tt>".  <![ %fullrel; [ The tag for the maintenance branch
 for this release is "<tt>&relbranchtag;</tt>".]]>
 
 <![ %notsnapshot; [
-Another method of getting the XFree86 &relvers; source is to
-either download the &fullrelvers; source tarballs from the XFree86 ftp
-site<![ %updaterel; [ and the source patch that updates &fullrelvers; to
-&relvers]]>.  The procedure for this is as follows:
+Another method of getting the X11R&relvers; source is to
+either download the &fullrelvers; source tarballs
+sites<![ %updaterel; [ and the source patch that updates &fullrelvers; to
+&relvers]]> from freedesktop.org
+using either ftp or http.  The procedure for this is as follows:
 <itemize>
-  <item>The XFree86 &fullrelvers; source is contained in the files:
+  <item>The X11R&relvers; source is contained in the files:
 
 	<quote><tt>
-	XFree86-&fullrelvers;-src-1.tgz<newline>
-	XFree86-&fullrelvers;-src-2.tgz<newline>
-	XFree86-&fullrelvers;-src-3.tgz<newline>
-	XFree86-&fullrelvers;-src-4.tgz<newline>
-	XFree86-&fullrelvers;-src-5.tgz<newline>
-	XFree86-&fullrelvers;-src-6.tgz<newline>
-	XFree86-&fullrelvers;-src-7.tgz<newline>
+	X11R&fullrelvers;-src1.tar.gz<newline>
+	X11R&fullrelvers;-src2.tar.gz<newline>
+	X11R&fullrelvers;-src3.tar.gz<newline>
+	X11R&fullrelvers;-src4.tar.gz<newline>
+	X11R&fullrelvers;-src5.tar.gz<newline>
+	X11R&fullrelvers;-src6.tar.gz<newline>
+	X11R&fullrelvers;-src7.tar.gz<newline>
 	</tt></quote>
 
 	These can be found at <htmlurl
-	name="ftp://ftp.xfree86.org/pub/XFree86/&fullrelvers;/source/"
-	url="ftp://ftp.xfree86.org/pub/XFree86/&fullrelvers;/source/">
-	and similar locations on XFree86 mirror sites.
-	<tt>XFree86-&fullrelvers;-src-4.tgz</tt> and
-	<tt>XFree86-&fullrelvers;-src-5.tgz</tt> contains the fonts.
-	<tt>XFree86-&fullrelvers;-src-6.tgz</tt> contains the documentation
-	source.  <tt>XFree86-&fullrelvers;-src-7.tgz</tt> contains the
-	hardcopy documentation.  <tt>XFree86-&fullrelvers;-src-1.tgz</tt>,
-	<tt>XFree86-&fullrelvers;-src-2.tgz</tt> and
-	<tt>XFree86-&fullrelvers;-src-3.tgz</tt> contains everything
+	name="ftp://ftp.freedesktop.org/xorg/X11R&relvers;/src/"
+	url="ftp://ftp.freedesktop.org/xorg/X11R&relvers;/src/">
+	or <htmlurl
+	name="http://freedesktop.org/~xorg/X11R&relvers;/src/"
+	url="http://freedesktop.org/~xorg/X11R&relvers;/src/">	
+	and similar locations on X.org mirror sites.
+	<tt>X11R&fullrelvers;-src4.tgz</tt> and
+	<tt>X11R&fullrelvers;-src5.tar.gz</tt> contains the fonts.
+	<tt>X11R&fullrelvers;-src6.tar.gz</tt> contains the documentation
+	source.  <tt>X11R&fullrelvers;-src7.tar.gz</tt> contains the
+	hardcopy documentation.  <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+	<tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+	<tt>X11R&fullrelvers;-src3.tar.gz</tt> contains everything
 	else.  If you don't need the docs or fonts you can get by with
-	only <tt>XFree86-&fullrelvers;-src-1.tgz</tt>,
-	<tt>XFree86-&fullrelvers;-src-2.tgz</tt> and
-	<tt>XFree86-&fullrelvers;-src-3.tgz</tt>.
+	only <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+	<tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+	<tt>X11R&fullrelvers;-src3.tar.gz</tt>.
 
   <item>Extract each of these files by running the following from a directory
 	on a filesystem containing enough space (the full source requires
 	around 305MB, and a similar amount is required in addition to this
 	for the compiled binaries):
 	<quote><tt>
-	gzip -d &lt; XFree86-&fullrelvers;-src-1.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-2.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-3.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-4.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-5.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-6.tgz | tar vxf -<newline>
-	gzip -d &lt; XFree86-&fullrelvers;-src-7.tgz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src1.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src2.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src3.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src4.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src5.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src6.tar.gz | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;-src7.tar.gz | tar vxf -<newline>
 	</tt></quote>
+]]>
 
 <![ %updaterel; [
   <item>A patch relative to &fullrelvers is available at
 	<htmlurl
-	name="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/"
-	url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/">.
-	The patch file is <tt>&fullrelvers;-&relvers;.diff.gz</tt>.
+	name="ftp://ftp.freedesktop.org/xorg/R&relvers;/patches/"
+	url="ftp://ftp.freedesktop.org/xorg/R&relvers;/patches/">.
+	and <htmlurl
+	name="http://freedesktop.org/~xorg/R&relvers;/patches/"
+	url="http://freedesktop.org/~xorg/R&relvers;/patches/">.
+	The patch file is <tt>&fullrelvers;-src&relvers;.diff.gz</tt>.
 
 	The patch can be applied by running:
 	<quote><tt>
 	cd <em>the directory containing the</em> xc <em>directory</em><newline>
-	gzip -d &lt; &fullrelvers;-&relvers;.diff.gz | patch -s -p0 -E 
+	gzip -d &lt; &fullrelvers;-src&relvers;.diff.gz | patch -s -p0 -E 
 	</tt>
 	</quote>
-	Look for special patching instructions in the "How to get XFree86"
+	Look for special patching instructions in the "How to get Xorg"
 	section of the <htmlurl name="README" url="README.html"> for
 	this release.
 ]]>
 </itemize>
 
-<![ %fullrel; [
-Alternatively, if you already have a pristine copy of the XFree86
-&prevfullrelvers; source, you can download patches from
-<htmlurl name="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/"
-url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/patches/"> that will allow
-you to convert it to &relvers;.  Information about which patch files to
-download and how to apply them can be found in the "How to get XFree86"
-section of the <htmlurl name="README" url="README.html"> for this release.
-]]>
-]]>
-
 <![ %snapshot; [
 <p>
-Alternatively you can download the source for the XFree86 &relvers;
+Alternatively you can download the source for the X11R&relvers; &relvers;
 snapshot as a tarball from <htmlurl
-name="ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-&relvers;.tar.bz2"
-url="ftp://ftp.xfree86.org/pub/XFree86/develsnaps/XFree86-&relvers;.tar.bz2">.
+name="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz"
+url="ftp://ftp.freedesktop.org/xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz">
+and  <htmlurl
+name="http://freedesktop.org/~xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz"
+url="http://freedesktop.org/~xorg/R&relvers;/src/X11R&fullrelvers;.tar.gz">.
 This can be extracted by running:
 
 	<quote><tt>
-	bzip2 -d &lt; XFree86-&relvers;.tar.bz2 | tar vxf -<newline>
+	gzip -d &lt; X11R&fullrelvers;.tar.gz | tar vxf -<newline>
 	</tt></quote>
 
 ]]>
@@ -142,7 +149,7 @@
 
 If you do want to make configuration changes, it is recommended that
 you start by going to the <tt>xc/config/cf</tt> directory, and copying
-the file <tt>xf86site.def</tt> to <tt>host.def</tt>.  Then read through
+the file <tt>xorgsite.def</tt> to <tt>host.def</tt>.  Then read through
 the <tt>host.def</tt> file (which is heavily commented), and set your 
 configuration parameters. Usually you can find
 the default settings by checking the <tt>.cf</tt> file(s) relevant to your OS.
@@ -157,25 +164,25 @@
 -->
 
 <![ %notsnapshot; [
-If you are using just the <tt>XFree86-&fullrelvers;-src-1.tgz</tt>,
-<tt>XFree86-&fullrelvers;-src-2.tgz</tt> and
-<tt>XFree86-&fullrelvers;-src-3.tgz</tt> parts of the source dist, you
+If you are using just the <tt>X11R&fullrelvers;-src1.tar.gz</tt>,
+<tt>X11R&fullrelvers;-src2.tar.gz</tt> and
+<tt>X11R&fullrelvers;-src3.tar.gz</tt> parts of the source dist, you
 will need to define <bf>BuildFonts</bf> to <bf>NO</bf>.
 ]]>
 
 <sect>Using a shadow directory of symbolic links for the build
 <p>
 A recommended practice is to use a shadow directory of symbolic links
-to do the build of XFree86 as this allows you to keep the source directory
+to do the build of X11R&relvers; as this allows you to keep the source directory
 unmodified during the build.  It has the following benefits:
 <itemize>
 <item>When you are using CVS to maintain your source tree, 
 the update process is not disturbed by foreign files not under
 CVS's control. 
-<item>It is possible to build XFree86 for several different Operating
+<item>It is possible to build X11R&relvers; for several different Operating
 System or architectures from the same sources, shared by read-only NFS
 mounts.
-<item>It is possible to build XFree86 with different configuration
+<item>It is possible to build X11R&relvers; with different configuration
 options, by putting a real copy of the <tt>host.def</tt> file in
 each build tree and by customizing it separately in each build tree.
 </itemize>
@@ -197,11 +204,11 @@
 path if needed. 
 <p>
 See the <htmlurl name="lndir(1)"
-url="http://www.xfree86.org/&relvers;/lndir.1.html"> manual page for
+url="http://freedesktop.org/~xorg/&relvers;/lndir.1.html"> manual page for
 details.
 </itemize>
 If <tt>lndir</tt> is not already installed on your system, you can
-build it manually from the XFree86 sources by running the following
+build it manually from the X11R&relvers; sources by running the following
 commands: 
 <quote><tt>
 cd xc/config/util<newline>
@@ -227,7 +234,7 @@
 (either the <tt/xc/ directory or the shadow tree created before) and
 run "<tt/make World/" with the <bf/BOOTSTRAPCFLAGS/ 
 set as described in the OS-specific README (if necessary, but most
-systems supported by XFree86 don't need <bf/BOOTSTRAPCFLAGS/).  It is
+systems supported by X11R&relvers; don't need <bf/BOOTSTRAPCFLAGS/).  It is
 advisable to redirect stdout and stderr to <tt/World.Log/ so that you
 can track down problems that might occur during the build.
 <p> 
@@ -248,24 +255,24 @@
 <p>
 When the build is finished, you should check the <tt/World.Log/ file to
 see if there were any problems.  If there weren't any then you can
-install the binaries.  By default the "make World" process will ignore
-errors and build as much as possible.  If there were problems and they
-are not corrected at this stage, the installation process will fail.
+install the binaries.  By default the "make World" process will exit
+at the first error.
 To restart the build process after correcting the problems, just
 run 'make'.  If Imakefiles or part of the build configuration was
 changed as part of correcting the problem, either re-run "make World",
 or run "make Everything".
 
-If you would prefer "make World" to exit at the first error, run it in the
+If you would prefer "make World" to ignore errors and build as much as
+possible, run it in the
 following way instead of the way described above:
 
 for Bourne-like shells:
 <quote><tt>
-make WORLDOPTS= World &gt; World.log 2&gt;&amp;1
+make WORLDOPTS=-k World &gt; World.log 2&gt;&amp;1
 </tt></quote>
 for C-shell variants:
 <quote><tt>
-make WORLDOPTS= World &gt;&amp; World.log
+make WORLDOPTS=-k World &gt;&amp; World.log
 </tt></quote>
 
 To do the install, run "<tt/make install/" and "<tt/make install.man/".
@@ -300,7 +307,7 @@
 
 <sect>Other useful make targets
 <p>There are some other useful targets defined in the top level
-<tt>Makefile</tt> of XFree86: 
+<tt>Makefile</tt> of X11R&relvers;: 
 <itemize>
 <item><bf/Everything/ after a <tt>make World</tt>, <tt>make
 Everything</tt> does everything a <tt>make World</tt> does, except the
@@ -319,11 +326,11 @@
         make
 </verb>
 </tscreen>
-to rebuild the XFree86. 
+to rebuild the X11R&relvers;. 
 
 <item><bf/distclean/ does a full cleaning of the source tree,
 removing all generated files. After a <tt>make distclean</tt>,
-<tt>make World</tt> is the only option to rebuild XFree86. 
+<tt>make World</tt> is the only option to rebuild X11R&relvers;. 
 
 <item><bf/includes/ generates all generated header files and in-tree
 symbolic links  needed by the build. These files are removed by a
@@ -338,7 +345,7 @@
 <item><bf/VerifyOS/ displays the detected operating system version. If
 the numbers shown do not match your system, you probably need to set
 them manually in <tt>host.def</tt> and report the problem to
-<email>XFree86 at XFree86.org</email>.
+<email>xorg at freedesktop.org</email>.
 </itemize>
 
 <!--

Index: DECtga.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/DECtga.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.2
+++ b/DECtga.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,14 +1,14 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 <article>
 
 <title>Information for DEC 21030 Users (aka TGA)
 <author>The XFree86 Project, Inc.
-<date>March 5th, 2000
+<and>Updates for X11R&relvers; by Jim Gettys
+<date>March 25th, 2004
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DECtga.sgml,v 3.8 1999/07/19 13:36:20 dawes Exp $
 </ident>
 
 <toc>
@@ -17,7 +17,8 @@
 <sect>DEC 21030
 <p>
 <itemize>
-<item>The DEC 21030 is supported by XFree86 &relvers;.  The driver is now
+<item>The DEC 21030 is supported by X11R&relvers;.
+The driver is now
 partially accelerated.  The built-in graphics on the Multia is
 supported in 8-plane mode, and PCI cards with 8 or 16 MB framebuffers
 are supported in 24-plane mode.  TGA2 (aka PowerStorm 3D30/4D20)

Index: DESIGN.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/DESIGN.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.3
+++ b/DESIGN.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.4
@@ -1,4 +1,5 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
+ <!ENTITY % defs SYSTEM "defs.ent"> %defs;
  <!-- config file keyword markup -->
  <!ENTITY s.key STARTTAG "bf">
  <!ENTITY e.key ENDTAG "bf">
@@ -27,6 +28,7 @@
 
 <title>XFree86 server 4.x Design (DRAFT)
 <author>The XFree86 Project, Inc
+<and>Updates for X11R&relvers; by Jim Gettys
 <date>19 December 2003
 
 
@@ -79,10 +81,10 @@
 Unless we find major deficiencies in the DIX layer, we should avoid
 making changes there.
 
-<sect>The XF86Config File
+<sect>The xorg.conf File
 <p>
 
-The XF86Config file format is similar to the old format, with the following
+The xorg.conf file format is similar to the old format, with the following
 changes:
 
 <sect1>&k.device; section
@@ -315,7 +317,7 @@
 
    <tag>PreInit</tag>
 
-     Process information from the XF86Config file, determine the
+     Process information from the xorg.conf file, determine the
      full characteristics of the hardware, and determine if a valid
      configuration is present.
    </descrip>
@@ -426,12 +428,12 @@
 &s.code;screenInfo.screen[]&e.code; entry for each screen present.  Here
 is what &s.code;InitOutput()&e.code; does:
 
-<sect1>Parse the XF86Config file
+<sect1>Parse the xorg.conf file
 <p>
 
     This is done at the start of the first server generation only.
 
-    The XF86Config file is read in full, and the resulting information
+    The xorg.conf file is read in full, and the resulting information
     stored in data structures.  None of the parsed information is
     processed at this point.  The parser data structures are opaque to
     the video drivers and to most of the common layer code.
@@ -595,7 +597,7 @@
       &s.code;PROBE_DETECT&e.code; is used if "-configure" or "-probe"
       command line arguments are given and indicates to the
       &s.code;Probe()&e.code; function that it should not configure the
-      bus entities and that no XF86Config information is available.
+      bus entities and that no xorg.conf information is available.
 
       The probe must find the active device sections that match the
       driver by calling &s.code;xf86MatchDevice()&e.code;.  The number
@@ -746,7 +748,7 @@
 
     After the Probe phase is finished, there will be some number of
     &s.code;ScrnInfoRecs&e.code;.  These are then matched with the active
-    &k.screen; sections in the XF86Config, and those not having an active
+    &k.screen; sections in the xorg.conf, and those not having an active
     &k.screen; section are deleted.  If the number of remaining screens
     is 0, &s.code;InitOutput()&e.code; sets
     &s.code;screenInfo.numScreens&e.code; to &s.code;0&e.code; and
@@ -1294,10 +1296,10 @@
 the mode timings reported to the user by &s.code;xf86PrintModes()&e.code;.
 
 <p>
-The function is called once for every mode in the XF86Config Monitor section
+The function is called once for every mode in the xorg.conf Monitor section
 assigned to the screen, with &s.code;flags&e.code; set to
 &s.code;MODECHECK_INITIAL&e.code;.  It is subsequently called for every mode
-in the XF86Config Display subsection assigned to the screen, with
+in the xorg.conf Display subsection assigned to the screen, with
 &s.code;flags&e.code; set to &s.code;MODECHECK_FINAL&e.code;.  In the second
 case, the mode will have successfully passed all other tests.  In addition,
 the &s.code;ScrnInfoRec&e.code;'s &s.code;virtualX&e.code;,
@@ -1866,7 +1868,7 @@
 resources and allocates screens and adds the resources to screens.
 
 Two helper functions are provided for matching device sections in the
-XF86Config file to the devices:
+xorg.conf file to the devices:
 
     <quote><p>
     &s.code;int xf86MatchPciInstances(const char *driverName, int vendorID,
@@ -5271,7 +5273,7 @@
 		<quote>Allow halved clocks</quote>
 		&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code;
 		<quote>Allow missing horizontal sync and/or vertical refresh
-		ranges in the XF86Config Monitor section</quote>
+		ranges in the xorg.conf Monitor section</quote>
 
 		&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code; should only be
 		specified when the driver can ensure all modes it generates
@@ -5291,7 +5293,7 @@
         &s.code;progClock&e.code;
 	<quote>Whether the clock is programmable or not</quote>
         &s.code;monitor&e.code;
-	<quote>Pointer to the applicable XF86Config monitor section</quote>
+	<quote>Pointer to the applicable xorg.conf monitor section</quote>
         &s.code;fdFormat&e.code;
 	<quote>Format of the screen buffer</quote>
         &s.code;videoRam&e.code;
@@ -6731,7 +6733,7 @@
 
     Define the &s.code;AvailableOptions()&e.code; function. The purpose
     of this is to return the available driver options back to the
-    -configure option, so that an XF86Config file can be built and the
+    -configure option, so that an xorg.conf file can be built and the
     user can see which options are available for them to use.
 
 <sect2>PreInit

Index: Darwin.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/Darwin.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.2
+++ b/Darwin.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,41 +1,41 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>XFree86 on Darwin and Mac OS X
+<title>X.org X on Darwin and Mac OS X
 <author>Torrey T. Lyons
 <date>15 December 2003
 
 <ident>
 $XdotOrg$
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Darwin.sgml,v 1.9 2001/12/13 07:09:05 torrey Exp $
 </ident>
 
 <toc>
 
 <sect>Introduction
 <p>
-<htmlurl url="http://www.xfree86.org/" name="XFree86">, a freely
-redistributable open-source implementation of the <htmlurl
-url="http://www.x.org/" name="X Window System">, has been ported to <htmlurl
+<htmlurl url="http://www.freedesktop.org/Software/xorg" name="Xorg">, a freely
+redistributable open-source implementation of the 
+<htmlurl url="http://www.x.org/" name="X Window System">, 
+has been ported to <htmlurl
 url="http://www.opensource.apple.com/projects/darwin/" name="Darwin">
 and <htmlurl url="http://www.apple.com/macosx/" name="Mac OS X">. This
 document is a collection of information for anyone
-running XFree86 on Apple's next generation operating system.
+running Xorg's X server on Apple's next generation operating system.
 
 <p>
-Most of the current work on XFree86 for Darwin and Mac OS&nbsp;X is centered
+Most of the current work on X for Darwin and Mac OS&nbsp;X is centered
 around the <htmlurl url="http://sourceforge.net/projects/xonx/"
 name="XonX project"> at <htmlurl url="http://sourceforge.net"
 name="SourceForge">. If you are interested in up-to-date status, want to
-report a bug, or are interested in working on XFree86 for Darwin, stop by the
+report a bug, or are interested in working on Xorg for Darwin, stop by the
 <htmlurl url="http://sourceforge.net/projects/xonx/" name="XonX project">.
 
 <sect>Hardware Support and Configuration
 <p>
 The X window server for Darwin and Mac OS&nbsp;X provided by the <htmlurl
-url="http://www.XFree86.Org/" name="XFree86 Project, Inc."> is called
+url="http://www.X.Org/" name="X.Org Foundation."> is called
 XDarwin. XDarwin can run in three different modes. On Mac OS&nbsp;X,
 XDarwin runs in parallel with Aqua in full screen or rootless modes.
 These modes are called Quartz modes, named after the Quartz 2D compositing
@@ -57,18 +57,18 @@
 mode as Aqua handles the desktop background.
 
 <p>
-From the console, the Darwin port of XFree86 uses the IOKit for device
-driver loading and discovery, rather than the XFree86 module loader.
-Because of this, the XFree86 configuration file is not used on Darwin
+From the console, the Darwin port of X11R&relvers; uses the IOKit for device
+driver loading and discovery, rather than the X11R&relvers; module loader.
+Because of this, the X11R&relvers; configuration file is not used on Darwin
 or Mac OS&nbsp;X systems. The descriptions found elsewhere of devices
-supported by XFree86 for other operating systems also do not apply.
+supported by X11R&relvers; for other operating systems also do not apply.
 
 <p>
-XFree86 for Darwin or Mac OS&nbsp;X will work with any video card that
+X11R&relvers; for Darwin or Mac OS&nbsp;X will work with any video card that
 you have an IOKit driver for. If you are running Mac OS&nbsp;X, this
 typically means any card that has been shipped by Apple. If a card works
 for you with the Mac OS&nbsp;X GUI, it will work on the same machine with
-XFree86. If you have a pure Darwin installation, you may need to download
+X11R&relvers;. If you have a pure Darwin installation, you may need to download
 additional third-party drivers from
 <htmlurl url="http://developer.apple.com/darwin/"
 name="Apple's Darwin site">. IOKit drivers are typically installed in
@@ -83,23 +83,11 @@
 <sect>Getting Started
 <p>
 Following are instructions for building and running your own copy of
-XFree86. The procedure for getting your X server up and running on
+X11R&relvers;. The procedure for getting your X server up and running on
 Darwin and Mac OS&nbsp;X are very similar. Where there are differences
-I have noted them below. Note that to build XFree86 for yourself on
+I have noted them below. Note that to build X11R&relvers; for yourself on
 Mac OS&nbsp;X, you need to install the Developers' Tools.
 
-<p>
-If you don't feel the need to live on the cutting edge, you can save
-some time and effort by using the precompiled binaries available on
-the XFree86 FTP server at <url
-url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/binaries/">.
-Follow the instructions in the <htmlurl
-url="http://www.xfree86.org/&relvers;/Install.html" name="Install">
-document to install it. This will create three new directory trees,
-<tt>/usr/X11R6</tt>, <tt>/etc/X11</tt> and <tt>/etc/fonts</tt>. On
-Mac OS&nbsp;X the Xquartz.tgz tarball is required in addition to the
-other tarballs required on other platforms. With Mac OS&nbsp;X Quartz
-support, the XDarwin application will be installed in
 <tt>/Applications</tt>.
 
 <p>
@@ -112,14 +100,14 @@
 
 <p>
 The first thing you need to do is to get the source code from the
-XFree86 project.
+X.Org Foundation project.
 
 <itemize>
 <item> Setup CVS: Both Darwin and Mac OS&nbsp;X include CVS (Concurrent
 Versions System), which is an easy way to download and keep up to date
-with open source code released by XFree86 and others. You do have to
+with open source code released by the X.Org Foundation and others. You do have to
 setup CVS properly, however, to tell it where to look. Follow the
-<htmlurl url="http://www.xfree86.org/cvs/" name="XFree86 instructions"> on
+<htmlurl url="http://x.org/" name="X.Org CVS instructions"> on
 how to do this either via ssh or via the cvs pserver.
 
 <item> Now make a directory in some convenient place which will serve
@@ -136,10 +124,10 @@
 
 </itemize>
 
-<sect1> Build XFree86
+<sect1> Build X11R&relvers;
 <p>
 Once you have everything ready it is easy to build and install
-XFree86. From the command line: 
+X11R&relvers;. From the command line: 
 
 <tscreen><verb>
 cd sandbox/xc
@@ -174,14 +162,14 @@
 the shell.
 
 <p>
-In addition you may also want to add the man pages from XFree86 to the list
+In addition you may also want to add the man pages from X11R&relvers; to the list
 of pages to be searched when you are looking for documentation. The X11 man
 pages are located in <tt>/usr/X11R6/man</tt> and the <tt>MANPATH</tt>
 environment variable contains the list of directories to search.
 
 <sect1>Starting the X Server
 <p>
-On Mac OS&nbsp;X, you can run XFree86 from the Darwin
+On Mac OS&nbsp;X, you can run X11R&relvers; from the Darwin
 text console or in parallel with Aqua. To get to the text
 console in Mac OS&nbsp;X you need to logout and type ``&gt;console'' as
 the user name. This will shutdown Core Graphics and
@@ -190,7 +178,7 @@
 ``exec startx''.
 
 <p>
-When you are ready to quit XFree86 type ``exit'' in the main
+When you are ready to quit X11R&relvers; type ``exit'' in the main
 terminal window or quit with the window manager if you have one
 running. Unfortunately in IOKit mode, the X server does not shutdown
 correctly and if you did not start with ``exec startx'', you 
@@ -203,7 +191,7 @@
 window.
 
 <p>
-To start XFree86 in Quartz mode you can launch the XDarwin application
+To start X11R&relvers; in Quartz mode you can launch the XDarwin application
 in the <tt>/Applications</tt> folder, or from the command line type
 ``startx -- -quartz''. By default this will give you a mode picker to
 choose between full screen or rootless mode. You can change the default
@@ -238,7 +226,7 @@
 change some things. There is a lot you can do to control how your windows
 look, how the windows are moved, resized, etc. You will likely want to
 get a fancier window manager than twm, which is included with
-XFree86. The <tt>.xinitrc</tt> file in your home directory controls what
+X11R&relvers;. The <tt>.xinitrc</tt> file in your home directory controls what
 programs are run when you start the X Window System. You can find a sample
 <tt>.xinitrc</tt> file in <tt>/etc/X11/xinit/xinitrc</tt>.  
 

Index: I128.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/I128.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.1
+++ b/I128.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,13 +1,12 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 <title>Information for Number Nine I128 Users
 <author>The XFree86 Project Inc.
-<date>3 November 2000
+<date>25 March 2004
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/I128.sgml,v 1.5 2000/11/06 22:03:28 dawes Exp $
 </ident>
 
 <toc>
@@ -45,7 +44,7 @@
 <p>
 The I128 driver should auto-detect all supported hardware so you needn't 
 have anything other than the Identifier in the Section "Device" of the
-XF86Config file.  When running the XF86Setup or xf86config programs one    
+xorg.conf file.  When running the xorgcfg or xorgconfig programs one    
 merely needs to select an I128 card so that the correct server will be  
 used.  One need not and should not specify a RAMDAC, clockchip or allow 
 the setup program to probe for clocks. The driver will auto-detect the   

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Imakefile	5 Mar 2004 13:40:09 -0000	1.1.4.5
+++ b/Imakefile	15 Apr 2004 10:16:15 -0000	1.1.4.6
@@ -22,16 +22,15 @@
 MANSGMLDEPENDS = mdefs.ent
   INDEXLIST = README.sgml $(RELNOTES) LICENSE.sgml Install.sgml \
 	      BUILD.sgml DESIGN.sgml Versions.sgml \
-	      mouse.sgml fonts.sgml DRI.sgml DRIcomp.sgml dps.sgml \
+	      mouse.sgml fonts.sgml dps.sgml \
 	      XKB-Config.sgml XKB-Enhancing.sgml \
-	      Darwin.sgml isc.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml \
+	      Darwin.sgml LynxOS.sgml NetBSD.sgml OpenBSD.sgml \
 	      OS2Notes.sgml SCO.sgml Solaris.sgml \
               apm.sgml ati.sgml chips.sgml cyrix.sgml DECtga.sgml \
 	      I128.sgml i740.sgml i810.sgml newport.sgml \
 	      r128.sgml rendition.sgml s3virge.sgml SiS.sgml
 
 LinuxDocReadmeTarget(Darwin)
-LinuxDocReadmeTarget(isc)
 LinuxDocReadmeTarget(LynxOS)
 LinuxDocReadmeTarget(NetBSD)
 LinuxDocReadmeTarget(OpenBSD)
@@ -71,15 +70,13 @@
 LinuxDocReadmeTarget(fonts)
 LinuxDocReadmeTarget(mouse)
 LinuxDocTarget(Versions)
-LinuxDocReadmeTarget(DRI)
-LinuxDocReadmeTarget(DRIcomp)
 LinuxDocReadmeTarget(dps)
 LinuxDocReadmeTarget(XKB-Config)
 LinuxDocReadmeTarget(XKB-Enhancing)
 
-SGMLMANDEFS=-D__drivermansuffix__='"$(DRIVERMANSUFFIX)"' \
-	    -D__filemansuffix__='"$(FILEMANSUFFIX)"' \
-	    -D__miscmansuffix__='"$(MISCMANSUFFIX)"'
+SGMLMANDEFS=-D__drivermansuffix__='"'`expr $(DRIVERMANSUFFIX) \: '\(.\)'`'"' \
+	    -D__filemansuffix__='"'`expr $(FILEMANSUFFIX) \: '\(.\)'`'"' \
+	    -D__miscmansuffix__='"'`expr $(MISCMANSUFFIX) \: '\(.\)'`'"'
 
 #if BuildHtmlManPages
 HTMLMANDEFS=-DHTML_MANPAGES

Index: Install.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Install.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.1
+++ b/Install.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,20 +1,21 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 
-<title>Installation Details for XFree86&trade; &relvers;
-<author>The XFree86 Project, Inc
+<title>Installation Details for X11R&relvers;
+<author>The X.org Foundation
 <date>23 February 2004
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
+$Id$  
 </ident>
 
 <abstract>
 
-How to install XFree86.
+How to install the X.Org Foundation's X Window System release version
+X11R&relvers;.
 
 </abstract>
 
@@ -22,502 +23,20 @@
 
 <sect>Introduction
 <p>
-This document contains information about installing the XFree86 binaries
-provided by The XFree86 Project.
-
-<p>
-The XFree86 binaries that we provide for UNIX-like OS's (Linux, the
-BSDs, Solaris, etc) are packaged in a platform-independent gzipped tar
-format (aka "tarballs" identified by the <tt>.tgz</tt> suffix).  Along
-with the binaries we provide a customized version of the GNU tar utility
-called "extract" and an installation script.  We recommend that these
-be used to install the binaries.  (The source for this customized version
-of GNU tar can be found in the XFree86 CVS repository's "utils" module,
-and from our <url name="ftp site"
-url="ftp://ftp.xfree86.org/pub/XFree86/misc/utils-&utilsvers;.tgz">.)
-
-<![ %snapshot [
-<p>
-Note: for snapshot releases like this one, binaries are only available for
-a small number of platforms.
-]]>
-
-
-<sect>Downloading the XFree86 &relvers; binaries
-<p>
-
-<![ %updaterel [
-XFree86 &relvers; is an update release.  The most recent full release
-(&fullrelvers;) needs to be installed before installing this update.
-Information about downloading and installing &fullrelvers; can be found
-in the installation document for that version, which can be found
-on the <url name="XFree86 web site"
-url="http://www.xfree86.org/&fullrelvers/Install.html">.
-]]>
-
-We provide XFree86 &relvers; <![ %updaterel [update ]]>binaries for a range
-of operating systems at our
-<![ %snapshot; [
-<url name="ftp site"
-url="ftp://ftp.xfree86.org/pub/XFree86/snapshots/&relvers/binaries/">
-]]>
-<![ %release; [
-<url name="ftp site"
-url="ftp://ftp.xfree86.org/pub/XFree86/&relvers/binaries/">
-]]>
-and our
-<![ %snapshot; [
-<url name="web site"
-url="http://ftp.xfree86.org/pub/XFree86/snapshots/&relvers/binaries/">.
-]]>
-<![ %release; [
-<url name="web site"
-url="http://ftp.xfree86.org/pub/XFree86/&relvers/binaries/">.
-]]>
-Often during releases our site is heavily loaded.  Instead of downloading
-directly from us we recommend that instead you use one of our mirror
-sites.
-
-<p>
-Our binaries are organized by sub-directories which correspond to each
-of the OS/platforms for which we provide binaries.  First go to the
-sub-directory  that represents your OS platform. In some cases (e.g.,
-Linux) there may be a number of choices depending on the architecture
-or libc version your platform uses.  In all case we recommend that you
-first download the <tt>Xinstall.sh</tt> script, and run it as in the
-following example to find out which binary distribution you should
-download.
-
-<tscreen><verb>
-sh Xinstall.sh -check
-</verb></tscreen>
-
-The output of this utility tells you which is the correct set of binaries
-for you to download.  If you are careful with this step you will save
-yourself a lot time and trouble from NOT downloading an incompatible
-distribution.
-
-<bf>NOTES</bf>:
-
-<itemize>
-  <item>The Xinstall.sh script must be downloaded in binary mode,
-	otherwise it will not  run correctly.  If you get lots of "command
-	not found" messages when you try to run it, then it is most
-	likely because the script was not  downloaded in binary mode.
-	Some web browsers will not  do this for files of that name, so we
-	also have a copy of it called "<tt>Xinstall.bin</tt>", and most
-	browsers should download that correctly.  When downloading it
-	under this name, select "save as" on your browser, and save the
-	file under the name "<tt>Xinstall.sh</tt>".
-
-  <item>The Xinstall.sh script requires some system commands and
-	utilities to function correctly.  While most systems will have
-	these, some Linux installations may not.  If the
-	script fails because of some missing system command, you
-	need to install it before you can continue.  If you do not
-	know how to do this, then we recommend that you obtain this
-	version of XFree86 from your Operating System distributor.
-
-  <item>Always use the version of the Xinstall.sh script that is provided
-	with the release.   Older versions of the script
-	may not install newer releases correctly.
-
-  <item>If the binary distribution reported by the Xinstall.sh script
-	is not present on the XFree86 site, then there are two possibilities:
-	first is that it has not uploaded yet.  This is likeliest
-	possibility if you are looking shortly after the release date.
-	The second possibility is that your target will not be be
-	available at for this release.  This is likeliest possibility
-	if you are looking about two weeks after the release date.
-	Check <url name="here"
-	url="http://www.xfree86.org/&relvers;/UPDATES.html"> for
-	information about updates to our binary distributions, and <url
-	name="here" url="http://www.xfree86.org/&relvers;/ERRATA.html">
-	for errata related to this release.
-
-</itemize>
-
-Assuming that you have run the <tt>Xinstall.sh</tt> script and found the binary
-<![ %updaterel; [update ]]>distribution suitable for your system,
-download the necessary files.  The <![ %fullbinaries [twelve (12)]]><![
-%updaterel [four (4)]]> mandatory files for all installations are listed
-below.  The installer script will complain if you do not have all four (4)
-files in the same directory.
-
-<![ %fullbinaries [
-<quote><verb>
-1.   Xinstall.sh    The installer script
-2.   extract        The utility for extracting tarballs
-3.   Xbin.tgz       X clients/utilities and run-time libraries
-4.   Xlib.tgz       Some data files required at run-time
-5.   Xman.tgz       Manual pages
-6.   Xdoc.tgz       XFree86 documentation
-7.   Xfnts.tgz      Base set of fonts
-8.   Xfenc.tgz      Base set of font encoding data
-9.   Xetc.tgz       Run-time configuration files
-10.  Xvar.tgz       Run-time data
-11.  Xxserv.tgz     XFree86 X server
-12.  Xmod.tgz       XFree86 X server modules
-</verb></quote>
-]]>
-
-<![ %updaterel [
-<quote><verb>
-1.   Xinstall.sh    The installer script
-2.   extract        The utility for extracting tarballs
-3.   Xupdate.tgz    Updated files except X server drivers
-4.   Xdrivers.tgz   Updated X server drivers
-</verb></quote>
-]]>
-
-NOTES:
-<itemize>
-  <item>Some web browsers have a problem downloading the <tt>extract</tt>
-	utility correctly.  If you encounter this problem, download the
-	version called <tt>extract.exe</tt>.  (NOTE: This is not a
-	MS-DOS/Windows       executable.)
-
-<![ %fullbinaries [
-  <item>Some distributions do not require the <tt>Xvar.tgz</tt>
-	tarball.  If it is present in the <tt>binaries</tt> sub-directory
-	for your platform, then it is required.
-]]>
-
-  <item>The Darwin/Mac OS X distribution do not have or require the
-	<![ %fullbinaries [<tt>Xmod.tgz</tt>]]><![ %updaterel
-	[<tt>Xdrivers.tgz</tt>]]> tarball.
-
-  <item>Some distributions may have additional mandatory tarballs.
-	While rare, the installer script will tell you if any are missing.
-
-</itemize>
-
-<![ %fullbinaries [
-The following eleven (11) tarballs are optional.  You should download
-the ones you want to install.
-
-<quote><verb>
-1.   Xdrm.tgz       Source for DRM kernel modules
-2.   Xfsrv.tgz      Font server
-3.   Xnest.tgz      Nested X server
-4.   Xprog.tgz      X header files, config files and compile-time libs
-5.   Xprt.tgz       X Print server
-6.   Xvfb.tgz       Virtual framebuffer X server
-7.   Xf100.tgz      100dpi fonts
-8.   Xfcyr.tgz      Cyrillic fonts
-9.   Xfscl.tgz      Scalable fonts (Speedo, Type1 and TrueType)
-10.  Xhtml.tgz      HTML version of the documentation
-11.  Xps.tgz        PostScript version of the documentation
-12.  Xpdf.tgz       PDF version of the documentation
-13.  Xjdoc.tgz      Documentation in Japanese
-</verb></quote>
-
-NOTES:
-<itemize>
-  <item>Some distributions may have some additional optional tarballs.
-
-</itemize>
-
-If you miss some and want to install them later, go to the
-<ref id="manual-install" name="Manual Installation"> section.
-]]>
-
-<sect>Installing XFree86 &relvers; using the <tt>Xinstall.sh</tt> script
-<p>
-We strongly recommend that our XFree86 &relvers; binaries be installed
-using the <tt>Xinstall.sh</tt> script we provide.
-<![ %updaterel [It is also important that the previous full release
-(&fullrelvers;) is installed before installing this update release.
-Make sure that you use the &relvers; version of the <tt>Xinstall.sh</tt>
-script to install this update.  Older versions may not be able to do it
-correctly.]]>
-There are a lot of
-steps in the manual installation process, and those steps can vary
-according to the platform and hardware setup.  <![ %fullbinaries [There is a description of
-the manual installation process for the most common cases <ref
-id="manual-install" name="below">.]]>
-
-You must login as the super user (root) to run the installer script and 
-place all of the downloaded files into a single directory. 
-Use the cd command to change to the chosen directory and 
-run the installer script as follows:
-
-<tscreen><verb>
-sh Xinstall.sh
-</verb></tscreen>
-
-Answer the prompts as they come up.  If you are missing something that
-is required, the installer may tell you to install it before trying
-again.  If the problem is that you did not download all of mandatory
-files aforementioned, then the installer will tell you which ones are
-missing and ask you to download them before proceeding.
-
-<sect1>Questions the installer may ask
-<p>
-The installer asks some questions that may not have obvious answers.  The
-information here should help you answer them.  In most cases, apart from
-the first question, the default answers should be OK.
-
-If you run the installer from within an X session (the installer checks
-if <tt>$DISPLAY</tt> is set), you will be warned that doing so is not
-a good idea.  Unless you have a good reason for knowing that this will not 
-be a problem, you should exit your X session, including stopping xdm or
-equivalent if it is running, before continuing.  If you ignore this
-warning and run into problems, well, you were warned!
-
-<![ %fullbinaries [If you have an existing X installation, you]]>
-<![ %updaterel [You ]]>
-will be warned that proceeding
-with this installation will overwrite it.  Only those things that are
-part of our standard distribution will be overwritten.  Other X
-applications that you may have installed will not be removed.  Some
-configuration files may be overwritten though, but the installer should
-prompt you before doing so.  As the opening greeting says, it is
-<bf>strongly</bf> recommended that you backup any existing installation
-before proceeding.  If you want your old applications to still be there
-after you've installed, do not do the "backup" by simply renaming
-your old <tt>/usr/X11R6</tt> directory.  It is better to make a copy of
-it, and then install over the top of the original one.  If you run into
-problems and want to revert to the old installation, you can then
-delete the overwritten one and copy the saved version back.
-
-During the first part of the installation over an existing version, the
-script may remove some old files or directories that would get in the
-way of the new installation.  It will list which files/directories have
-been removed.  If none are listed, then none were removed.
-
-<![ %fullbinaries [
-The next step when installing over an existing version is to check for
-existing configuration files.  As of XFree86 version 3.9.18, the run-time
-configuration files are installed by default under <tt>/etc/X11</tt>
-instead of under <tt>/usr/X11R6/lib/X11</tt>.  The installer will move
-the existing ones for you and create the necessary symbolic links.  If
-you do not want to have these configuration files under <tt>/etc/X11</tt>,
-then you should answer "no" when asked about it.  Answering "no" here
-also means that the new configuration files will be installed in the
-old <tt>/usr/X11R6/lib/X11</tt> location.
-
-Note: for the rare systems that do not have symbolic links, this question
-will not be asked.  The default answer is "yes" because that is best
-for most situations.  It is our new default.  It makes it easier to
-share the <tt>/usr/X11R6</tt> directory between multiple hosts, and
-allows it to be mounted read-only.  If you do not need these features,
-then you can safely answer "no" if you do not want them moved.
-
-When installing over an existing version, you will be prompted before
-each set of configuration files is installed.  If you haven't made any
-Customisations to your existing configuration files, then you can safely
-answer "yes" for each of these.  If you have made customisations, you
-can try answering "no".  If you run into problems later, you may need
-to manually merge your customisations into the the new version of the
-configuration files.  The configuration files can all be found in the
-<tt>Xetc.tgz</tt> tarball.  See the <ref id="manual-install" name="section
-below"> about manual installation for information about extracting them
-separately.
-
-After the configuration files have been dealt with, the other mandatory
-components of the binary distribution will be installed.  This should
-proceed without any user intervention.
-
-If you downloaded any of the optional components, the installer will
-ask you about each one before it is installed.  The default answer is
-"yes".  If there are any that you've since decided that you do not want
-to install, answer "no" when prompted.
-
-After that is done, the main part of the installation is complete.  The
-next steps are to tidy up some aspects of the installation.  The first
-of these is to run "<tt>ldconfig</tt>" on systems that require it, so
-that the newly installed shared libraries are accessible.  Then
-the <tt>fonts.dir</tt> files in some directories are updated so that
-the fonts can be accessed correctly.  Next, the installer checks to
-see if your system has a termcap file or terminfo files.  If it finds
-the former, it tells you how you may update the entries in that file.
-If it finds the latter, it asks you if you want it to update them
-for you.
-
-You may be asked if you want to create links for the GL libraries and
-header files.  The OpenGL standard on some platforms (Linux in particular)
-says that these should be installed in the standard system locations
-(<tt>/usr/lib</tt> and <tt>/usr/include</tt>), so the installer offers
-to create the appropriate links.  If you're running Linux, you should
-probably answer yes.  For other platforms it is your choice.  If you
-already have another version of libGL in /usr/lib, answering "yes" will
-remove it and replace it with a link to the version we supply.  The
-installer will show you a listing of any existing versions before asking
-if they should be replaced.
-
-Finally, the installer asks you if you want a link created for the
-<tt>rstart</tt> utility.  On most modern systems the link isn't essential,
-so the default answer is "no".  Answer "yes" if you know that you need
-it.  If you find later that you need it, you can create it easily by
-running:
-
-<tscreen><verb>
-rm -f /usr/bin/rstartd
-ln -s /usr/X11R6/bin/rstartd /usr/bin/rstartd
-</verb></tscreen>
-
-]]>
-
-<sect1>After the installation is complete
-<p>
-The next step is to configure the X server.  That is covered in detail
-in an as-yet unwritten document :-(.  In the meantime, there are three
-ways to create a basic X server configuration file for XFree86 &relvers;.
-One is to run the <tt>xf86config</tt> utility.  Another is to run the
-<tt>xf86cfg</tt> utility.  The third option is to use the new
-<tt>-configure</tt> X server option:
-
-<tscreen><verb>
-XFree86 -configure
-</verb></tscreen>
-
-Note that if you are running Darwin/Mac OS X, there is no step 3 :-).
-You should skip this step, as configuration is not required or possible.
-The X server configuration file is not used on Darwin/Mac OS X.
-
-The X server config file (<tt>XF86Config</tt>) format has changed
-compared to 3.3.x.  Also, its default location is now <tt>/etc/X11</tt>.
-Finally, there is now only one X server for driving video hardware,
-and it is called "<tt>XFree86</tt>".  Once you're satisfied with the
-operation of the new X server, you can safely remove the old
-<tt>XF86_*</tt> and/or <tt>XF98_*</tt> X server binaries from
-<tt>/usr/X11R6/bin</tt>.
-
-After the X server configuration is done, it may be advisable to reboot,
-especially if you run xdm (or equivalent) or the font server (xfs).
-
-<![ %fullbinaries [
-<sect>Installing XFree86 &relvers; manually<label id="manual-install">
-<p>
-This section contains information about manually installing the XFree86
-&relvers; binary distributions.  You should only use this method if you
-know what you're doing.  The information here covers some common cases,
-but not every possible case.  It also may not be complete or up to date.
-Use at your own risk.
-
-Put all of the downloaded files into a single directory (choose some
-temporary location with enough space).  Become the super user (root).
-All of the following commands should be run as root, and they should be
-run from the directory that has all of the downloaded files.  The
-"<tt>extract</tt>" utility should be used to unpack the tarballs.  This
-is a customised version of GNU tar that has the gzip code built-in, and
-which has a different usage when run under the name "extract".  One
-important thing that <tt>extract</tt> does that most versions of tar do
-not do by default is that it unlinks existing files before writing new
-ones.  This is important when installing over an existing version of X.
-If you choose to use some other utility to extract the tarballs, you're
-on your own.
-
-<sect1>A new installation
+At this time, the X.org Foundation is not making binary releases; this
+will likely change in the not-distant future as our tinderbox system
+reaches its full potential.
 <p>
-The simplest case is when there is no existing X installation.  The
-installation procedure for this case is as follows:
-
-<tscreen><verb>
-chmod +x extract
-mkdir /usr/X11R6
-mkdir /etc/X11
-./extract -C /usr/X11R6 X[a-df-uw-z]*.tgz
-./extract -C /usr/X11R6 Xvfb.tgz    # If you are installing Xvfb
-./extract -C /etc/X11 Xetc.tgz
-./extract -C /var Xvar.tgz
-ln -s /etc/X11/app-defaults /usr/X11R6/lib/X11
-ln -s /etc/X11/fs /usr/X11R6/lib/X11
-ln -s /etc/X11/lbxproxy /usr/X11R6/lib/X11
-ln -s /etc/X11/proxymngr /usr/X11R6/lib/X11
-ln -s /etc/X11/rstart /usr/X11R6/lib/X11
-ln -s /etc/X11/twm /usr/X11R6/lib/X11
-ln -s /etc/X11/xdm /usr/X11R6/lib/X11
-ln -s /etc/X11/xinit /usr/X11R6/lib/X11
-ln -s /etc/X11/xsm /usr/X11R6/lib/X11
-ln -s /etc/X11/xserver /usr/X11R6/lib/X11
-chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
-/sbin/ldconfig /usr/X11R6/lib       # For Linux
-/sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-</verb></tscreen>
-
-<sect1>Installing over an old installation
+However, people are already packaging the distribution
+for release in many of the common distributions (e.g. RedHat Fedora,
+SuSE Linux, Debian), and you may wish to work with those distributors
+on their packaged binaries.
 <p>
-If you have an existing installation of X, you should make a backup copy
-of it before installing the new version over the top of it.
-
-Before doing anything else, make sure the <tt>extract</tt> command is
-executable, and also link it to the name "<tt>gnu-tar</tt>" so that it
-can be used as a regular <tt>tar</tt> command:
-
-<tscreen><verb>
-chmod +x extract
-rm -f gnu-tar
-ln extract gnu-tar
-</verb></tscreen>
-
-The first part of the procedure is to move the old run-time config files
-from <tt>/usr/X11R6/lib/X11</tt> to <tt>/etc/X11</tt>.  Create
-<tt>/etc/X11</tt> if it doesn't already exist.  For each of the following
-sub-directories (<tt>app-defaults</tt>, <tt>fs</tt>, <tt>lbxproxy</tt>,
-<tt>proxymngr</tt>, <tt>rstart</tt>, <tt>twm</tt>, <tt>xdm</tt>,
-<tt>xinit</tt>, <tt>xsm</tt>, <tt>xserver</tt>) that you want to move,
-check that there is a sub-directory of this name in
-<tt>/usr/X11R6/lib/X11</tt>.  Create a sub-directory of the same name
-under <tt>/etc/X11</tt>, then copy the files over by running:
-
-<tscreen><verb>
-./gnu-tar -C /usr/X11R6/lib/X11/subdir -c -f - . | \
-  ./gnu-tar -C /etc/X11/subdir -v -x -p -U -f -
-</verb></tscreen>
-
-For each subdirectory that is moved, remove the one under
-<tt>/usr/X11R6/lib/X11</tt> and create a symbolic link to the new
-location:
-
-<tscreen><verb>
-rm -fr /usr/X11R6/lib/X11/subdir
-ln -s /etc/X11/subdir /usr/X11R6/lib/X11
-</verb></tscreen>
-
-For those subdirectories that didn't already exist under
-<tt>/usr/X11R6/lib/X11</tt>, create one under <tt>/etc/X11</tt> and
-create the symbolic link to it:
-
-<tscreen><verb>
-mkdir /etc/X11/subdir
-ln -s /etc/X11/subdir /usr/X11R6/lib/X11
-</verb></tscreen>
-
-Once that is done, extract the config files from the <tt>Xetc.tgz</tt>
-tarball into a temporary directory:
-
-<tscreen><verb>
-mkdir tmpdir
-./extract -C tmpdir Xetc.tgz
-</verb></tscreen>
-
-and then copy each sub-directory over to the installed location:
-
-<tscreen><verb>
-./gnu-tar -C tmpdir/subdir -c -f - . | \
-  ./gnu-tar -C /usr/X11R6/lib/X11/subdir -v -x -p -U -f -
-</verb></tscreen>
-
-If you have customised any config files in your old installation, you
-may want to omit those sub-directories, or copy selected files over by
-hand.
-
-Once that's done, the main part of the installation can be done:
-
-<tscreen><verb>
-./extract -C /usr/X11R6 `pwd`/X[a-df-uw-z]*.tgz
-./extract -C /usr/X11R6 Xvfb.tgz    # If you are installing Xvfb
-./extract -C /var Xvar.tgz
-chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
-/sbin/ldconfig /usr/X11R6/lib       # For Linux
-/sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
-</verb></tscreen>
-
-]]>
-
+In the meanwhile, we recommend building X from source and doing 
+install on top of your running X installation *after* having carefully
+backed up /usr/X11R6 to allow restoration in case of some unanticipated
+problems.
+See the file INSTALL.TXT in the root of the source distribution for
+build and install details.
 
 </article>

Index: LICENSE.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/LICENSE.sgml	26 Feb 2004 19:27:23 -0000	1.1.4.4
+++ b/LICENSE.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -1,16 +1,27 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 <title>Licenses</title>
-<author>The XFree86 Project</author>
-<date>February 2003</date>
+<author>The X.Org Foundation</author>
+<date>March 2004</date>
 
 <ident>
-$XFree86$
+$Id: LICENSE.sgml,v 1.1.4.4.2.1 2004/04/02 21:47:18 eich Exp $
 </ident>
 
+<sect>Introduction
+<p>
+
+The X.org Foundation X Window System distribution is a compilation of code and
+documentation from many sources.  This document is intended primarily
+as a guide to the licenses used in the distribution: you must check
+each file and/or package for precise redistribution
+terms. None-the-less, this summary may be useful to many users.
+No software incorporating the XFree86 1.1 license has been incorporated.
+
+This document is based on the compilation from XFree86.
 <sect>XFree86 License
 <p>
 XFree86 code without an explicit copyright is covered by the following
@@ -105,7 +116,7 @@
 
 <sect1>Berkeley-based copyrights:
 <p>
-<sect2>General
+o<sect2>General
 <p>
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -753,6 +764,61 @@
 solely in object code form, Recipient may replace the words "this file" with
 "this software" in both the first and second sentences.]
 
+<sect1>Bitstream Vera Fonts Copyright
+<p>
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+<p>
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
 <sect1>Bigelow &amp; Holmes Inc and URW++ GmbH Luxi font license
 <p>
 

Index: LynxOS.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/LynxOS.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.2
+++ b/LynxOS.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -3,97 +3,72 @@
 ]>
 
 <article>
-<title>README for XFree86 &relvers; on LynxOS
+<title>README for X11R&relvers; on LynxOS
 <author>Thomas Mueller
 <date>25 February 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LynxOS.sgml,v 3.19 2000/03/03 21:28:08 dawes Exp $
 </ident>
 
 <toc>
 
-<sect>What and Where is XFree86?
+<sect>What and Where is X11R&relvers;?
 <p>
-XFree86 is a port of X11R6.4 that supports several versions of
-Intel-based Unix.  It is derived from X386 1.2, which was the X server
+X11R&relvers; is a port of X11R6.4 that supports several versions of
+Intel-based Unix.  It is derived from XFree86 4.4 rc2 which was 
+derived from X386 1.2, which was the X server
 distributed with X11R5.  This release consists of many new features
 and performance improvements as well as many bug fixes.
 
 See the <htmlurl url="COPYRIGHT.html" name="Copyright Notice">.
 
-The sources for XFree86 &relvers; are available by anonymous ftp from:
-
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;">
-
-Binaries of XFree86 for LynxOS x86 are available from:
-
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/LynxOS"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/LynxOS">
-
-A list of mirror sites is provided by
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/MIRRORS"
-url="ftp://ftp.XFree86.org/pub/XFree86/MIRRORS">
-
-The binaries on the FTP site were built on the latest released LynxOS
-version at the time XFree86 &relvers; was released. In this case it is
-`LynxOS x86 3.0.1'. Because of changes made to the object format they
-don't run on LynxOS versions earlier than 3.0.0.
-
-Building of this XFree86 version has never been tested on LynxOS versions
-earlier than 2.5.1.
+Building of this X11R&relvers; version has never been tested on LynxOS.
 
 This release contains preliminary build support for `LynxOS 3.1.0'.
 Since this OS release was not available long enough for serious testing
 `LynxOS 3.1.0' support has to be considered to be in `alpha state'.
-Initial tests were performed on LynxOS x86 only!
 
-XFree86 &relvers; supports LynxOS on the x86 and on
+X11R&relvers; supports LynxOS on the x86 and on
 the PowerPC platform. X servers are currently available only on the
 x86 platform. The X server may work with some PowerPC platforms
 supported by LynxOS though this has not (yet) been thoroughly tested.
 
-If you need binaries for other platforms than the one on the
-XFree86 FTP server or if you have comments or suggestions about this
-document contact me (<email>tmueller at sysgo.de</email>).
-
-<sect>Installing the Binaries
+<sect>Installing X11R&relvers;
 <p>
 Please refer to the <htmlurl name="Installation Document"
 url="Install.html"> for detailed installation instructions.
 
 It may be necessary to increase the process stack limit in order to
-run XFree86 on your system. Edit <tt>/etc/startab</tt> and reboot your
+run X11R&relvers; on your system. Edit <tt>/etc/startab</tt> and reboot your
 system to make the changes active before you begin the installation.
 
 Also, be sure to include <tt>/usr/X11R6/bin</tt> in your PATH
 environment variable.
 
-Refer to the next section <ref id="running" name="Running XFree86"> for
+Refer to the next section <ref id="running" name="Running X11R&relvers;"> for
 further information on necessary configuration steps before running 
-XFree86 on LynxOS. 
+X11R&relvers; on LynxOS. 
 
-<sect1>Accessing XFree86 manual pages
+<sect1>Accessing X11R&relvers; manual pages
 <p>
 Include <tt>/usr/X11R6/man</tt> in the MANPATH environment variable or add 
 the directory <tt>/usr/X11R6/man</tt> to <tt>/usr/Lib/man.config</tt>
 
 
-<sect>Running XFree86<p><label id="running">
+<sect>Running X11R&relvers;<p><label id="running">
 
 This section describes the changes to the LynxOS environment 
-which may be necessary to successfully run XFree86.
+which may be necessary to successfully run X11R&relvers;.
 
 <!--
 Read <htmlurl url="QuickStart.html" name="Quick-Start Guide 
-to XFree86 Setup"> to learn more about how to configure XFree86 for
+to X11R&relvers; Setup"> to learn more about how to configure X11R&relvers; for
 your hardware.
 -->
 
 <sect1>System tuning<p>
 <sect2>Tunable parameters<p>
-To reasonably run XFree86 you may have to adjust a few system parameters.
+To reasonably run X11R&relvers; you may have to adjust a few system parameters.
 
 On LynxOS 2.5.x and 3.0.x include a line
 <verb>
@@ -118,7 +93,7 @@
 
 If you're using an Intel PentiumPRO or Pentium II (or higher) class
 CPU you might want to install the MTRR device driver. This driver
-enables the XFree86 X server to manipulate the CPU memory type range
+enables the X11R&relvers; X server to manipulate the CPU memory type range
 registers which may improve performance on certain systems.
 
 To install the driver (on LynxOS x86 2.5.0 systems an higher) follow
@@ -149,10 +124,10 @@
      # reboot -N
   </verb></tscreen>
 
-<sect1>Mouse support in XFree86<p>
+<sect1>Mouse support in X11R&relvers;<p>
 
-XFree86 includes support for PnP mice (see also <htmlurl
-url="mouse.html" name="Mouse Support in XFree86">). The current LynxOS
+X11R&relvers; includes support for PnP mice (see also <htmlurl
+url="mouse.html" name="Mouse Support in X11R&relvers;">). The current LynxOS
 TTY device driver doesn't allow the necessary manipulation of the RTS
 line and therefore the support for PnP mice has been disabled for
 LynxOS.
@@ -193,9 +168,9 @@
 
 <sect1>X Server debug diagnostics output and other VT peculiarities<p>
 
-Output made by the XFree86 X on its stdout or stderr will be lost
-after the server switches to graphics mode. The XFree86 &relvers;
-server stores its output in <tt>/usr/adm/XFree86.n.log</tt> (where
+Output made by the X11R&relvers; X on its stdout or stderr will be lost
+after the server switches to graphics mode. The X11R&relvers;
+server stores its output in <tt>/usr/adm/X11R&relvers;.n.log</tt> (where
 <tt>n</tt> is the screen number).
 
 When the X server is running output made to other consoles will be
@@ -204,11 +179,11 @@
 
 
 <!--
-<sect>Using XFree86 with Motif<p>
+<sect>Using X11R&relvers; with Motif<p>
 
   The Motif libraries shipped with LynxOS AT 2.3.0 and 2.4.0 can be
-  used with the XFree86 libraries. Follow the steps outlined below after
-  you have installed XFree86 and LynxOS Motif on your system.
+  used with the X11R&relvers; libraries. Follow the steps outlined below after
+  you have installed X11R&relvers; and LynxOS Motif on your system.
 
 <sect1>Copy Motif files<p>
 
@@ -233,7 +208,7 @@
 
 <sect1>Motif library patch for LynxOS AT 2.3.0<p>
 
-  The XFree86 libraries are compiled with the -mposix compiler option
+  The X11R&relvers; libraries are compiled with the -mposix compiler option
   while the Motif libraries shipped with LynxOS AT 2.3.0 are not. This
   incompatibility will cause Motif <tt>XmFileSelection</tt> widgets to be linked 
   with the wrong (i.e. POSIX) directory routines. To circumvent this 
@@ -266,7 +241,7 @@
 <sect1>Motif config file patch<p>
 
 The file <tt>Motif.tmpl</tt> shipped with LynxOS Motif must be
-modified to work with XFree86. In every reference to
+modified to work with X11R&relvers;. In every reference to
 <tt>UnsharedLibReferences</tt> the first argument must be changed
   <tscreen>
     from
@@ -282,22 +257,22 @@
 
 -->
 
-<sect>Compiling the XFree86 Distribution<p>
+<sect>Compiling the X11R&relvers; Distribution<p>
 
 <!-- out of date
-Before trying to rebuild XFree86 from source read <htmlurl url="BUILD.html"
-name="Building XFree86"> for a detailed description of the build
+Before trying to rebuild X11R&relvers; from source read <htmlurl url="BUILD.html"
+name="Building X11R&relvers;"> for a detailed description of the build
 process. -->The next sections contain LynxOS specific notes with
 respect to the build process.
 
 <sect1>Disk space requirements<p>
 Currently there is no support for shared libraries in the LynxOS
-XFree86 port. A complete binary installation along with manual pages
+X11R&relvers; port. A complete binary installation along with manual pages
 will require approximately 100 MBytes of disk space. To compile
 the system you will need at least 250 MBytes of free disk space.
 
 <sect1>Changes to system environment (LynxOS x86)<p>
-Before compiling the XFree86 distribution you will have to make a
+Before compiling the X11R&relvers; distribution you will have to make a
 few little adjustments to your system:
 
 <itemize>
@@ -338,8 +313,8 @@
 <sect1> make World<p>
 
 <!-- out of date
-Read <htmlurl url="BUILD.html" name="Building XFree86"> before trying
-to rebuild XFree86 from the source distribution.
+Read <htmlurl url="BUILD.html" name="Building X11R&relvers;"> before trying
+to rebuild X11R&relvers; from the source distribution.
 -->
 
 If you have the MTRR device driver installed, add a line
@@ -356,8 +331,8 @@
      make World
   </verb></tscreen>
 
-to compile XFree86. After a few hours (and hopefully a successful
-build of the XFree86 system) you can install the software using
+to compile X11R&relvers;. After a few hours (and hopefully a successful
+build of the X11R&relvers; system) you can install the software using
 
   <tscreen><verb>
      make install
@@ -370,19 +345,19 @@
 deeply nested subdirectories (eg core dumps, hangups). In this case
 update to GNU make version 3.75 or higher.
 
-<sect1>Installing XFree86 manual pages<p><label id="installman">
+<sect1>Installing X11R&relvers; manual pages<p><label id="installman">
 
 LynxOS uses cat-able manual pages, and because a doc preparation
 system is definitely not a vital component of a real-time operating
 system you must first install groff-1.09 (or newer).
 
-XFree86 manual pages may be installed using
+X11R&relvers; manual pages may be installed using
 
   <tscreen><verb>
      make install.man
   </verb></tscreen>
 
-The index and whatis database for the XFree86 manual pages will be
+The index and whatis database for the X11R&relvers; manual pages will be
 created automatically. If you already have a whatis database or index
 file in the destination directories you should perform a sort/uniq
 operation to remove duplicate entries:
@@ -402,7 +377,7 @@
 <!--
 <sect>Building on microSPARC and PowerPC<label id="others"><p>
 
-  XFree86 3.3 compiles on LynxOS microSPARC and on LynxOS PPC as well. On the
+  X11R&relvers; 3.3 compiles on LynxOS microSPARC and on LynxOS PPC as well. On the
   microSPARC there is X server support for the colour frame buffers CG3 and CG6
   while on the PPC there is no X server available at this time. Before you 
   start the build (on versions earlier than 2.5.0) you must create a symbolic

Index: NetBSD.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/NetBSD.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.2
+++ b/NetBSD.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,67 +1,45 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>README for XFree86 &relvers; on NetBSD
+<title>README for X11R&relvers; on NetBSD
 <author>Rich  Murphey,
 David Dawes,
 Marc  Wandschneider,
 Mark  Weaver,
 Matthieu Herrb
-<Date>Last modified on: 9 November 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.67 2003/02/16 17:19:22 dawes Exp $
 </ident>
 <toc>
 
 
-<sect>What and Where is XFree86?
+<sect>What and Where is X11R6.7?
 
 <p>
-XFree86 is an Open Source version of the X Window System that supports
+X11R&relvers; is an Open Source version of the X Window System that supports
 several UNIX(R) and UNIX-like operating systems (such as Linux, the BSDs
 and Solaris x86) on Intel and other platforms.  This version is compatible
-with X11R6.6.
+with X11R6.6, and is based on the XFree86 4.4.0RC2 code base, which,
+in turn was based on the X consortium sample implementation.
 
 See the <htmlurl url="COPYRIGHT.html" name="Copyright Notice">.
 
 <![ %notsnapshot [
-The sources for XFree86 are available by anonymous ftp from:
-
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;">
-
-Binaries for NetBSD 1.5 and later are available from:
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/NetBSD"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/NetBSD">
-
-
-A list of mirror sites is provided by
-<htmlurl name="http://www.xfree86.org/MIRRORS.shtml"
-url="http://www.xfree86.org/MIRRORS.shtml">
-]]>
+The sources for X11R&relvers; are available from:
 
+<htmlurl name="http://wiki.x.org"
+url="http://wiki.x.org">]]>
 
-XFree86 also builds on other NetBSD architectures. See section
+X11R&relvers; also builds on other NetBSD architectures. See section
 <ref id="otherarchs" name="Building on other architectures"> for details.
 
-XFree86 also supports NetBSD on PC98 machines. 
-
-
-<sect>Bug Reports for This Document
-
-<p>
-Send email to <email>herrb at XFree86.Org</email> (Matthieu Herrb) or
-<email>XFree86 at XFree86.org</email> if you have comments or suggestions about
-this file and we'll revise it.
-
 <sect>New OS dependent features
 <p>
 <![ %haverelnotes [
 See the <htmlurl url="RELNOTES.html" name="Release Notes"> for
-non-OS dependent new features in XFree86 &relvers;.
+non-OS dependent new features in X11R&relvers;.
 ]]>
 
 <sect1>New OS dependent features in 4.2.0
@@ -114,7 +92,7 @@
 <itemize>
 <item>Support for <em>silken mouse</em> with the wsmouse protocol has
 been added.
-<item>A new version of the XFree86 Aperture driver which provides MTRR 
+<item>A new version of the Aperture driver which provides MTRR 
 support is included.
 </itemize>
 
@@ -128,7 +106,7 @@
 <sect>Configuring X for Your Hardware
 
 <p>
-The <tt>/etc/X11/XF86Config</tt> file tells the X server what kind of
+The <tt>/etc/X11/xorg.conf</tt> file tells the X server what kind of
 monitor, 
 video card and mouse you have.  You <em/must/ create it to tell the
 server what specific hardware you have.
@@ -141,30 +119,24 @@
 </itemize>
 
 
-The recommended way to generate an <tt/XF86Config/ file is to use the
-<tt/xf86cfg/ utility.  The xf86config text utility is still there
-for the (few) cases where xf86cfg can't be used. Also, there is a
-sample file installed as <tt>/usr/X11R6/lib/X11/XF86Config.eg</tt>,
-which can be used as a starting point.
-
-For details about the <tt/XF86Config/ file format, refer to the
-<em><htmlurl name="XF86Config(5)" url="XF86Config.5.html"></em> manual page.
+For details about the <tt/xorg.conf/ file format, refer to the
+<em><htmlurl name="xorg.conf(5)" url="xorg.conf.5.html"></em> manual page.
 
-Once you've set up a XF86Config file, you can fine tune the video
+Once you've set up a xorg.conf file, you can fine tune the video
 modes with the <tt>xvidtune</tt> utility. 
 
 <sect1>About mouse configuration
 
 <p>
-XFree86 &relvers; has support for the mouse driver included in
+X11R&relvers; has support for the mouse driver included in
 the <bf/wscons/ console driver introduced by NetBSD 1.4. Specify
 ``<tt/wsmouse/'' as the protocol and ``<tt>/dev/wsmouse0</tt>'' as the 
-device in <tt>/etc/X11/XF86Config</tt> if you're using NetBSD 1.4 or later
+device in <tt>/etc/X11/xorg.conf</tt> if you're using NetBSD 1.4 or later
 with a PS/2 mouse.
 <p>
 For older releases, the NetBSD <bf/pms/ mouse driver handles PS/2 style
 mice as Busmouse. Specify the protocol as ``<tt/busmouse/'' in the
-mouse section of your <tt/XF86Config/ file if you're using a PS/2
+mouse section of your <tt/xorg.conf/ file if you're using a PS/2
 mouse with NetBSD 1.3 or former releases.
 <p>
 Only standard PS/2 mice are supported by this driver. Newest PS/2
@@ -173,7 +145,7 @@
 1.3 and former releases. 
 <p>
 See <htmlurl url="mouse.html" name="README.mouse">  for general
-instruction on mouse configuration in XFree86.
+instruction on mouse configuration.
 
 <sect>Running X
 
@@ -231,8 +203,6 @@
 (Thanks to Mason Loring Bliss
 <tt>&lt;mason at acheron.middleboro.ma.us&gt;</tt> for this explanation)
 <p>
-Note that the binary distributions of XFree86 for NetBSD don't include
-support for the XDM-AUTHORIZATION-1 protocol. 
 
 <sect>Kernel Support for X
 
@@ -277,7 +247,7 @@
 <p>
 <label id="wscons">
 Wscons is the current console driver, included in NetBSD 1.4 and
-later. For now, XFree86 supports wscons using the pcvt compatibility
+later. For now, X supports wscons using the pcvt compatibility
 mode, so be sure to have the lines:
 <tscreen><verb>
 options         WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
@@ -293,11 +263,12 @@
 <p>
 By default NetBSD include the BSD 4.4 kernel security
 feature that disable access to the <tt>/dev/mem</tt> device when in
-multi-users mode. But XFree86 servers can take advantage (or require)
+multi-users mode. But X.org foundation X servers can take advantage 
+(or require)
 linear access to the display memory.
 
-Most XFree86 &relvers; card drivers require linear memory access.
-There are two ways to allow XFree86 to access linear memory:
+Most X11R&relvers; card drivers require linear memory access.
+There are two ways to allow X to access linear memory:
 
 The first way is to disable the kernel security feature by adding
 ``<tt/option INSECURE/'' in the kernel configuration file and build a new
@@ -306,7 +277,7 @@
 
 The second way is to install the aperture driver, included in source form in
 <tt>xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar</tt> in the
-XFree86 &relvers; source distribution. Unpack it in a new directory of your 
+X11R&relvers; source distribution. Unpack it in a new directory of your 
 choice by running:
 <tscreen><verb>
   sh apNetBSD.shar
@@ -322,7 +293,7 @@
 </verb></tscreen> 
 and set ``<tt/lkm=YES/'' in <tt>/etc/rc.conf</tt>
 
-Reboot your system. XFree86 will auto-detect the aperture
+Reboot your system. X will auto-detect the aperture
 driver if available.
 
 <bf/Warning 1:/ if you boot another kernel than <tt>/netbsd</tt>,
@@ -343,7 +314,7 @@
 
 <sect1>MIT-SHM
 <p>
-NetBSD 1.0 and later supports System V shared memory. If XFree86 
+NetBSD 1.0 and later supports System V shared memory. If X
 detects this support in your kernel, it will support the MIT-SHM
 extension.
 
@@ -359,7 +330,7 @@
  
     to your kernel config file.
 
-<sect> Rebuilding the XFree86 Distribution
+<sect> Rebuilding the X Distribution
 
 <p>
 You should configure the distribution by editing
@@ -377,23 +348,23 @@
 <tscreen><verb>
 #define HasPerl YES
 </verb></tscreen>
-in <tt>xc/config/cf/host.def</tt> before rebuilding XFree86. 
+in <tt>xc/config/cf/host.def</tt> before rebuilding X. 
 
 <sect1>Aperture driver
 <p>
-To build the XFree86 server with the Aperture driver enabled, you
+To build the X server with the Aperture driver enabled, you
 should unpack <tt>apNetBSD.shar</tt> and install it first. 
 
 Then edit <tt>xc/config/cf/host.def</tt> and add the line
 <tscreen><verb>
 #define HasNetBSDApertureDriver    YES
 </verb></tscreen>
-to it before rebuilding XFree86.
+to it before rebuilding X.
 
 <sect1>Console drivers<label id="console-drivers">
 
 <p>
-XFree86 has a configuration option to select the console
+X has a configuration option to select the console
 drivers to use in <tt/host.def/:
 <itemize>
 <item> if you're using pccons put:
@@ -427,7 +398,7 @@
 
 <p> 
 Note that the NetBSD project has now its own source tree, based on the
-XFree86 source tree, with some local modifications. You may want to
+X source tree, with some local modifications. You may want to
 start with this tree to rebuild from sources. 
 The NetBSD xsrc source tree is available at: 
 <htmlurl url="ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/"

Index: OS2Notes.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/OS2Notes.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.1
+++ b/OS2Notes.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,19 +1,20 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <article>
 
-<title>Notes on Rebuilding XFree86/OS2 from Scratch
+<title>Notes on Rebuilding X11R&relvers;/OS2 from Scratch
 <author>Holger Veit
 <date>Last modified March 8th, 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OS2Notes.sgml,v 1.1 2001/06/04 13:50:15 dawes Exp $
 </ident>
 
 <toc>
 
 <sect>Preface
 <p>
-X11 and XFree86 were initially developed on Unix-based systems. Usually
+X11 was initially developed on Unix-based systems. Usually
 Unix systems provide a rich number of tools and utilities to get certain
 things done. Under OS/2, these tools are not installed, but ports are
 available which are sometimes functionally equivalent to Unix utilities
@@ -24,19 +25,11 @@
 Please also read <htmlurl name=README.OS2 url=OS2.html> for end-user
 information, and set at least the environment variables described there.
 <p>
-At the current time, the most recent version available is XFree86-4.0.
+At the current time, the most recent version available is X11R&relvers;
 This is a full and unrestricted version which comes with complete source 
 code. 4.0 is a highly experimental release, so many features that might
 have worked in earlier versions, may now no longer work, or work differently.
-Be aware that for OS/2, XFree86-4.0 is considered to be alpha software.
-
-If you want to join the XFree86 developer team, e.g. to add support for
-certain hardware, please send a request to <email>BOD at XFree86.org</email>.
-Please think about such a step carefully before, though, since much work
-is involved. Please use the XFree86-4.0 source code as a test example
-how to compile the system. The ability to manage that is a basic
-requirement for becoming a developer.
-
+Be aware that for OS/2, X11R&relvers; is considered to be alpha software.
 
 <sect>Tools required
 <p>
@@ -71,9 +64,9 @@
 critical is only EMX/gcc and GNU make. Note that the second GCC implementation
 which might still be available from some archives is NOT compatible.
 
-Furthermore, you need the XFree86 sources. These are available from 
-the common XFree86 repositories. Look into a directory which is 
-often named /pub/XFree86/4.0/source.
+Furthermore, you need the X11R&relvers; sources. These are available from 
+the common X.org repositories. Look into a directory which is 
+often named /pub/R&relvers;.
 
 <sect>Compiling and Installing
 <p>
@@ -98,7 +91,7 @@
       in the <tt>&bsol;x11</tt> directory. At the end you will usually see the
       irritating, but non-fatal message "gzip: stdout Broken pipe". Ignore it.
 <item>After that, is is likely necessary to apply some patches, either from
-      the XConsortium or from the XFree86 project. Before you do this, enter
+      the X.Org Foundation. Before you do this, enter
       <verb>
       chmod -R a+rw &bsol;x11&bsol;xc
       </verb> 
@@ -137,18 +130,18 @@
       <verb>
       find &bsol;x11 -name *.orig -print -exec rm {} ;
       </verb>
-<item>Go to the <tt>xc/config/cf</tt> directory and edit the <tt>xf86site.def</tt>
+<item>Go to the <tt>xc/config/cf</tt> directory and edit the <tt>xorgsite.def</tt>
       file to match your requirements (you probably don't want to compile
       all X servers). Certain changes must be set to the following values:
       <itemize>
-      <item>Disable if not already done any PC98 server; PC98 (Japanese XFree86)
+      <item>Disable if not already done any PC98 server; PC98 (Japanese X11R&relvers;)
             does not work yet. Porters from Japan are welcome!
       <item><tt>&num;define WacomSupport            NO
             &num;define ElographicsSupport      NO</tt>
             Both options are not yet supported.
       <item>Tcl* and Tk* don't need to be set explicitly. Reasonable defaults
             are in the other config files, provided you have a complete 
-            XFree86/OS2 binary tree with the tcl/tk runtime support installed.
+            X11R&relvers;/OS2 binary tree with the tcl/tk runtime support installed.
       <item><tt>&num;define BuildDynamicLoading   NO</tt>
 	    This does not work.
       </itemize>
@@ -161,13 +154,13 @@
       compressed fonts are corrupt.
 <item>Set the environment variable <tt/X11ROOT/ to something different than
       it is; otherwise the installation process will overwrite your
-      original XFree86/OS2 installation. If you have not set this variable,
+      original X11R&relvers;/OS2 installation. If you have not set this variable,
       go back to the prefix section of this document: you have forgotten
       something.
 <item>Copy the file <tt>xc/programs/Xserver/hw/xfree86/etc/bindist/OS2/host.def.os2</tt>
       to the location <tt>xc/config/cf/host.def</tt>. Use this file to do
       any specific modifications to imake variables, rather than editing
-      the file xfree86.cf, imake.tmpl, or os2.cf directly.
+      the file xorg.cf, imake.tmpl, or os2.cf directly.
 <item>Copy the file <tt>xc/config/util/buildos2.cmd</tt> into the <tt/xc/
       directory. If this is a second or later attempt, you might need to
       copy the saved toplevel Makefile.os2 back to Makefile.
@@ -188,15 +181,11 @@
 <enum>
 <item>The xdm and linkkit directories will fail in compile and installation.
       This is no problem and has no effect on the rest of the system.
-<item>The imake.exe which is installed in <tt/&bsol;XFree86&bsol;bin/ is usually defective.
+<item>The imake.exe which is installed in <tt/&bsol;X11R&relvers;&bsol;bin/ is usually defective.
       The one which was built initially and installed in the root directory
       of the drive where you have the source tree is okay. So simply copy
-      this <tt/&bsol;imake.exe/ to the <tt/&bsol;XFree86&bsol;bin/ directory 
+      this <tt/&bsol;imake.exe/ to the <tt/&bsol;X11R&relvers;&bsol;bin/ directory 
       manually. Some day this might be fixed.
-<item><tt/XF86Setup/ is not ported yet and won't work with the tcl/tk port
-      available for XFree86/OS2. My idea was to replace this by some native
-      installation tool, which I didn't find the time to do yet. Feel free
-      to spend a bit of time to play with XF86Setup if you like.
 </enum>
 </enum>
 

Index: OpenBSD.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/OpenBSD.sgml	5 Mar 2004 13:40:09 -0000	1.1.4.4
+++ b/OpenBSD.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -1,64 +1,53 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>README for XFree86 &relvers; on OpenBSD
+<title>README for X11R&relvers; on OpenBSD
 <author>
 Matthieu Herrb
-<Date>Last modified on: 9 December 2003
+<Date>Last modified on: 9 December 2003; updated 25 March 2004 by Jim Gettys 
+for X11R&relvers;
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/OpenBSD.sgml,v 1.32 2003/12/12 03:25:05 dawes Exp $
 </ident>
 
 <toc>
 
 
-<sect>What and Where is XFree86?
+<sect>What and Where is X11R&relvers;?
 
 <p>
-XFree86 is an Open Source version of the X Window System that supports
+The X.org Foundation X11R&relvers; is an Open Source version of the X Window System that supports
 several UNIX(R) and UNIX-like operating systems (such as Linux, the BSDs
-and Solaris x86) on Intel and other platforms.  This version is compatible
-with X11R6.6.
+and Solaris x86) on Intel and other platforms.
 
 See the <htmlurl url="COPYRIGHT.html" name="Copyright Notice">.
 
 <![ %notsnapshot [
-The sources for XFree86 &relvers; are available by anonymous ftp from:
-
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;">
-
-Binaries for OpenBSD/i386 3.4 and later are available from:
-
-<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/OpenBSD"
-url="ftp://ftp.XFree86.org/pub/XFree86/&relvers;/binaries/OpenBSD">
+The sources for X11R&relvers; are available from
 
-A list of mirror sites is provided by
-<htmlurl name="http://www.xfree86.org/MIRRORS.shtml"
-url="http://www.xfree86.org/MIRRORS.shtml">
-]]>
+<htmlurl name="http://wiki.x.org"
+url="http://wiki.x.org">]]>
 
 <p>
 
-XFree86 also builds on other OpenBSD architectures. See section
+X11R&relvers; also builds on other OpenBSD architectures. See section
 <ref id="otherarch" name="Building on other architectures"> for details.
 
 
 <sect>Bug Reports for This Document
 
 <p>
-Use the XFree86 Bugzilla at <url url="http://bugs.xfree86.org"> 
-to submit comments or suggestions about this file.
+Use the X.org Bugzilla at <url url="http://bugzilla.freedesktop.org"> 
+to submit comments or suggestions about this file, using the xorg product.
 
 <sect>New OS dependent features
 <p>
 See the <htmlurl url="RELNOTES.html" name="Release Notes"> for
-non-OS dependent new features in XFree86 &relvers;.
+non-OS dependent new features in X11R&relvers;.
 
-<sect1>New OS related features in 4.4
+<sect1>New OS related features
 <p>
 <itemize>
 <item>The IPv6 support is enabled on OpenBSD, but XDMCP over IPv6 is
@@ -150,7 +139,7 @@
 
 <sect>Configuring X for Your Hardware
 <p>
-The <tt>/etc/X11/XF86Config</tt> file tells the X server what kind of
+The <tt>/etc/X11/xorg.conf</tt> file tells the X server what kind of
 monitor, 
 video card and mouse you have.  You <em/must/ create it to tell the
 server what specific hardware you have.
@@ -162,30 +151,30 @@
 <item>Your monitor's sync frequencies.
 </itemize>
 
-The recommended way to generate an <tt/XF86Config/ file is to use the
-<tt/xf86cfg/ utility.  The xf86config text utility is still there
-for the (few) cases where xf86cfg can't be used. Also, there is a
-sample file installed as <tt>/usr/X11R6/lib/X11/XF86Config.eg</tt>,
+The recommended way to generate an <tt/xorg.conf/ file is to use the
+<tt/xorgcfg/ utility.  The xorgconfig text utility is still there
+for the (few) cases where xorgcfg can't be used. Also, there is a
+sample file installed as <tt>/usr/X11R6/lib/X11/xorg.conf.eg</tt>,
 which can be used as a starting point.
 
 
-For details about the <tt/XF86Config/ file format, refer to the
-<em><htmlurl name="XF86Config(5)" url="XF86Config.5.html"></em> manual page.
+For details about the <tt/xorg.conf/ file format, refer to the
+<em><htmlurl name="xorg.conf(5)" url="xorg.conf.5.html"></em> manual page.
 
-Once you've set up a XF86Config file, you can fine tune the video
+Once you've set up a xorg.conf file, you can fine tune the video
 modes with the <tt>xvidtune</tt> utility. 
 
 <sect1>About mouse configuration
 
 <p>
-XFree86 &relvers; has support for the mouse driver included in
+X11R&relvers; has support for the mouse driver included in
 the new <bf/wscons/ console driver introduced by OpenBSD-2.9. 
 Specify ``<tt/wsmouse/'' as the protocol and
-``<tt>/dev/wsmouse0</tt>'' as the  device in <tt>/etc/X11/XF86Config</tt>
+``<tt>/dev/wsmouse0</tt>'' as the  device in <tt>/etc/X11/xorg.conf</tt>
 if you're using OpenBSD-2.9 or later with a PS/2 or USB mouse.
 <p>
 See <htmlurl url="mouse.html" name="README.mouse">  for general
-instruction on mouse configuration in XFree86.
+instruction on mouse configuration.
 
 
 <sect>Running X
@@ -208,12 +197,6 @@
 </verb></tscreen>
 in <tt>/etc/rc.conf</tt>. 
 
-<p>
-Note that the binary distributions of XFree86 for OpenBSD on
-ftp.xfree86.org and its mirrors don't include
-support for the XDM-AUTHORIZATION-1 protocol, because of the US export 
-rules. 
-
 <sect1>Running X without the display manager
 <p>
 The easiest way for new users to start X windows is to type: ``<tt/startx
@@ -247,7 +230,7 @@
 <p>
 By default OpenBSD includes the BSD 4.4 kernel security
 feature that disables access to the <tt>/dev/mem</tt> device when in
-multi-user mode. But the XFree86 server requires
+multi-user mode. But the X server requires
 linear access to the display memory in most cases.
 
 OpenBSD requires the aperture driver to be enabled for all X
@@ -276,11 +259,11 @@
 
 <sect1>MIT-SHM
 <p>
-OpenBSD supports System V shared memory. If XFree86 
+OpenBSD supports System V shared memory. If X
 detects this support in your kernel, it will support the MIT-SHM
 extension.
 
-<sect> Rebuilding the XFree86 Distribution
+<sect> Rebuilding the X Distribution
 
 You should configure the distribution by editing
 <tt>xc/config/cf/host.def</tt>  before compiling.  To compile the
@@ -288,8 +271,8 @@
 
 
 <p> 
-Note that OpenBSD project now has its own source tree, based on
-the XFree86 source tree, with some local modifications. You may want
+Note that OpenBSD project now has its own source tree, 
+with some local modifications. You may want
 to start with this tree to rebuild from sources.  The OpenBSD XF4
 source tree is available by anoncvs from all OpenBSD anoncvs
 servers. See <htmlurl url="http://www.openbsd.org/anoncvs.html"
@@ -298,10 +281,10 @@
 <label id="otherarch">
 
 <p>
-XFree86  also compiles on other OpenBSD architectures. 
-<sect1>XFree86 on OpenBSD/alpha
+X11R&relvers;  also compiles on other OpenBSD architectures. 
+<sect1>X11R&relvers; on OpenBSD/alpha
 <p>
-The XFree86 server is known to work on some VGA cards in alpha
+The X server is known to work on some VGA cards in alpha
 machines that support BWX I/O, with OpenBSD 3.2 and higher. 
 <p>
 The following cards have been successfully tested for now:
@@ -313,37 +296,37 @@
 <item>Matrox MGA 2064 (8, 16 and 24 bits depth)
 </itemize>
 <p>
-Note that this version of XFree86 doesn't work on TGA cards. The
+Note that this version of doesn't work on TGA cards. The
 version shipped with OpenBSD 3.1 and higher includes an OS-specific
 driver <em/wsfb/ that is used to support TGA cards. 
 
-<sect1>XFree86 on OpenBSD/macppc
+<sect1>X11R&relvers; on OpenBSD/macppc
 <p>
-The XFree86 server is currently known to work on the G4 Macs and new
+The X server is currently known to work on the G4 Macs and new
 iBooks with ATI Rage 128 cards running OpenBSD 3.0 or later.
 Other machines are more or less untested. Earlier OpenBSD versions
 lack some kernel support for it.
 <p>
-Use xf86config to build a /etc/X11/XF86Config file before starting 
+Use xorgconfig to build a /etc/X11/xorg.conf file before starting 
 the server for the first time. 
 <p>
 For the Titanium Powerbook G4, you can try the following mode line in
-<tt>/etc/X11/XF86Config</tt> to match the flat panel resolution:
+<tt>/etc/X11/xorg.conf</tt> to match the flat panel resolution:
 
 <tscreen><verb>
 Modeline "1152x768" 64.995 1152 1213 1349 1472  768 771 777 806 -HSync -VSync
 </verb></tscreen>
 
-<sect1>XFree86 on OpenBSD/sparc
+<sect1>OpenBSD/sparc
 <p>
 OpenBSD 3.2 on sparc switched to the wscons device driver and now uses
-the OS specific <em/wsfb/ driver in the XFree86 server. This driver is
-not included in XFree86 4.3. Please use the version shipped with
+the OS specific <em/wsfb/ driver in the X server. This driver is
+not included in X11R&relvers;. Please use the version shipped with
 OpenBSD instead. 
 
-<sect1>XFree86 on OpenBSD/sparc64
+<sect1>OpenBSD/sparc64
 <p>
-This version of XFree68 only has support for X clients on
+This version only has support for X clients on
 OpenBSD/sparc64. Note that the version shipped with OpenBSD also has
 support for the X server on both SBus and PCI based machines. 
 
@@ -360,7 +343,7 @@
 
 <sect> Thanks
 <p>
-Many thanks to all people who contributed to make XFree86 work on
+Many thanks to all people who contributed to make X11R&relvers; work on
 *BSD, in particular:
 <bf/David Dawes/,
 <bf/Todd Fries/,

Index: README.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -d -r1.1.4.6 -r1.1.4.7
--- a/README.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.6
+++ b/README.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.7
@@ -1,43 +1,46 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 <!ENTITY % onediff 'IGNORE'>	 <!-- patch is a single diff file -->
 <!ENTITY % twodiffs 'IGNORE'>	 <!-- patch is split into two diff files -->
 <!ENTITY % threediffs 'IGNORE'> <!-- patch is split into three diff files -->
-<!ENTITY % fourdiffs 'INCLUDE'> <!-- patch is split into four diff files -->
-<!ENTITY % difftar 'INCLUDE'> <!-- patch also contains a tarball -->
-<!ENTITY % removefiles 'INCLUDE'> <!-- patching requires removing some files -->
+<!ENTITY % fourdiffs 'IGNORE'> <!-- patch is split into four diff files -->
+<!ENTITY % difftar 'IGNORE'> <!-- patch also contains a tarball -->
+<!ENTITY % removefiles 'IGNORE'> <!-- patching requires removing some files -->
 ]>
 
 
 <article>
 
-<title>README for XFree86&tm; &relvers;
-<author>The XFree86 Project, Inc
-<date>23 February 2004
+<title>README for X11R&relvers;
+<author>The X.Org Foundation
+<date>6 April 2004
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.140 2004/02/24 03:41:40 dawes Exp $
+$Id: README.sgml,v 1.1.4.5.2.2 2004/04/02 21:47:18 eich Exp $.
 </ident>
 
 <abstract>
 
-XFree86 is an Open Source version of the X Window System that supports
+X11R&relvers; is an Open Source version of the X Window System that supports
 many UNIX(R) and UNIX-like operating systems (such as Linux, FreeBSD,
 NetBSD, OpenBSD and Solaris x86) on Intel and other platforms.  This
-version is compatible with X11R6.6.
+version is compatible with X11R6.6, 
+and is based on the XFree86 4.4.0RC2 code base, which,
+in turn was based on the X Consortium X11R6.6 and earlier sample implementations.
+
 
 </abstract>
 
 <toc>
 
-<sect>What is XFree86 &relvers;?
+<sect>What is X11R&relvers;?
 <p>
-
 <![ %updaterel [
-XFree86 &relvers; is the &whichupdaterel; update to &fullrelvers;,
+X11R&relvers; is the &whichupdaterel; update to X11R&fullrelvers;,
 the &whichfullrel; full release in the
 <![ %earlyrel; [new]]>
-XFree86 4.x series.
+X11R6.7 series.
+
 
 Update releases are taken from a stable/maintenance branch.  They are
 designed to be installed on top of the full release that they are
@@ -47,32 +50,33 @@
 ]]>
 
 <![ %fullrel [
-XFree86 &relvers; is the &whichfullrel; full release in the
+X11R&relvers; is the &whichfullrel; full release in the
 <![ %earlyrel; [new]]>
-XFree86 4.x series.
+X11R6.7 series.
 ]]>
 
 <![ %snapshot [
-XFree86 &relvers; is a pre-release snapshot of XFree86 &fullrelvers;.
+X11R&relvers; is a pre-release snapshot of X11R&fullrelvers;.
 <![ %relcandidate [
 This snapshot is release candidate &rcnum; for version &fullrelvers;.
 ]]>
 Pre-release snapshots are provided for beta testing.  You should only install
 snapshots if you're comfortable dealing with possibly unstable beta-level
 software.  If you find problems with this snapshot, you are encouraged
-to report your findings to the public XFree86 mailing list:
-<email>devel at XFree86.org</email>.
+to report your findings to the public X.Org server mailing list:
+<email>xorg at freedesktop.org</email>.
 
 <![ %relcandidate [
-XFree86 &relvers; is a feature-complete snapshot of XFree86
-&fullrelvers;.
+X11R&relvers; is a feature-complete snapshot of X11R&fullrelvers;.
 ]]>
 ]]> 
 
 <p>
-XFree86 4.x is the current XFree86 release series.  The first release in
-this series was in early 2000.  The core of XFree86 4.x is a modular
-X server.
+X11R6.7 is the current X.Org Foundation release series, based on the
+XFree86 4.x code base.
+The first release in
+the XFree86 4.x  series was in early 2000.  
+The core of X11R6.7 is a modular X server.
 <![ %fullrel [The &relvers; version is a new release that includes
 additional hardware support, functional enhancements and bug fixes.]]>
 <![ %haverelnotes [
@@ -80,24 +84,39 @@
 <htmlurl name="Release Notes" url="RELNOTES.html">.
 ]]>
 
-Most modern PC video hardware is supported in XFree86 &relvers;, and
+Most modern PC video hardware is supported in X11R&relvers;, and
 most PC video hardware that isn't supported explicitly can be used with
-the "vesa" driver.  The <htmlurl name="Releaes Notes" url="RELNOTES3.html">
-has a table showing the drivers provided with XFree86 &relvers;, and links
+the "vesa" driver.  The <htmlurl name="Release Notes" url="RELNOTES3.html">
+has a table showing the drivers provided with X11R&relvers;, and links
 to related documentation.
 
+The X.Org Foundation X releases are produced by the X.Org Foundation.
+The X.Org Foundation has been formed as a Delaware corporation organized to operate as a 
+scientific charity under IRS code 501(c)(3) to chartered to develop and 
+execute effective strategies which provide world-wide stewardship of the 
+X Window System technology and standards. Membership in the X.Org 
+Foundation is free to all participants. 
+Applications for Membership are now being accepted, 
+and active participants in the further development of the X Window 
+Technology are invited to complete a
+<url url="http://www.x.org/XOrg_Foundation_Membership.html" name="membership application">.
+The X11R&relvers; codebase is based on the codebase found in XFree86&trade 4.4RC2,
+which in turn was based on the original X Window System sample implementation
+from the X Consortium and it's successors.
+This release is dedicated to the greater X community, developers
+and users alike.
+
+
 XFree86&trade; is produced by The XFree86 Project, Inc through the work
 of a group of volunteer independent developers.  The XFree86 Project is
 a non-commercial organisation and XFree86 would not exist without the
 invaluable development contributions of volunteers from around the world.
-This release is dedicated to the greater XFree86 community, developers
-and users alike.
 
 <![ %snapshot [
 <sect>Redistribution of Snapshots
 <p>
 
-While the XFree86 <htmlurl name="License" url="LICENSE.html"> doesn't
+While the X.Org Foundation <htmlurl name="License" url="LICENSE.html"> doesn't
 prohibit vendors and others redistributing binaries of this snapshot
 release, we don't recommend including them in production releases.
 ]]>
@@ -105,7 +124,7 @@
 <sect>Licensing
 <p>
 
-XFree86 source code is covered by many licenses.  All of these licenses
+X Window System source code is covered by many licenses.  All of these licenses
 have in common the fact that they do not impose significant conditions
 on the modification or redistribution or either source code or binaries
 beyond requiring one or more of the following:
@@ -124,89 +143,60 @@
 consistent with the Free Software Foundation's <htmlurl name="Free
 Software Definition" url="http://www.fsf.org/philosophy/free-sw.html">.
 
-Copyright and Licensing information for XFree86, including the reproduction
+Copyright and Licensing information for X, including the reproduction
 of copyright and/or license notices and attributions required by some
 of the licenses for binary distributions, can be found in the <htmlurl
 name="License Document" url="LICENSE.html">.  If you find any omissions
 in that document, please contact us with details at
-<email>bod at XFree86.org</email>.
-
+<email>xf_board at x.org</email>.
+While the current licenses are all open source licenses, the
+X.Org Foundation is attempting, with time, to bring as much as 
+possible of the code's licenses in the distribution into compliance with the 
+<htmlurl name="Debian Free Software Guidelines" 
+url="http://www.debian.org/social_contract#guidelines">.
 <sect>Pointers to additional information
 <p>
 
 The documentation for this release can be found online at the <url
-name="XFree86 web site" url="http://www.xfree86.org/&relvers;/">.
-Documentation for the latest release version can always be found <url
-name="here" url="http://www.xfree86.org/current/">, and documentation
-for the latest pre-release snapshot can be found <url name="here"
-url="http://www.xfree86.org/snapshot/">.  Checking those last two links
-is a good way of finding out the latest available versions of XFree86.
-
+name="X.Org web site" url="http://wiki.x.org/">.
 Information about binary distributions and the attendant installation
 instructions can be found in the <htmlurl name="Installation Document"
 url="Install.html">.
 
-The XFree86 version numbering system (including historical information)
+The X11 version numbering system (including historical information)
 can be found in the <htmlurl name="Versions Document" url="Versions.html">.
 
 Additional information may be available at the <url
-name="XFree86 web site" url="http://www.xfree86.org/">, and pointers to
-other information are available at the <url name="XFree86 support page"
-url="http://www.xfree86.org/support.html">.
+name="X.Org Foundation Wiki" url="http://wiki.x.org/">.
 
 <sect>The Public Mailing Lists
 <p>
-Current information about the XFree86 public mailing lists can be found
-at our <url name="web site" url="http://www.xfree86.org/lists.html">.
-
-<sect1>CVS Commit
-<p>
-For those who want to see what has been committed recently to our CVS
-repository this is the list that will show you those updates.  This list
-is updated dynamically every time the repository is updated after the
-the commit happens.
-
-<sect1>Devel
-<p>
-This list is available for discussions about XFree86 development and
-for following up well-defined bug reports.  Many experienced XFree86
-developers are present on this list.
-
-<sect1>XFree86
-<p>
-This list is available for any discussions and questions related to XFree86.
-Support related questions should be sent here.  Many experienced XFree86
-developers monitor this list.
-
-<sect1>Forum
-<p>
-This list is available for high level discussions about XFree86 and related
-technologies, their future, and for inter-project communication.
+Current information about the X.Org Foundation public mailing lists 
+is available on <url name="the X.Org mailing list page" url="http://www.x.org/XOrg_Foundation_Join_OpenLists.html"> and related desktop technology
+mailing lists can be found on <url name="Freedesktop.org's mailing list page"
+url="http://freedesktop.org/mailman/listinfo">.
 
-<sect>Contributing to XFree86
+<sect>Contributing to the X.Org Foundation's X efforts.
 <p>
 If you have any new work or enhancements/bug fixes for existing work,
-please submit them to <email>patch at XFree86.org</email> or to our <url
-name="bug tracking system" url="http://bugs.xfree86.org/">.  This will
-ensure that they are included in future releases.  New works should be
-discussed on our <email>devel at XFree86.org</email> list prior to submission.
-
-Current information about the XFree86 development process can be found
-at our <url name="web site" url="http://www.xfree86.org/developer.html">.
+please send them to <email>xorg at freedesktop.org</email> or to our <url
+name="bug tracking system" url="http://bugzilla.freedesktop.org/"> using
+the xorg component.  This will
+ensure that they are included in future releases.
 
-<sect>How to get XFree86 &relvers;
+<sect>How to get X11R&relvers;
 <p>
 <![ %snapshot; [
-XFree86 &relvers; can be found at the <url name="XFree86 ftp server"
-url="ftp://ftp.xfree86.org/pub/XFree86/snapshots/&relvers;/">, and at
-mirrors of this server.  This snapshot is available primarily in binary
-form for several popular platforms.
+X11R&relvers; can be found from the <url name="X.Org Foundation wiki at"
+url="http://wiki.x.org">, and at
+mirrors of this server.
 ]]>
 
 <![ %release; [
-XFree86 &relvers; can be found at the <url name="XFree86 ftp server"
-url="ftp://ftp.xfree86.org/pub/XFree86/&relvers;/">,
-and at mirrors of this server.  Information about obtaining and installing
+X11R&relvers; can be found from the <url name="X.Org Foundation wiki at"
+url="http://wiki.x.org">, and at
+mirrors of this server.
+Information about obtaining and installing
 binary distributions of this release can be found in the
 <htmlurl name="Installation Document" url="Install.html">.  Information about
 obtaining the release in source form is given below.
@@ -228,36 +218,36 @@
 
 Information about getting the source for &prevrelvers can be found in the
 README file for that version, which can be found on the
-<url name="XFree86 web site" url="http://www.xfree86.org/pub/XFree86/&prevrelvers;/README.html">.
+<url name="X.Org foundation wiki" url="http://wiki.x.org">.
 ]]>
 
 <![ %fullrel [
 The source for version &fullrelvers; is split into seven tarballs:
 
 <tscreen><verb>
-XFree86-&fullrelvers;-src-1.tgz
-XFree86-&fullrelvers;-src-2.tgz
-XFree86-&fullrelvers;-src-3.tgz
-XFree86-&fullrelvers;-src-4.tgz
-XFree86-&fullrelvers;-src-5.tgz
-XFree86-&fullrelvers;-src-6.tgz
-XFree86-&fullrelvers;-src-7.tgz
+X11R&fullrelvers;-src1.tar.gz
+X11R&fullrelvers;-src2.tar.gz
+X11R&fullrelvers;-src3.tar.gz
+X11R&fullrelvers;-src4.tar.gz
+X11R&fullrelvers;-src5.tar.gz
+X11R&fullrelvers;-src6.tar.gz
+X11R&fullrelvers;-src7.tar.gz
 </verb></tscreen>
 
 The first three contain everything
 except the fonts and general X11 documentation.  Those three are sufficient
-for building XFree86 if you already have a set of fonts.  The fourth
+for building X11R&relvers; if you already have a set of fonts.  The fourth
 and fifth contain the fonts.  The sixth contains the source for the
 general X11 documentation.  The seventh contains the general X11
 documentation in hardcopy format.
 
 <![ %onediff; [
 A source patch relative to version &prevfullrelvers; is also available.
-The patch file is <tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff.gz</tt>.
+The patch file is <tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff.gz</tt>.
 <![ %difftar; [
 There is also a tarball that contains some files that have components that
 can't be included in a diff.  It is
-<tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
+<tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
 ]]>
 The patch
 should be applied to a clean &prevfullrelvers; source tree, working from
@@ -265,11 +255,11 @@
 be applied by running:
 
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff.gz | patch -p0 -E
 </verb></tscreen>
 <![ %difftar; [
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
 </verb></tscreen>
 ]]>
 ]]>
@@ -277,11 +267,11 @@
 <![ %twodiffs; [
 A source patch relative to version &prevfullrelvers; is also available.
 Because of its size, it is split into two parts.  The patch files are
-<tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz</tt> and
-<tt>XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>.
+<tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz</tt> and
+<tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>.
 <![ %difftar; [
 There is also a tarball that contains some files that have components that
-can't be included in a diff.  It is <tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
+can't be included in a diff.  It is <tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
 ]]>
 These patches should
 be applied to a clean &prevfullrelvers; source tree, working from the directory
@@ -289,12 +279,12 @@
 running:
 
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
 </verb></tscreen>
 <![ %difftar; [
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
 </verb></tscreen>
 ]]>
 ]]>
@@ -305,15 +295,15 @@
 The patch files are:
 
 <tscreen><verb>
-XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz
-XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz
-XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff3.gz
 </verb></tscreen>
 
 <![ %difftar; [
 There is also a tarball that contains some files that have components that
 can't be included in a diff.  It is
-<tt>XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
+<tt>X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz</tt>.
 ]]>
 These patches should
 be applied to a clean &prevfullrelvers; source tree, working from the directory
@@ -321,13 +311,13 @@
 running:
 
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
 </verb></tscreen>
 <![ %difftar; [
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
 </verb></tscreen>
 ]]>
 ]]>
@@ -338,10 +328,10 @@
 The patch files are:
 
 <tscreen><verb>
-XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz
-XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz
-XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz
-XFree86-&prevfullrelvers;-&fullrelvers;.diff4.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff3.gz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff4.gz
 </verb></tscreen>
 
 <![ %difftar; [
@@ -349,8 +339,8 @@
 components that can't be included in a diff.  These are:
 
 <tscreen><verb>
-XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz
-XFree86-&prevfullrelvers;-&fullrelvers;-cleanup.sh
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz
+X11R&relvers;-&prevfullrelvers;-&fullrelvers;-cleanup.sh
 </verb></tscreen>
 
 ]]>
@@ -360,15 +350,15 @@
 running:
 
 <tscreen><verb>
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;.diff4.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;.diff4.gz | patch -p0 -E
 </verb></tscreen>
 <![ %difftar; [
 <tscreen><verb>
-sh XFree86-&prevfullrelvers;-&fullrelvers;-cleanup.sh
-gzip -d &lt; XFree86-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
+sh X11R&relvers;-&prevfullrelvers;-&fullrelvers;-cleanup.sh
+gzip -d &lt; X11R&relvers;-&prevfullrelvers;-&fullrelvers;-diff0.tgz | tar vxf -
 </verb></tscreen>
 ]]>
 ]]>
@@ -381,18 +371,15 @@
 ]]>
 -->
 
-To format the XFree86 documentation use the latest version of our doctools
-package available from the XFree86 CVS repository's "doctools" module,
-and from our <url name="ftp site"
-url="ftp://ftp.xfree86.org/pub/XFree86/misc/doctools-&doctoolsvers;.tgz">.
+To format the X11R&relvers; documentation use the latest version of our doctools
+package available from the Xorg CVS repository's "doctools" module.
 ]]>  <!-- fullrel -->
 
-The XFree86 source code for this and all releases/snapshots as well as
-development versions can also be accessed via the XFree86 CVS repository.
-Information about accessing this can be found at the <url name="CVS page"
-url="http://www.xfree86.org/cvs/"> on our web site.  It's also possible
-to browse the XFree86 CVS repository at our <url name="CVSWeb server"
-url="http://cvsweb.xfree86.org/">.  The CVS tag for this version is
+The X source code for this and all releases/snapshots as well as
+development versions can also be accessed via the Freedesktop.org 
+CVS repository.
+It's also possible to browse the <url name="freedesktop CVS repository"
+url="http://cvs.freedesktop.org/">.  The CVS tag for this version is
 "&reltag;".
 <![ %notsnapshot [
 The CVS tag for the stable branch for this release is "&relbranchtag;".
@@ -403,13 +390,14 @@
 <sect>Reporting Bugs
 <p>
 
-Bugs should be reported to <email>XFree86 at XFree86.org</email>.  Before
-reporting bugs, please check the XFree86 server log file, which can be
-found at <tt>/var/log/XFree86.0.log</tt> on most platforms.  If you
+Bugs should be reported to <url
+name="bug tracking system" url="http://bugzilla.freedesktop.org/"> using
+the xorg compoent.   Before
+reporting bugs, please check the server log file, which can be
+found at <tt>/var/log/Xorg.0.log</tt> on most platforms.  If you
 can't resolve the problem yourself, send the entire log file with your
 bug report but not the operating system core dump.  Do not edit  the
 log file as our developers use it to reproduce and debug your problem.
-
-
+Please attach it to your bug report.
 
 </article>

Index: RELNOTES.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/RELNOTES.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.5
+++ b/RELNOTES.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.6
@@ -1,38 +1,67 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 
-<title>Release Notes for XFree86&trade; &relvers;
-<author>The XFree86 Project, Inc
-<date>29 February 2004
+<title>Release Notes for X11R&relvers;
[...1248 lines suppressed...]
+X-TrueType Server Project,
+and their contributors.
 
 This product includes software developed by The XFree86 Project, Inc
 (http://www.xfree86.org/) and its contributors.
@@ -1415,10 +1967,11 @@
 This product includes software developed by Christopher G. Demetriou.
 
 This product includes software developed by the NetBSD Foundation, Inc. and its
-contributors
+contributors.
 
-This product includes software developed by X-Oz Technologies
-(http://www.x-oz.com/).
+This product includes software developed by the X-Oz Technologies and its
+contributors.
 
+</descrip>
 
 </article>

Index: SCO.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/SCO.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.3
+++ b/SCO.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.4
@@ -1,4 +1,6 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <article>
 
 <!-- TitleS information -->
@@ -9,7 +11,6 @@
 
 <ident>
 $XdotOrg$
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.22 2003/02/17 18:58:07 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
@@ -20,11 +21,11 @@
 <sect>Requirements<p>
 
 Before you can either compile or execute a binary distribution of
-XFree86, the following conditions must be met:
+X11R&relvers, the following conditions must be met:
 <itemize>
   <item>Ensure that you are running Release 5.0.4 or later. This is required
     because OSS646 is only supported on those platforms. There are no plans
-    to support XFree86 on earlier releases of OpenServer.
+    to support X11R&relvers; on earlier releases of OpenServer.
   <item>Ensure that OSS646, the ``Execution Environment Update'' package is
     installed, if appropriate.  Check the release notes for that update
     to see whether or not your current operating system requires this
@@ -39,7 +40,7 @@
     the release notes for GWXLIBS to see if your platform requires the
     update.  The latest version can always be found at the
     <url name="SCO FTP site" url="ftp://ftp.sco.com/pub/openserver5/opensrc">.
-  <item>To compile XFree86, you must use the SCO-supported version of
+  <item>To compile X11R&relvers;, you must use the SCO-supported version of
     the GNU C Compiler.  It is possible that Skunkware versions of the
     compiler will work too, but this has not been tested.  The ``GNU
     Development System'' is available for all releases from (and including)
@@ -51,7 +52,7 @@
   <item>If you are not using OSR 5.0.7 or later, you need to get an updated
     console driver.  See <url url="http://www.sco.com"> for details on
     OpenServer supplements.  If you can't or don't want to upgrade your
-    console driver, XFree86 will still compile, but you may run into
+    console driver, X11R&relvers; will still compile, but you may run into
     problems with some cards such as the Riva TNT and ATI Rage cards.
     The problem with the console driver in 5.0.6A and earlier is that
     when the X server sets graphics mode, the driver does not set a
@@ -61,20 +62,20 @@
     happens to be slap bang in the middle of palette data for the Riva
     TNT, so you get color map corruption.  The updated console driver
     also has an improved mechanism for allocating video memory that
-    XFree86 detects at compile time, and it will use it if it exists.
+    X11R&relvers; detects at compile time, and it will use it if it exists.
     It is STRONGLY recommended that you get the console driver update.
 
 </itemize>
 
-<sect>Compiling XFree86<p>
+<sect>Compiling X11&relvers;<p>
 
-Using the GNU Development System, compiling XFree86 should be fairly
+Using the GNU Development System, compiling the distribution should be fairly
 straightforward.  Before attempting to compile the system though, you
 should make sure that you have met all of the requirements above.
 To actually start the compilation, perform the following steps:
 
 <itemize>
-  <item>Copy the unmodified <tt>xf86site.def</tt> in <tt>xc/config/cf</tt>
+  <item>Copy the unmodified <tt>xorgsite.def</tt> in <tt>xc/config/cf</tt>
     to <tt>host.def</tt>. Edit <tt>host.def</tt> and make any changes you
     think you need. The most useful options to change are <tt>HasTcl</tt>,
     <tt>HasTk</tt>, <tt>HasXdmAuth</tt> if you have the file
@@ -102,23 +103,23 @@
     <tt>make install.man 2&gt;&amp;1 | tee -a install.log</tt> as root.
 </itemize>
 
-<sect>Before Running XFree86<p><label id="sec-runxf86">
+<sect>Before Running X11R&relvers;<p><label id="sec-runxorg">
 
 The SCO <tt/xterm/ terminfo description is not compatible with the <tt/xterm/
 in the R5 distribution.<p>
 
 To use a Bus/Keyboard or PS2 mouse you should configure the mouse drivers
 using '<tt>mkdev mouse</tt>'.  You may then use the 
-<tt>OsMouse</tt> option in your <tt>XF86Config</tt> to specify that XFree86
+<tt>OsMouse</tt> option in your <tt>xorg.conf</tt> to specify that X
 should use the SCO mouse drivers.  To do this, set the <tt>Protocol</tt> to
 "<tt>OsMouse</tt>" in the <tt>Pointer</tt> section of your
-<tt>XF86Config</tt> file.  You can also use "<tt>OsMouse</tt>" for your 
+<tt>xorg.conf</tt> file.  You can also use "<tt>OsMouse</tt>" for your 
 serial mouse, especially if you are having trouble getting your mouse to
-work using the XFree86 mouse drivers.<p>
+work using the X mouse drivers.<p>
 
 <sect>Switching Consoles<p>
 
-XFree86 uses similar console switching keys as the SCO R4 and R5
+X11R&relvers; uses similar console switching keys as the SCO R4 and R5
 servers.  That is, <tt>Ctrl-PrntScr</tt> takes you to the next console along
 from the one X is running on.  If this is the last console it will take
 you to console 1. <tt>Ctrl-Alt-FXX</tt>, where <tt>XX</tt> is a function
@@ -137,7 +138,7 @@
 <sect>Setting up Man Pages<p>
 
 After compiling the tree, or after installing the binary distribution you
-can get <tt>man</tt> to recognise the XFree86 man pages by adding 
+can get <tt>man</tt> to recognise the Xorg man pages by adding 
 <tt>/usr/X11R6/man</tt> to
 the <tt>MANPATH</tt> in <tt>/etc/default/man</tt>. The line should 
 look similar to:
@@ -160,8 +161,8 @@
 
 <sect>Using SCO binaries/servers.<p>
 
-XFree86 will accept connections from SCO binaries (R3 upwards) and the
-SCO R5 server will also accept connections from XFree86 binaries. This
+X11R&relvers; will accept connections from SCO binaries (R3 upwards) and the
+SCO R5 server will also accept connections from X11R&relvers binaries. This
 means you may mix and match the two if you have ODT.  For example you may
 still use the Panning Motif window manager (pmwm) if you prefer.
 

Index: SiS.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/SiS.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.4
+++ b/SiS.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -10,7 +10,6 @@
 <date>5 October 2003
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.8 2003/10/19 19:29:14 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
@@ -32,7 +31,7 @@
 The driver supports:
 <itemize>
   <item>8/16/24 bits color depth; old series also 15;
-  <item>XAA (XFree86 Acceleration Architecture)
+  <item>XAA 
   <item>XVideo (Xv)
   <item>Render (XRAND)
   <item>Hardware cursor; 315/330 series: Color HW cursor;
@@ -47,11 +46,11 @@
 and updates. Support for the 661, 741 and 760 is entirely untested as of this writing,
 and possibly incomplete for LCD output.
 
-<sect> XF86Config Options <p>
+<sect> xorg.conf Options <p>
 
 The following options are of particular interest for the SiS
 driver. Each of them must be specified in the Device section of the
-XF86Config file for this card.
+xorg.conf file for this card.
 
 <sect1>For all chipsets<p>
 
@@ -158,7 +157,7 @@
 <descrip>
 <tag>Option "MaxXFBMem"</tag>
 	DRI requires the linux kernel's SiS framebuffer driver "sisfb" and some
-	other modules which come with either the linux kernel or XFree86. (On *BSD,
+	other modules which come with either the linux kernel or X11R&relvers;. (On *BSD,
 	the DRI driver does not require any framebuffer driver.)
   	Sisfb takes care of memory management for texture data. In order to prevent
 	the X driver and sisfb from overwriting each others video memory, sisfb
@@ -168,7 +167,8 @@
 	the amount of RAM sisfb reserved. For this purpose, the Option "MaxXFBMem" exists.
 
 	XFree 4.3.0 disabled SiS DRI support due to a lack of maintenance of the SiS DRI
-	driver. XFree86 4.4 contains a newly written SiS DRI driver by Eric Anholt.
+	driver. X11R&relvers; and X11R&relvers; and XFree86 4.4 contains a newly written 
+        SiS DRI driver by Eric Anholt.
 
 	If you intend to use DRI, I recommend setting the total video memory in the BIOS
 	to 64MB in order to at least overcome the lack of memory swap functions.

Index: Solaris.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Solaris.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/Solaris.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,42 +1,24 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 <article>
 
 <!-- Title information -->
 <title>Information for Solaris
 <author>David Holland, modified by Marc Aurele La France
-<date>2001 October 01
+<date>2004 April 02
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml,v 1.3 2002/01/25 21:55:53 tsi Exp $
 </ident>
 
 <!-- Table of contents -->
 <toc>
 
 <!-- Begin the document -->
-<sect>What is XFree86<p>
-XFree86 is a port of X11R6.5.1 that supports several versions of Unix.
-It is derived from X386 1.2 which was the X server distributed with X11R5.
-This release consists of many new features and performance improvements as well
-as many bug fixes.
-The release is available as a source code distribution, as well as binary
-distributions for many architectures.
-<p>
-The sources for XFree86 are available by anonymous ftp from:
-<quote>
-	<htmlurl name="ftp://ftp.XFree86.org/pub/XFree86/current"
-	url="ftp://ftp.XFree86.org/pub/XFree86/current">
-</quote>
-Solaris binaries for XFree86 are available for anonymous ftp at the same
-address.
-Currently, two binary distributions are available:  one for Solaris 8 x86, the
-other for previous Solaris x86 releases.
-They are <it>not</it> interchangeable.
-No binary distribution is available for Solaris/SPARC as it is still under
-development.<p>
 <sect>The VT-switching sub-system in Solaris x86<p>
 The virtual terminal sub-system is a undocumented, and unsupported feature of
-Solaris x86.
+Solaris x86 releases 2.1 through 7.  It is no longer present in Solaris 8 and
+later releases.
 Therefore if you use virtual terminals, you do so at <bf>YOUR OWN RISK</bf>.<p>
 Virtual terminals are not available in Solaris SPARC, and their availability
 has been removed in Solaris8 x86.<p>
@@ -100,14 +82,14 @@
 usual 15.
 If you have all 8 allocated, and you attempt to allocate a additional VT you
 will panic the system.
-(This bug is worked around in the Solaris XFree86 Xserver.)<p>
+(This bug is worked around in the Solaris X11R&relvers; Xserver.)<p>
 From a programming stand point, they work pretty much as documented in the
 AT&amp;T Unix System V/386 Release 4 Integrated Software Development Guide,
 however a number of <tt>ioctl()</tt> calls are broken.<p>
-<sect>Notes for building XFree86 on Solaris<p>
+<sect>Notes for building X11R&relvers; on Solaris<p>
 <enum>
 <item>
-Both GCC, and ProWorks are supported by XFree86.
+Both GCC, and the Sun Studio compilers are supported by X11R&relvers;.
 The minimum recommended GCC release is 2.7.2.
 Some earlier GCC's are known to not work and should be avoided.<p>
 You should also make certain your version of GCC predefines `sun'.
@@ -127,18 +109,18 @@
 Most notably image viewers such as xv-3.10 exhibit this problem.<p>
 It is recommended that you set ThreadedX in <tt>~xc/config/cf/host.def</tt> to
 NO, if you are using GCC.
-ProWorks does not have this problem.
+Sun's compilers do not have this problem.
 Whether this behaviour still exists with newer GCC's has not been verified.<p>
 <item>
-To build XFree86 with GCC you need gcc and (optionally) c++filt from GNU
+To build X11R&relvers; with GCC you need gcc and (optionally) c++filt from GNU
 binutils.
 Don't install gas or ld from GNU binutils, use the one provided by Sun.<p>
 You might need to setup a /opt/SUNWspro/bin directory containing symbolic links
 named <tt/cc/, <tt/CC/, and <tt/c++filt/ pointing respectively to the actual
 <tt/gcc/, <tt/g++/ and <tt/c++filt/ commands.<p>
 <item>
-If you are using ProWorks to compile the XFree86 distribution, you need to
-modify your PATH appropriately so the ProWorks tools are available.
+If you are using Sun compilers to compile the X11R&relvers; distribution, you need to
+modify your PATH appropriately so the Sun compiler tools are available.
 Normally, they should be in <tt>/opt/SUNWspro/bin</tt><p>
 <item>
 You <bf>MUST</bf> put <tt>/usr/ccs/bin</tt> at the front of your PATH.
@@ -148,7 +130,7 @@
 any possible GNU versions.
 (Most notably GNU '<tt/ar/' does not work during the build).<p>
 </enum>
-<sect>Notes for running XFree86 on Solaris<p>
+<sect>Notes for running Xorg on Solaris<p>
 <enum>
 <item>
 Depending on the release or architecture of Solaris you are running, you might
@@ -162,7 +144,7 @@
 <tt>xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar</tt> of the source
 distribution.
 This file can usually also be found in the <tt>/usr/X11R6/lib/X11/etc</tt>
-directory when XFree86 is installed.
+directory when Xorg is installed.
 Building, and installing the driver is relatively straight forward. Please read
 its accompanying README file.<p>
 <item>
@@ -176,12 +158,12 @@
 If you have made the virtual terminal devices you do not need to specify the VT
 to run the Xserver on.<p>
 <item>
-For Solaris you will probably want to set your LD_LIBRARY_PATH to
+For old releases of Solaris you will probably want to set your LD_LIBRARY_PATH to
 <tt>/usr/X11R6/lib:/usr/openwin/lib:/usr/dt/lib</tt>.
 Including <tt>/usr/X11R6/lib</tt> in your LD_LIBRARY_PATH is probably not
 necessary, however it doesn't hurt. :)<p>
 Including <tt>/usr/openwin/lib</tt> in the LD_LIBRARY_PATH is recommended
-because some Sun supplied binaries were not compiled with LD_RUN_PATH set
+on older releases because some Sun supplied binaries were not compiled with LD_RUN_PATH set
 properly at compile time.<p>
 Motif and CDE applications may require <tt>/usr/dt/lib</tt> in your
 LD_LIBRARY_PATH too.
@@ -212,5 +194,6 @@
 It might even have broken some aspects of the x86 port.<p>
 </enum>
 <sect>Bug Notification<p>
-Bug reports should be sent to <email>XFree86 at XFree86.org</email>.
+Bug reports should be reported using the bugzilla.freedesktop.org using the 
+xorg product or sent to <email>xorg at freedesktop.org</email>.
 </article>

Index: Status.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/Status.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.3
+++ b/Status.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.4
@@ -1,22 +1,21 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 
 <title>Driver Status
-<author>The XFree86 Project, Inc
-<date>18 December 2003
+<author>The X.org Foundation
+<date>28 March, 2004
 
 <ident>
 $XdotOrg$
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.44 2003/12/01 02:41:34 dawes Exp $
 </ident>
 
 <abstract>
 
 This document is no longer available.  For information about the video
-hardware and drivers supported by XFree86 &relvers;, see the table
+hardware and drivers supported by X11R&relvers;, see the table
 of drivers provided in the <htmlurl name="Release Notes" url="RELNOTES3.html">.
 
 </abstract>

Index: Versions.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Versions.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/Versions.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -5,18 +5,22 @@
 
 <article>
 
-<title>XFree86 Version Numbering Schemes
+<title>X.Org and XFree86 Version Numbering Schemes
 <author>The XFree86 Project, Inc
-<date>23 February 2003
+<and>Updated for X11R&relvers; by Keith Packard
+<date>25 March 2004
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Versions.sgml,v 1.3 2002/12/21 03:37:09 dawes Exp $
 </ident>
 
 <abstract>
 
+X.Org has adopted the same basic numbering scheme used by the XFree86
+Project, Inc. for their releases.  The actual numbers are different, but the
+basic scheme is the same.  This document reflects the policy that X.Org uses.
+
 The version numbering schemes used by XFree86 have changed from time to
-time.  The schemes used since version 3.3 are explained here.
+time.
 
 </abstract>
 
@@ -25,7 +29,7 @@
 <sect>Releases, Development Streams and Branches
 <p>
 
-As of the release of version 4.0.2 in December 2000, XFree86 has three
+As of the release of version 6.7.0 in March 2004, X.Org has three
 release branches.  First is trunk of the CVS repository.  This is the
 main development stream, where all new work and work for future releases
 is done.
@@ -37,18 +41,12 @@
 updates to this release (if any) will be cut from this branch.  Similar
 stable branches are present for previous full releases.
 
-Finally there is the 3.3.x legacy branch, which is called
-"<tt>xf-3_3-branch</tt>".  While this branch is not actively being
-maintained, it does include some important post-3.3.6 bug fixes and
-security updates.  Relevant security updates in particular are usually
-back-ported to this branch.
-
-XFree86 is planning to make full releases from the main development
+X.Org is planning to make full releases from the main development
 stream at regular intervals in the 6-12 month range.  The feature
 freezes for these releases will usually be 2-3 months before the release
 dates.  This general plan is a goal, not a binding commitment.  The
 actual release intervals and dates will depend to a large degree on the
-resource available to XFree86.  Full releases consist of full source
+resource available to X.Org.  Full releases consist of full source
 code tarballs, plus full binary distributions for a range of supported
 platforms.  Update/bugfix releases will be made on an as-required basis,
 depending also on the availability of resources, and will generally be
@@ -61,12 +59,6 @@
 scheduled update release, but if one is needed, the version will be
 &nextupdrelvers;.
 
-<!--
-The next release on the legacy branch will be 3.3.7.  There is currently
-no schedule for that release.  The 3.3.7 release is likely to be the
-final release on that branch.
--->
-
 Aside from actual releases, snapshots of the active release branches
 are tagged in the CVS repository from time to time.  Each such snapshot
 has an identifiable version number.
@@ -74,10 +66,8 @@
 <sect>Current (new) Version Numbering Scheme
 <p>
 
-Starting with the main development branch after 4.0.2, the XFree86
+Starting with the main development branch after 6.7.0, the X.Org
 versions are numbered according to the scheme outlined here.
-Both the 4.0.2 stable branch and the 3.3.x legacy branch continue
-to use the previous scheme, which is outlined in the sections below.
 
 The version numbering format is <tt>M.m.P.s</tt>, where <tt>M</tt> is
 the major version number, <tt>m</tt> is the minor version number,
@@ -93,34 +83,34 @@
 Immediately after forming a release stable branch, the patch level number
 for the main development branch is bumped to 99, and the snapshot number
 is reset.  The snapshot number is incremented for each tagged development
-snapshot.  The CVS tag for snapshots is "<tt>xf-M_m_P_s</tt>".  When
+snapshot.  The CVS tag for snapshots is "<tt>x-M_m_P_s</tt>".  When
 the development branch enters feature freeze, the snapshot number may be
 bumped to 900, and a stable branch may be created for the next full release.
-The branch is called "<tt>xf-M_m-branch</tt>".  The snapshot number is
+The branch is called "<tt>x-M_m-branch</tt>".  The snapshot number is
 incremented from there until the release is finalised.  Each of these
 snapshots is a "release candidate".  When the release is finalised, the
 minor version is incremented, the patch level is set to zero, and the
 snapshot number removed.
 
 Here's an example which shows the version number sequence for the
-development leading up to version 4.1.0:
+development leading up to version 6.8.0:
 
 <descrip>
-  <tag><tt>4.0.99.1</tt></tag>
-	The first snapshot of the pre-4.1 development branch.
-  <tag><tt>4.0.99.23</tt></tag>
-	The twenty-third snapshot of the pre-4.1 development branch.
-  <tag><tt>4.0.99.900</tt></tag>
-	The start of the 4.1 feature freeze, which marks the creation of
-	the "<tt>xf-4_1-branch</tt>" branch.  That branch is the "stable"
-	branch for the 4.1.x releases.
-  <tag><tt>4.0.99.903</tt></tag>
-	The third 4.1.0 release candidate.
-  <tag><tt>4.1.0</tt></tag>
-	The 4.1.0 release.
-  <tag><tt>4.1.99.1</tt></tag>
-	The first pre-4.2 development snapshot, which  is the first main
-	branch snapshot after creating the 4.1 stable branch.
+  <tag><tt>6.7.99.1</tt></tag>
+	The first snapshot of the pre-6.8 development branch.
+  <tag><tt>6.7.99.23</tt></tag>
+	The twenty-third snapshot of the pre-6.8 development branch.
+  <tag><tt>6.7.99.900</tt></tag>
+	The start of the 6.8 feature freeze, which marks the creation of
+	the "<tt>x-6.8-branch</tt>" branch.  That branch is the "stable"
+	branch for the 6.8.x releases.
+  <tag><tt>6.7.99.903</tt></tag>
+	The third 6.8.0 release candidate.
+  <tag><tt>6.8.0</tt></tag>
+	The 6.8.0 release.
+  <tag><tt>6.8.99.1</tt></tag>
+	The first pre-6.9 development snapshot, which  is the first main
+	branch snapshot after creating the 6.8 stable branch.
 </descrip>
 
 <sect1>Stable Branch
@@ -135,220 +125,58 @@
 incremented for each update release.
 
 Here's an example which shows the version number sequence for the
-4.1.x stable branch.
+6.8.x stable branch.
 
 <descrip>
-  <tag><tt>4.0.99.900</tt></tag>
-	The start of the 4.1 feature freeze, which marks the creation of
-	the "<tt>xf-4_1-branch</tt>" branch.  That branch is the "stable"
-	branch for the 4.1.x releases.
-  <tag><tt>4.0.99.903</tt></tag>
-	The third 4.1.0 release candidate.
-  <tag><tt>4.1.0</tt></tag>
-	The 4.1.0 release.
-  <tag><tt>4.1.0.901</tt></tag>
-	The first pre 4.1.1 snapshot.
-  <tag><tt>4.1.0.903</tt></tag>
-	The third pre 4.1.1 snapshot, also known as the third 4.1.1 release
+  <tag><tt>6.7.99.900</tt></tag>
+	The start of the 6.8 feature freeze, which marks the creation of
+	the "<tt>x-6.8-branch</tt>" branch.  That branch is the "stable"
+	branch for the 6.8.x releases.
+  <tag><tt>6.7.99.903</tt></tag>
+	The third 6.8.0 release candidate.
+  <tag><tt>6.8.0</tt></tag>
+	The 6.8.0 release.
+  <tag><tt>6.8.0.901</tt></tag>
+	The first pre 6.8.1 snapshot.
+  <tag><tt>6.8.0.903</tt></tag>
+	The third pre 6.8.1 snapshot, also known as the third 6.8.1 release
 	candidate.
-  <tag><tt>4.1.1</tt></tag>
-	The 4.1.1 release.
-  <tag><tt>4.1.1.901</tt></tag>
-	The first pre 4.1.2 snapshot.
-  <tag><tt>4.1.2</tt></tag>
-	The 4.1.2 release.
-</descrip>
-
-<sect>Version Numbering Scheme for XFree86 4.0.x.
-<p>
-
-The version numbering format for XFree86 4.0.x releases is <tt>M.m.nx</tt>,
-where <tt>M</tt> is the major version number (4), <tt>m</tt> is the
-minor version number (0), <tt>n</tt> is the sub-minor version number,
-and <tt>x</tt> is a letter.  Full release versions up to and including
-4.0.2 were 4.0, 4.0.1, and 4.0.2.  Between-release snapshots are
-indicated by including <tt>x</tt>, a lower case letter.  For example,
-the first post-4.0.1 snapshot was 4.0.1a.  Release candidates have
-been indicated by setting <tt>x</tt> to a one or two letter combination
-with the first letter being "Z".  For example, 4.0.1Z was the first
-4.0.2 release candidate.
-
-The next 4.0.x release will be an update release, not a full release.
-These update releases will be indicated by incrementing the sub-minor
-version number.  So, the first post-4.0.2 update release will be 4.0.3.
-Between-release snapshots will continue to be indicated with a lower
-case letter, so the first pre-4.0.3 snapshot will be 4.0.2a.
-
-The following example illustrates the release sequence from 4.0 through
-to the post-4.0.2 update releases.
-
-<descrip>
-  <tag><tt>4.0</tt></tag>
-	The 4.0 release.
-  <tag><tt>4.0a</tt></tag>
-	The first post-4.0 development snapshot.
-  <tag><tt>4.0f</tt></tag>
-	The sixth post-4.0 development snapshot.
-  <tag><tt>4.0Z</tt></tag>
-	The 4.0.1 release candidate.
-  <tag><tt>4.0.1</tt></tag>
-	The 4.0.1 release.
-  <tag><tt>4.0.1a</tt></tag>
-	The first post-4.0.1 development snapshot.
-  <tag><tt>4.0.1f</tt></tag>
-	The sixth post-4.0.1 development snapshot.
-  <tag><tt>4.0Z</tt></tag>
-	The first 4.0.2 release candidate.
-  <tag><tt>4.0Zb</tt></tag>
-	The third 4.0.2 release candidate.
-  <tag><tt>4.0.2</tt></tag>
-	The 4.0.2 release.
-  <tag><tt>4.0.2a</tt></tag>
-	The first pre-4.0.3 snapshot/release candidate.
-  <tag><tt>4.0.2c</tt></tag>
-	The third pre-4.0.3 snapshot/release candidate.
-  <tag><tt>4.0.3</tt></tag>
-	The 4.0.3 update release.
-  <tag><tt>4.0.3a</tt></tag>
-	The first pre-4.0.4 snapshot/release candidate.
-  <tag><tt>4.0.4</tt></tag>
-	The 4.0.4 update release.
+  <tag><tt>6.8.1</tt></tag>
+	The 6.8.1 release.
+  <tag><tt>6.8.1.901</tt></tag>
+	The first pre 6.8.2 snapshot.
+  <tag><tt>6.8.2</tt></tag>
+	The 6.8.2 release.
 </descrip>
-  
-<sect>Pre-4.0 Development Versions
-<p>
-
-This section is included mostly for historical reasons.
-
-The development leading up to 4.0 started from version 3.2A, but much of
-it happened on a separate development branch.  The "new design" work on
-that development branch was first folded into the main development branch
-at version 3.9N.  Up until the XFree86 CVS was made publicly available,
-all versions containing one or more letters were internal development
-snapshots.  The internal development snapshots continued through the
-following sequence: 3.9N, 3.9Na, ..., 3.9Nz, 3.9P, 3.9Pa, ..., 3.9Py,
-3.9.15, 3.9.15a, ..., 3.9.16, 3.9.16a, ..., 3.9.17, 3.9.17a, ..., 3.9.18,
-3.9.18a, ..., 4.0.  The 3.9.15, 3.9.16, etc versions were public pre-4.0
-beta releases.
-
-<sect>Version Numbering Scheme for XFree86 3.3.x.
-<p>
-
-The version numbering format for XFree86 3.3.x releases is <tt>M.m.nx</tt>,
-where <tt>M</tt> is the major version number (3), <tt>m</tt> is the
-minor version number (3), <tt>n</tt> is the sub-minor version number,
-and <tt>x</tt> is a letter.  Between-release snapshots are indicated by
-including <tt>x</tt>, a lower case letter.  An exception to this scheme
-was the 3.3.3.1 release, which was an update to the 3.3.3 release.
 
-<descrip>
-  <tag><tt>3.3</tt></tag>
-	The 3.3 release.
-  <tag><tt>3.3a</tt></tag>
-	The first post-3.3 development snapshot.
-  <tag><tt>3.3.1</tt></tag>
-	The 3.3.1 release.
-  <tag><tt>3.3.1a</tt></tag>
-	The first post-3.3.1 development snapshot.
-  <tag><tt>3.3.2</tt></tag>
-	The 3.3.2 release.
-  <tag><tt>3.3.2a</tt></tag>
-	The first post-3.3.2 development snapshot.
-  <tag><tt>3.3.3</tt></tag>
-	The 3.3.3 release.
-  <tag><tt>3.3.3a</tt></tag>
-	The first post-3.3.3 development snapshot.
-  <tag><tt>3.3.3.1</tt></tag>
-	The 3.3.3.1 release.
-  <tag><tt>3.3.3.1a</tt></tag>
-	The first post-3.3.3.1 development snapshot.
-  <tag><tt>3.3.4</tt></tag>
-	The 3.3.4 release.
-  <tag><tt>3.3.4a</tt></tag>
-	The first post-3.3.4 snapshot.
-  <tag><tt>3.3.5</tt></tag>
-	The 3.3.5 release.
-  <tag><tt>3.3.5a</tt></tag>
-	The first post-3.3.5 snapshot.
-  <tag><tt>3.3.6</tt></tag>
-	The 3.3.6 release.
-  <tag><tt>3.3.6a</tt></tag>
-	The first post-3.3.6 snapshot.
-</descrip>
-  
-<sect>Finding the XFree86 X Server Version From a Client
+<sect>Finding the X.Org X Server Version From a Client
 <p>
 
-The XFree86 X servers report a <tt>VendorRelease</tt> value that matches
-the XFree86 version number.  There have been some cases of releases where
+The X.Org X servers report a <tt>VendorRelease</tt> value that matches
+the X.Org version number.  There have been some cases of releases where
 this value wasn't set correctly.  The rules for interpreting this value
 as well as the known exceptions are outlined here.
 
-For 3.3.x versions, the <tt>VendorRelease</tt> value is <tt>Mmnp</tt>.
-That is, version <tt>M.m.n.p</tt> has <tt>VendorRelease</tt> set to
-<tt>M&nbsp;*&nbsp;1000&nbsp;+&nbsp;m&nbsp;*&nbsp;100&nbsp;+&nbsp;n&nbsp;*&nbsp;10&nbsp;+&nbsp;p</tt>.
-Exceptions to this are:  The value wasn't incremented for the 3.3.3.1
-release, and for the 3.3.4 and 3.3.5 releases the value was incorrectly
-set to <tt>Mmn</tt>
-(<tt>M&nbsp;*&nbsp;100&nbsp;+&nbsp;m&nbsp;*&nbsp;10&nbsp;+&nbsp;n</tt>).
-This was corrected for the 3.3.6 release.
-
-For versions 3.9.15 to 4.0.x, the <tt>VendorRelease</tt> value is
-<tt>Mmnn</tt>.  That is, version <tt>M.m.n</tt> has <tt>VendorRelease</tt>
-set to
-<tt>M&nbsp;*&nbsp;1000&nbsp;+&nbsp;m&nbsp;*&nbsp;100&nbsp;+&nbsp;n</tt>.
-There have been no exceptions to this rule.
-
-For post-4.0.2 development and release versions using the new numbering
+For post-6.7.0 development and release versions using the new numbering
 scheme, the <tt>VendorRelease</tt> value is <tt>MMmmPPsss</tt>.  That
 is, version <tt>M.m.P.s</tt> has <tt>VendorRelease</tt> set to
 <tt>M&nbsp;*&nbsp;10000000&nbsp;+&nbsp;m&nbsp;*&nbsp;100000&nbsp;+&nbsp;P&nbsp;*&nbsp;1000&nbsp;+&nbsp;s</tt>.
-Note: 4.0.3 and any other 4.0.x releases will continue with the
-<tt>Mmnn</tt> scheme.
 
 The following is a code fragment taken from <tt>xdpyinfo.c</tt> that shows
 how the <tt>VendorRelease</tt> information can be interpreted.
 
 <tscreen><verb>
 
-    if (strstr(ServerVendor(dpy), "XFree86")) {
+    if (strstr(ServerVendor(dpy), "X.Org")) {
         int vendrel = VendorRelease(dpy);
 
-        printf("XFree86 version: ");
-        if (vendrel < 336) {
-            /*
-             * vendrel was set incorrectly for 3.3.4 and 3.3.5, so handle
-             * those cases here.
-             */
-            printf("%d.%d.%d", vendrel / 100,
-                              (vendrel / 10) % 10,
-                               vendrel       % 10);
-        } else if (vendrel < 3900) {
-            /* 3.3.x versions, other than the exceptions handled above */
-            printf("%d.%d", vendrel / 1000,
-                           (vendrel /  100) % 10);
-            if (((vendrel / 10) % 10) || (vendrel % 10)) {
-                printf(".%d", (vendrel / 10) % 10);
-                if (vendrel % 10) {
-                    printf(".%d", vendrel % 10);
-                }
-            }
-        } else if (vendrel < 40000000) {
-            /* 4.0.x versions */
-            printf("%d.%d", vendrel / 1000,
-                           (vendrel /   10) % 10);
-            if (vendrel % 10) {
-                printf(".%d", vendrel % 10);
-            }
-        } else {
-            /* post-4.0.x */
-            printf("%d.%d.%d", vendrel / 10000000,
-                              (vendrel /   100000) % 100,
-                              (vendrel /     1000) % 100);
-            if (vendrel % 1000) {
-                printf(".%d", vendrel % 1000);
-            }
-        }
+        printf("X.Org version: ");
+	printf("%d.%d.%d", vendrel / 10000000,
+	       (vendrel /   100000) % 100,
+	       (vendrel /     1000) % 100);
+	if (vendrel % 1000) {
+	    printf(".%d", vendrel % 1000);
+	}
     }
 </verb></tscreen>
 

Index: XKB-Config.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/XKB-Config.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/XKB-Config.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,4 +1,6 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
+<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+]>
 
 <article>
 <title>The XKB Configuration Guide
@@ -6,11 +8,10 @@
 <date>25 November 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.3 2003/04/07 15:29:21 eich Exp $
 </ident>
 
 <abstract>
-This document describes how to configure XFree86 XKB from a user's point
+This document describes how to configure X11R&relvers; XKB from a user's point
 a few. It converts basic configuration syntax and gives also a few examples.
 </abstract>
 
@@ -44,17 +45,17 @@
 </itemize>
 <p>
 The proper rules file depends on your vendor. In reality, the commonest
-file of rules is <tt>xfree86</tt>. For each rules file there is a description
-file named <tt>&lt;vendor-rules&gt;.lst</tt>, for instance <tt>xfree86.lst</tt> 
+file of rules is <tt>xorg</tt>. For each rules file there is a description
+file named <tt>&lt;vendor-rules&gt;.lst</tt>, for instance <tt>xorg.lst</tt> 
 which is located in xkb configuration subdirectory <tt>rules</tt> (for example 
 <tt>/etc/X11/xkb/rules</tt>).
 
 <sect1>Basic Configuration
 <p>
 Let's say you want to configure a PC style America keyboard with 104
-keys as described in <tt>xfree86.lst</tt>. It can be done by simply writing
-several lines from below to you XFree86 configuration file (often
-found as <tt>/etc/X11/XF86Config-4</tt> or <tt>/etc/X11/XF86Config</tt>):
+keys as described in <tt>xorg.lst</tt>. It can be done by simply writing
+several lines from below to you xorg.conf configuration file (previously known
+as <tt>/etc/X11/XF86Config-4</tt> or <tt>/etc/X11/XF86Config</tt>):
 <tscreen><verb>
 Section "InputDevice"
     Identifier "Keyboard1"
@@ -73,14 +74,14 @@
 Of course, this can be also done at runtime using utility setxkbmap.
 Shell command loading the same keyboard mapping would look like:
 <tscreen><verb>
-setxkbmap -rules xfree86 -model pc104 -layout us -option ""
+setxkbmap -rules xorg -model pc104 -layout us -option ""
 </verb></tscreen>
 The configuration and the shell command would be very analogical
 for most other layouts (internationalized mappings). 
 
 <sect1>Advanced Configuration
 <p>
-Since XFree86 4.3.x you can use multi-layouts xkb configuration.
+You can use multi-layouts xkb configuration.
 What does it mean? Basically it allows to load up to four different
 keyboard layouts at a time. Each such layout would reside in its
 own group. The groups (unlike complete keyboard remapping) can be
@@ -105,7 +106,7 @@
 Of course, this can be also done at runtime using utility setxkbmap.
 Shell command loading the same keyboard mapping would look like:
 <tscreen><verb>
-setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+setxkbmap -rules xorg -model logicordless -layout "us,cz,de" \
          -option "grp:alt_shift_toggle"
 </verb></tscreen>
 
@@ -135,7 +136,7 @@
 <p>
 Analogically, the loading runtime will change to:
 <tscreen><verb>
-setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+setxkmap -rules xorg -model logicordless -layout "us,cz,de" \
          -variant ",bksl," -option "grp:alt_shift_toggle"
 </verb></tscreen>
 
@@ -154,7 +155,7 @@
 This method is rather "brute force". You precisely need to know the structure
 and the meaning of all of used configuration components. 
 <p>
-This method also exposes all xkb configuration details directly into XFree86
+This method also exposes all xkb configuration details directly into xorg.conf
 configuration file which is a not very fortunate fact.
 In rare occasions it may be needed, though. So how does it work?
 
@@ -185,7 +186,7 @@
     Identifier "Keyboard0"
     Driver "Keyboard"
 
-    Option "XkbKeycodes" "xfree86"
+    Option "XkbKeycodes" "xorg"
     Option "XkbTypes"    "default"
     Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"
     Option "XkbGeometry" "pc(pc104)"
@@ -193,7 +194,7 @@
 EndSection
 </verb></tscreen>
 
-This configuration sets the standard XFree86 default interpretation of keyboard 
+This configuration sets the standard X server default interpretation of keyboard 
 keycodes, sets the default modificator types. The
 symbol table is composed of extended US keyboard layout in its
 variant for pc keyboards with 104 keys plus all keys

Index: XKB-Enhancing.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/XKB-Enhancing.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/XKB-Enhancing.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN">
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN">
 
 <article>
 <title>How to further enhance XKB configuration
@@ -6,7 +6,6 @@
 <date>25 November 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.1 2002/12/10 03:52:56 dawes Exp $
 </ident>
 
 <abstract>
@@ -35,7 +34,7 @@
 
 <p>
 Note that this document covers only enhancements which
-are to be made to XFree86 version 4.3.x and above.
+are to be made to XFree86 version 4.3 and X11R6.7.0 and above.
 
 
 <sect>The Basics
@@ -117,7 +116,7 @@
 <p>
 <sect1>Levels And Groups
 <p>
-Since XFree86 4.3.0 you can use <bf>multi-layout</bf> concept of xkb 
+Since XFree86 4.3.0 and X11R6.7.0 you can use <bf>multi-layout</bf> concept of xkb 
 configuration.
 Though it is still in boundaries of xkb protocol and general ideas, the
 keymap designer must obey new rules when creating new maps. In exchange
@@ -453,7 +452,7 @@
 ! model 	                =	keycodes
   macintosh_old	                =	macintosh
   ...
-  *		                =	xfree86
+  *		                =	xorg
   
 ! model		                =	symbols
   hp		                =	+inet(&percnt;m)
@@ -478,7 +477,7 @@
 <tt>macintosh_old</tt> instructs xkb to take definitions of keycodes
 from file <tt>keycodes/macintosh</tt> while the rest of models
 (represented by a wild card '<tt>*</tt>') instructs it to take them from
-file <tt>keycodes/xfree86</tt>. The wild card represents all possible
+file <tt>keycodes/xorg</tt>. The wild card represents all possible
 values on the left side which were not found in any of the previous rules.
 The more specialized (more complete) rules have higher precedence than general 
 ones, i.e. the more general rules supply reasonable default values.

Index: apm.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/apm.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.3
+++ b/apm.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.4
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,7 +8,7 @@
 	 Henrik Harmsen (<email>Henrik.Harmsen at erv.ericsson.se</email>)
 <date> 6 March 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.4 2003/10/19 19:47:17 dawes Exp $
+$Id$ 
 </ident>
 <toc>
 
@@ -37,7 +37,7 @@
 
 <sect> Acceleration
 <p>
-The apm driver uses the XAA (XFree86 Acceleration Architecture) in the 
+The apm driver uses the XAA in the 
 SVGA server. It has support for the following acceleration:
 
 <itemize>
@@ -77,15 +77,15 @@
   Option "ShadowFB"
 </verb>
 
-in your XF86Config file.
+in your xorg.conf file.
 
 <sect> Configuration
 <p>
-First: Run the xf86config program to create a correct
+First: Run the xorgconfig program to create a correct
 configuration.
 
 You can turn off hardware cursor by inserting the following line in the
-Device section of the XF86Config file:
+Device section of the xorg.conf file:
 <verb>
   Option "SWcursor"
 </verb>

Index: ati.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/ati.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/ati.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -15,11 +15,12 @@
 
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.42 2003/01/20 03:43:07 dawes Exp $
+$Id$ 
+Based on XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.42 2003/01/20 03:43:07 dawes Exp 
 </ident>
 
 <abstract>
-This is the README for the XFree86 ATI driver included in this release.
+This is the README for the XAA ATI driver included in this release.
 </abstract>
 
 <!-- Table of contents -->
@@ -46,8 +47,8 @@
 <it>and</it> the user has requested such support.
 </itemize>
 Thus, the level of support provided not only depends on what the driver detects
-in the system, but also, on what the user specifies in the XF86Config file.
-See the <bf>``XF86Config specifications''</bf> section below for details.<p>
+in the system, but also, on what the user specifies in the xorg.conf file.
+See the <bf>``xorg.conf specifications''</bf> section below for details.<p>
 If none of the above conditions are met, the ATI driver will essentially
 disable itself to allow other drivers to examine the system.<p>
 Note that I am currently considering removing the driver's support for generic
@@ -138,18 +139,18 @@
 The driver <it>does</it> however support the accelerator CRTC present in all
 ATI Mach64 adapters.
 For 256-colour, and higher depth modes, this support will be used by default,
-although an XF86Config option can be specified to use the SuperVGA CRTC
+although an xorg.conf option can be specified to use the SuperVGA CRTC
 instead.
 A linear video memory aperture is also available in 256-colour and higher depth
 modes and enabled by default if a 264xT or 3D Rage controller is detected or,
 on 88800 controllers, if the accelerator CRTC is used.
-XF86Config options are available to disable this aperture, or (for non-PCI
+xorg.conf options are available to disable this aperture, or (for non-PCI
 adapters) enable it or move it to some other address.<p>
 By default, the driver provides some acceleration for Mach64 if the accelerator
 CRTC is used, and modes whose colour depth greater than or equal to 8 are to be
 used.
 This support is as yet incomplete and can be disabled entirely with an
-XF86Config option.<p>
+xorg.conf option.<p>
 On non-Intel platforms, the driver can, currently, only support PCI Mach64
 adapters.<p>
 <sect>Current implementation of generic VGA support for non-ATI adapters<p>
@@ -157,7 +158,7 @@
 undergone only limited testing.
 The driver will intentionally disallow the use of this support with ATI
 adapters.
-This support must be explicitly requested through an XF86Config ChipSet
+This support must be explicitly requested through an xorg.conf ChipSet
 specification.
 This prevents the current VGA generic driver from being disabled.<p>
 This driver's generic VGA support is intended as an extension of that provided
@@ -174,8 +175,8 @@
 <item>Interlaced modes are not available.
 <item>Colour depths higher than 8 are not available.
 </itemize>
-<sect>XF86Config specifications<p>
-The driver recognises a number of XF86Config options.
+<sect>xorg.conf specifications<p>
+The driver recognises a number of xorg.conf options.
 In general, all such options should be specified in a ``Device'' section, and
 affect only that ``Device'' section.<p>
 Those options that affect how the driver associates adapters with ``Device''
@@ -248,7 +249,7 @@
 section to the one with the specified PCI Bus ID.
 This specification excludes non-PCI adapters.<p>
 <sect1>Clocks<p>
-For the purpose of specifying a clock line in your XF86Config, one of four
+For the purpose of specifying a clock line in your xorg.conf, one of four
 different situations can occur, as follows.<p>
 Those configuring the driver's generic VGA support for a non-ATI adapter,
 can skip ahead to the <bf>``Clocks for non-ATI adapters''</bf> section below.
@@ -274,14 +275,14 @@
 generator used by the adapter.<p>
 The driver currently supports all programmable clock generators known to exist
 on Mach64 adapters.
-In this case, the driver will completely ignore any XF86Config clock
+In this case, the driver will completely ignore any xorg.conf clock
 specification, and programme the clock generator as needed by the modes used
 during the X session.<p>
 <sect2>Clocks for unsupported programmable clock generators<p>
 This case is unlikely to occur, but is documented for the sake of
 completeness.<p>
 In this situation, the driver will probe the adapter for clock frequencies
-unless XF86Config clocks are already specified.
+unless xorg.conf clocks are already specified.
 In either case, the driver will then attempt to normalise the clocks to one of
 the following specifications:
 <verb>
@@ -372,12 +373,12 @@
 The order of the clocks <it>is</it> very important, although the driver will
 reorder the specified clocks if it deems it appropriate to do so.
 Mach32 and Mach64 owners should note that this order is different than what
-they would use for previous XFree86 accelerated servers.<p>
+they would use for previous accelerated servers.<p>
 <sect2>Clocks for non-ATI adapters<p>
-If no clocks are specified in the XF86Config, the driver will probe for four
+If no clocks are specified in the xorg.conf, the driver will probe for four
 clocks, the second of which will be assumed to be 28.322 MHz.
 The first clock will typically be 25.175 MHz, but there are exceptions.
-You can include up to four clock frequencies in your XF86Config to specify the
+You can include up to four clock frequencies in your xorg.conf to specify the
 actual values used by the adapter.
 Any more will be ignored.<p>
 <sect1>Option <it>``nopanel_display''</it><p>
@@ -479,8 +480,8 @@
 as described under the heading <bf>``Clocks for unsupported programmable clock
 generators''</bf> above.<p>
 <sect>Video modes<p>
-Mode timings can be derived from the information in XFree86's doc subdirectory.
-However, it is no longer required to specify such timings in an XF86Config's
+Mode timings can be derived from the information in X's doc subdirectory.
+However, it is no longer required to specify such timings in an xorg.conf's
 ``Monitor'' section(s), if only standard mode timings are to be used.
 The server automatically inserts VESA standard mode timings in every
 ``Monitor'' section, and these modes will be checked first for mode constraints
@@ -498,7 +499,7 @@
 The driver also inserts timings for a mode called <it>"Native panel mode"</it>
 that represents the panel's native resolution.<p>
 <sect>Known problems and limitations<p>
-There are several known problems or limitations related to the XFree86 ATI
+There are several known problems or limitations related to the ATI
 driver.
 They include:<p>
 <itemize>
@@ -544,7 +545,7 @@
 For now, clocks will, by default, be limited to 80MHz, 135MHz, 170MHz, 200MHz
 or 230MHz, depending on the specific controller.
 This limit can only be increased (up to a driver-calculated absolute maximum)
-through the DACSpeed specification in XF86Config.
+through the DACSpeed specification in xorg.conf.
 Be aware however that doing so is untested and might damage the adapter.
 <item>Except as in the previous items, clocks are limited to 80MHz on most
 adapters, although many are capable of higher frequencies.
@@ -580,18 +581,18 @@
 <sect>Reporting problems<p>
 If you are experiencing problems that are not already recorded in this
 document, first ensure that you have the latest current release of this driver
-and XFree86.
-Check the server's log (usually found in /var/log/XFree86.0.log) and <htmlurl
-name="ftp://ftp.xfree86.org/pub/XFree86"
-url="ftp://ftp.xfree86.org/pub/XFree86"> if you are uncertain.<p>
-Secondly, please check XFree86's doc directory for additional information.<p>
+and the Xorg X server..
+Check the server's log (usually found in /var/log/Xorg.0.log) and <htmlurl
+name="ftp://ftp.freedesktop.org/pub/Xorg"
+url="ftp://ftp.freedesktop.org/pub/Xorg"> if you are uncertain.<p>
+Secondly, please check Xorg's doc directory for additional information.<p>
 Thirdly, a scan through the comp.windows.x.i386unix and comp.os.linux.x
-newsgroups and the xfree86 mailing list using your favourite archiving
+newsgroups and the xorg mailing list using your favourite archiving
 service can also prove useful in resolving problems.<p>
 If you are still experiencing problems, you can send me <it>non-HTMLised</it>
 e-mail at <email>tsi at xfree86.org</email>.
 Please be as specific as possible when describing the problem(s), and include
-an <it>unedited</it> copy of the server's log and the XF86Config file used.<p>
+an <it>unedited</it> copy of the server's log and the xorg.conf file used.<p>
 <sect>Driver history<p>
 The complete history of the driver is rather cloudy.
 The following is more than likely to be incomplete and inaccurate.<p>

Index: chips.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/chips.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/chips.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
  
@@ -7,11 +7,10 @@
 <!-- Title information -->
 <title> Information for Chips and Technologies Users
 <author> David Bateman (<email>dbateman at club-internet.fr</email>),
-         Egbert Eich (<email>eich at xfree86.org</email>)
+         Egbert Eich (<email>eich at freedesktop.org</email>)
 <date> 1st January 2001
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/chips.sgml,v 3.36 2001/05/19 00:35:42 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
@@ -19,7 +18,12 @@
 
 <sect> Introduction <p>
 
-With the release of XFree86 version &relvers;, the Chips and Technologies
+The Chips and Technologies driver release in X11R&relvers; came from XFree86
+4.4 rc2; this document was originally included in that release and has been
+updated modestly to reflect differences between X11R&relvers; and XFree86
+4.4 rc2.
+
+With the release of XFree86 version 4.0, the Chips and Technologies
 driver has been extensively rewritten and contains many new features.
 This driver must be considered work in progress, and those users
 wanting stability are encouraged to use the older XFree86 3.3.x
@@ -149,7 +153,7 @@
 </descrip>
 
 
-<sect> XF86Config Options <p>
+<sect> xorg.conf Options <p>
 
 The following options are of particular interest to the Chips and
 Technologies driver. It should be noted that the options are case
@@ -227,7 +231,7 @@
 Option "UseModeline"
 </tag>
 	The flat panel timings are related to the panel size and not the
-	size of the mode specified in XF86Config. For this reason the
+	size of the mode specified in xorg.conf. For this reason the
 	default behaviour of the server is to use the panel timings already
 	installed in the chip. The user can force the panel timings to be
 	recalculated from the modeline with this option. However the panel
@@ -563,8 +567,7 @@
 display. In fact the timing for the flat panel are dependent on the
 specification of the panel itself and are independent of the particular
 mode chosen. For this reason it is recommended to use one of the programs
-that automatically generate XF86Config files, such as "<tt>xf86config</tt>"
-or "<tt>XF86Setup</tt>".
+that automatically generate xorg.conf files, such as "<tt>xorgconfig</tt>".
 
 However there are many older machines, particularly those with 800x600
 screen or larger, that need to reprogram the panel timings. The reason
@@ -606,16 +609,17 @@
 
 <sect> Dual Display Channel<p>
 
-XFree86 releases later than 4.1.0 support dual-channel display on the ct69030. 
-This support can be used to give a single display image on two screen with
-different refresh rates, or entirely different images on the two displays.
+XFree86 releases later than 4.1.0 and X.Org releases later than 6.7.0  support dual-channel
+display on the ct69030.  This support can be used to give a single
+display image on two screen with different refresh rates, or entirely
+different images on the two displays.
 
 Dual refresh rate display can be selected with the "<tt>DualRefresh</tt>"
 option described above. However to use the dual-head support is slightly
 more complex. Firstly, the ct69030 chipset must be installed on a PCI bus. This
 is a driver limitation that might be relaxed in the future. In addition the
-device, screen and layout sections of the "<tt>XF86Config</tt>" must be
-correctly configured. A sample of an incomplete "<tt>XF86Config</tt>" is
+device, screen and layout sections of the "<tt>xorg.conf</tt>" must be
+correctly configured. A sample of an incomplete "<tt>xorg.conf</tt>" is
 given below
 
 <quote><verb>
@@ -748,7 +752,7 @@
 
 in your startx log file. Note that many chips are capable of higher
 memory clocks than actually set by BIOS. You can use the "<tt>SetMClk</tt>"
-option in your XF86Config file to get a higher MClk. However some
+option in your xorg.conf file to get a higher MClk. However some
 video ram, particularly EDO, might not be fast enough to handle this,
 resulting in drawing errors on the screen. The formula to determine the
 maximum usable dotclock on the HiQV series of chips is
@@ -920,7 +924,7 @@
 	chip. If the user has used the "<tt>UseModeline</tt>" or
 	"<tt>FixPanelSize</tt>" options the panel timings are derived
 	from the mode, which can be different than the panel size. Try
-	deleting theses options	from XF86Config or using an LCD/CRT switch.
+	deleting theses options	from xorg.conf or using an LCD/CRT switch.
 <tag> I can't get a 320x240 mode to occupy the whole 640x480 LCD</tag>
 	There is a bug in the 6554x's H/W cursor for modes that are
 	doubled vertically. The lower half of the screen is not accessible.
@@ -941,7 +945,7 @@
 	the virtual console and back.
 <tag> The right hand edge of the mode isn't visible on the LCD</tag>
 	This is usually due to a problem with the "<tt>LcdCenter</tt>"
-	option. If this option is removed form XF86Config, then the problem
+	option. If this option is removed form xorg.conf, then the problem
 	might go away. Alternatively the manufacturer could have incorrectly
 	programmed the panel size in the EGA console mode. The
 	"<tt>FixPanelSize</tt>" can be used to force the modeline values into
@@ -980,11 +984,11 @@
 	The XVideo extension has only recently been added to the chips driver.
 	Some YUV to RGB colour have been noted at 15 and 16 bit colour depths.
 	However, 8 and 24 bit colour depths seem to work fine.
-<tag> My ct69030 machine locks up when starting XFree86</tag>
+<tag> My ct69030 machine locks up when starting X</tag>
 	The ct69030 chipset introduced a new dual channel architecture. In its
-	current form, XFree86 can not take advantage of this second display
+	current form, X can not take advantage of this second display
 	channel. In fact if the video BIOS on the machine sets the ct69030
-	to a dual channel mode by default, XFree86 will lockup hard at this
+	to a dual channel mode by default, X will lockup hard at this
 	point. The solution is to use the BIOS setup to change to a single
 	display channel mode, ensuring that both the IOSS and MSS registers
 	are set to a single channel mode. Work is underway to fix this.
@@ -1005,7 +1009,7 @@
 <verb>
 	  startx -- -depth 24 -fbbpp 32   8-8-8 RGB truecolor
 </verb>
-	however as XFree86 version &relvers; allows 32bpp pixmaps to be
+	however as X11R&relvers; allows 32bpp pixmaps to be
 	used with framebuffers operating in 24bpp, this mode of operating
 	will cost performance for no gain in functionality.
 
@@ -1037,17 +1041,16 @@
 
   If you are having driver-related problems that are not addressed by this
   document, or if you have found bugs in accelerated functions, you can
-  try contacting the XFree86 team (the current driver maintainer can be
-  reached at <email>dbateman at club-internet.fr</email> or 
-  <email>eich at xfree86.org</email>),
-  or post in the Usenet newsgroup "<it>comp.windows.x.i386unix</it>".
+  try contacting the Xorg team (the current driver maintainer can be
+  reached at <email>eich at freedesktop.org</email>).
 
 <sect> Disclaimer <p>
 
-XFree86, allows the user to do damage to their hardware with software.
+The Xorg X server, allows the user to do damage to their hardware with 
+software with old monitors which may not tolerate bad display settings.
 Although the authors of this software have tried to prevent this, they
 disclaim all responsibility for any damage caused by the software. Use
-caution, if you think the Xserver is frying your screen, TURN THE COMPUTER
+caution, if you think the X server is frying your screen, TURN THE COMPUTER
 OFF!!
 
 <sect> Acknowledgement <p>

Index: cyrix.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/cyrix.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/cyrix.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -7,7 +7,6 @@
 <author>The XFree86 Project Inc.
 <date>7 March 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.2 1999/08/23 06:18:33 dawes Exp $
 </ident>
 <toc>
 
@@ -28,7 +27,7 @@
 <item>Rather sparse (color depth hardcoded to 8)
 </itemize>
 
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
 <descrip>
 <tag>Option "sw_cursor"</tag>
 disable the hardware cursor. (Code not verified yet!)
@@ -47,7 +46,7 @@
 just after probing for the ``scratchpad size''.  If this is the case,
 email to <email>hecker at cat.dfrc.nasa.gov</email> with the output of 
 <verb>
-XFree86 -probeonly -verbose
+Xorg -probeonly -verbose
 </verb>
 and this will be fixed.
 </itemize>

Index: defs.ent
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/defs.ent	5 Mar 2004 13:40:10 -0000	1.1.4.5
+++ b/defs.ent	15 Apr 2004 10:16:15 -0000	1.1.4.6
@@ -3,21 +3,21 @@
 <!-- shared entity definitions for the XFree86 documentation -->
 
 <!-- XFree86 version string -->
-<!ENTITY relvers CDATA "4.4.0">
-<!ENTITY prevrelvers CDATA "4.3.0">
-<!ENTITY fullrelvers CDATA "4.4.0">
-<!ENTITY prevfullrelvers CDATA "4.3.0">
-<!ENTITY nextfullrelvers CDATA "4.5.0">
+<!ENTITY relvers CDATA "6.7.0">
+<!ENTITY prevrelvers CDATA "6.6.0">
+<!ENTITY fullrelvers CDATA "6.7.0">
+<!ENTITY prevfullrelvers CDATA "6.6.0">
+<!ENTITY nextfullrelvers CDATA "7.0.0">
 <!ENTITY nextfullreldate CDATA "mid-late 2004">
-<!ENTITY nextupdrelvers CDATA "4.4.1">
+<!ENTITY nextupdrelvers CDATA "6.7.1">
 <!ENTITY srcvers CDATA "440">
-<!ENTITY prevsrcvers CDATA "430">
+<!ENTITY prevsrcvers CDATA "660">
 <!ENTITY fullsrcvers CDATA "440">
-<!ENTITY prevfullsrcvers CDATA "430">
+<!ENTITY prevfullsrcvers CDATA "660">
 <!ENTITY whichfullrel CDATA "seventh">
 <!ENTITY whichupdaterel CDATA "none">
-<!ENTITY reltag CDATA "xf-4_4_0">
-<!ENTITY relbranchtag CDATA "xf-4_4-branch">
+<!ENTITY reltag CDATA "XORG-6_7_0">
+<!ENTITY relbranchtag CDATA "XORG-6_7-branch">
 <!ENTITY rcnum CDATA "0">
 
 <!-- Version of the most recent 3.3.x release -->

Index: dps.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/dps.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/dps.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,19 +1,38 @@
-<!doctype LINUXDOC PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!doctype LINUXDOC PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 
-<title>XFree86 and DPS
-<author>Juliusz Chroboczek, <email/jch at xfree86.org/
-<date>27 February 2001</date>
+<title>X and DPS
+<author>Juliusz Chroboczek, <email/jch at pps.jussieu.fr/
+<date>27 February 2001, updated 25 March 2004</date>
 
-<ident>$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/dps.sgml,v 1.1 2001/03/02 02:45:37 dawes Exp $</ident>
+<ident>
+Updated by Jim Gettys.
+$Id$
+</ident>
 
 <toc>
 
 <sect>Introduction
 
+<p> Note that DPS is now obsolete.
+<p>
+At the time when I started this project, there was no decent rendering interface for X11 other than DPS.
+<p>
+Since then, there has been a large amount of work on a simple and clean X server extension, Xrender, which provides the basis for just such an interface.
+<p>
+Rendering libraries that are being built above Xrender include Xft, 
+a font rendering library built on FreeType; 
+Cairo, a geometry rendering library that provides PostScript-like 
+rendering primitives but with intrinsic support for Porter-Duff 
+compositing (transparency); Pango, a high-level typesetting library. 
+<p>
+If your application uses DPS, please consider porting it to the above libraries.
+See <url url="http://dps.sourceforge.net" name="the DPS extension site">
+for more details
+
 <p>Display Postscript (or DPS for short) is a rendering extension for
 X11.  DPS is slightly atypical in that it is based on <it/code
 mobility/, the ability to send executable code from client to server.
@@ -23,7 +42,7 @@
 
 <p>This document does not aim at teaching programming with DPS; it is
 only a summary description of the DPS support code included with
-XFree86.  More information about DPS, including a DPS bibliography, is
+X11&relvers;.  More information about DPS, including a DPS bibliography, is
 available from
 <url url="http://dps.sourceforge.net" name="the DPS extension site">.
 
@@ -40,7 +59,7 @@
 process known as the ``DPS agent.''  In this latter case, the term
 ``server-side'' is somewhat misleading.
 
-At the time of writing, only the client side is included with XFree86;
+At the time of writing, only the client side is included with X11R&relvers;;
 the server side must be obtained separately.  Please see <ref
 id="sec:server-side" name="server side"> later in this document for
 more information.
@@ -49,7 +68,7 @@
 
 <p>The DPS client side consists of four libraries and a number of
 basic tools for programming and configuration; these are all included
-with XFree86.
+with X11&relvers;.
 
 <sect1>Libraries
 
@@ -82,7 +101,7 @@
 subdirectory of the <tt/DPS.tar.gz/ file, available from <url
 url="ftp://dps.sourceforge.net/pub/dps/DPS.tar.gz">.
 
-The source code for <tt/libdpstkXm/ is included with XFree86; however,
+The source code for <tt/libdpstkXm/ is included with X11R&relvers;; however,
 as it depends on Motif, this library is not built by default.
 A GTK-based library providing some of the functionality of
 <tt/libdpstkXm/ is available from
@@ -97,7 +116,7 @@
 <tt/libdps/ need to link with <tt/libXt/, whether they use Xt or not.
 
 This state of affairs is unfortunately true of the version of
-<tt/libdps/ included with XFree86.  We are currently considering
+<tt/libdps/ included with X11R&relvers;.  We are currently considering
 various solutions to this problem (including the use of weak linker
 symbols or splitting off the guilty functions into a separate
 library).
@@ -122,7 +141,7 @@
 
 <sect1>Sample clients
 
-<p>XFree86 contains three sample DPS clients, <tt/dpsinfo/,
+<p>X11R&relvers; contains three sample DPS clients, <tt/dpsinfo/,
 <tt/dpsexec/ and <tt/texteroids/.  They are documented in their
 respective manual pages.
 

Index: fonts.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/fonts.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.4
+++ b/fonts.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -1,24 +1,23 @@
-<!doctype LINUXDOC PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!doctype LINUXDOC PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
 
-<title>Fonts in XFree86
-<author>Juliusz Chroboczek, <email/jch at xfree86.org/
-<date>17 November 2003</date>
+<title>Fonts in X11R6.7
+<author>Juliusz Chroboczek, <email/jch at pps.jussieu.fr/
+<date>25 March 2004</date>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.23 2003/11/24 01:57:56 dawes Exp $
 </ident>
 
 <toc>
 
 <sect>Introduction
 
-<p>This document describes the support for fonts in XFree86.  <ref
+<p>This document describes the support for fonts in X11R6.7.  <ref
 id="sec:installing" name="Installing fonts"> is aimed at the 
-casual user wishing to install fonts in XFree86; the rest of the
+casual user wishing to install fonts in X11R6.7 or XFree86; the rest of the
 document describes the font support in more detail.
 
 We assume some familiarity with digital fonts.  If anything is not
@@ -28,10 +27,10 @@
 
 <sect1>Two font systems
 
-<p>XFree86 includes two font systems: the core X11 fonts system, which
+<p>X includes two font systems: the original core X11 fonts system, which
 is present in all implementations of X11, and the Xft fonts system,
-which is not currently distributed with implementations of X11 that
-are not based on XFree86 but will hopefully be included by them in
+which may not be distributed with implementations of X11 that
+are not based on X11&relvers; but will hopefully be included by them in
 the future
 
 The core X11 fonts system is directly derived from the fonts system
@@ -49,7 +48,7 @@
 
 Xft is not compatible with the core fonts system: usage of Xft
 requires making fairly extensive changes to toolkits (user-interface
-libraries).  While XFree86 will continue to maintain the core fonts
+libraries).  While X.org will continue to maintain the core fonts
 system, toolkit authors are encouraged to switch to Xft as soon as
 possible.
 
@@ -62,14 +61,14 @@
 
 <p>Xft has no configuration mechanism itself, rather it relies upon
 the fontconfig library to configure and customize fonts.  That library
-is not specific to XFree86 or indeed on any particular font output
+is not specific to X11R&relvers; or indeed on any particular font output
 mechanism.  This discussion describes how fontconfig, rather than Xft,
 works.
 
 <sect2>Installing fonts in Xft
 
 <p>Fontconfig looks for fonts in a set of well-known directories that
-include all of XFree86's standard font directories
+include all of X11R6.7's standard font directories
 (`<tt>/usr/X11R6/lib/X11/lib/fonts/*</tt>') by default) as well as a
 directory called `<tt>.fonts/</tt>' in the user's home directory.
 Installing a font for use by Xft applications is as simple
@@ -137,7 +136,7 @@
 &lt;/match&gt;
 </verb></tscreen>
 
-Xft supports sub-pixel rasterisation on LCD displays.  XFree86 should
+Xft supports sub-pixel rasterisation on LCD displays.  X11R67 should
 automatically enable this feature on laptops and when using an LCD
 monitor connected with a DVI cable; you can check whether this was
 done by typing
@@ -196,8 +195,8 @@
 <sect2>Troubleshooting <label id="sec:troubleshooting-xft">
 
 <p>If some Xft-based applications don't seem to notice the changes you
-are making to your configuration files, they may be linked against the
-XFree86 4.2 version of Xft.  In order to fix the problem, you should
+are making to your configuration files, they may be linked against an
+old version of Xft.  In order to fix the problem, you should
 relink them against a current version of Xft; on most systems, it is
 enough to install the current version of the Xft and Fontconfig
 libraries.
@@ -217,9 +216,9 @@
 
 <sect2>Installing bitmap fonts
 
-<p>The XFree86 server can use bitmap fonts in both the cross-platform
+<p>The X11R6.7 server can use bitmap fonts in both the cross-platform
 BDF format and the somewhat more efficient binary PCF format.
-(XFree86 also supports the obsolete SNF format.)
+(X11R6.7 also supports the obsolete SNF format.)
 
 Bitmap fonts are normally distributed in the BDF format.  Before
 installing such fonts, it is desirable (but not absolutely necessary)
@@ -251,7 +250,7 @@
 
 <sect2>Installing scalable fonts
 
-<p>The XFree86 server supports scalable fonts in four formats:
+<p>The X11R6.7 server supports scalable fonts in four formats:
 Type&nbsp;1, Speedo, TrueType and CIDFont.  This section only applies
 to the former three; for information on CIDFonts, please see
 <ref id="sec:cid-fonts" name="Installing CIDFonts"> later in this
@@ -294,7 +293,7 @@
 Munhwa-Regular--UniKS-UCS2-H
 </verb></tscreen>
 
-The CIDFont code in XFree86 requires a very rigid directory
+The CIDFont code in X11R6.7 requires a very rigid directory
 structure.  The main directory must be called `<tt/CID/' (its location
 defaults to `<tt>/usr/X11R6/lib/X11/fonts/CID</tt>' but it may be
 located anywhere), and it should contain a subdirectory for every CID
@@ -357,8 +356,7 @@
 the bitmap fonts; this way, the server will prefer bitmap fonts to
 scalable fonts when an exact match is possible, but will avoid scaling
 bitmap fonts when a scalable font can be used.  (The `<tt/:unscaled/'
-hack, while still supported, should no longer be necessary in XFree86
-4.0 and later.)
+hack, while still supported, should no longer be necessary in X11R&relvers;.)
 
 You may check the font path of the running server by typing the command
 <tscreen><verb>
@@ -388,7 +386,7 @@
 
 <p>The default font path (the one used just after server startup or
 after `<tt/xset fp default/') is specified in the X server's
-`<tt/XF86Config/' file.  It is computed by appending all the
+`<tt/xorg.conf/' file.  It is computed by appending all the
 directories mentioned in the `<tt/FontPath/' entries of the
 `<tt/Files/' section in the order in which they appear.
 <tscreen><verb>
@@ -397,8 +395,8 @@
 FontPath "/usr/local/fonts/bitmap"
 </verb></tscreen>
 
-For more information, please consult the <htmlurl name="XF86Config(5)"
-url="XF86Config.5.html"> manual page.
+For more information, please consult the <htmlurl name="xorg.conf(5)"
+url="xorg.conf.5.html"> manual page.
 
 <sect2>Troubleshooting <label id="sec:troubleshooting-core">
 
@@ -409,13 +407,13 @@
 this doesn't help, it is quite possible that you are trying to use a
 font in a format that is not supported by your server.
 
-XFree86 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType
-and CIDFont font formats.  However, not all XFree86 servers come with
-all the font backends configured in.
+X11R6.7 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType
+and CIDFont font formats.  However, not all X11R6.7 or XFree86 servers 
+come with all the font backends configured in.
 
-On most platforms, the XFree86 servers are <it/modular/: the font
+On most platforms, the X11R6.7 servers are <it/modular/: the font
 backends are included in modules that are loaded at runtime.  The
-modules to be loaded are specified in the `<tt/XF86Config/' file using
+modules to be loaded are specified in the `<tt/xorg.conf/' file using
 the `<tt/Load/' directive:
 <tscreen><verb>
 Load "type1"
@@ -423,7 +421,7 @@
 If you have trouble installing fonts in a specific format, you may
 want to check the server's log file in order to see whether the
 relevant modules are properly loaded.  The list of font modules
-distributed with XFree86 is as follows:
+distributed with X11R6.7 is as follows:
 <itemize>
 <item> <tt/"bitmap"/: bitmap fonts (`<tt/*.bdf/', `<tt/*.pcf/'
 and `<tt/*.snf/');
@@ -439,7 +437,7 @@
 Please note that the argument of the `<tt/Load/' directive is
 case-sensitive.
 
-<sect>Fonts included with XFree86
+<sect>Fonts included with X11R6.7
 
 <sect1>Standard bitmap fonts
 
@@ -449,7 +447,7 @@
 the SI, these fonts are provided in the ISO&nbsp;8859-1 encoding (ISO
 Latin Western-European).
 
-In XFree86, a number of these fonts are provided in Unicode-encoded
+In X11R6.7, a number of these fonts are provided in Unicode-encoded
 font files instead.  At build time, these fonts are split into font
 files encoded according to legacy encodings, a process which allows
 us to provide the standard fonts in a number of regional encodings
@@ -530,7 +528,7 @@
 
 <sect1>Standard scalable fonts
 
-<p>XFree86 includes all the scalable fonts distributed with X11R6.
+<p>X11R6.7 includes all the scalable fonts distributed with X11R6.
 
 <sect2>Standard Type&nbsp;1 fonts
 
@@ -555,7 +553,7 @@
 /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
 </verb></tscreen>
 
-Finally, XFree86 also comes with Type&nbsp;1 versions of Bitstream
+Finally, X11R6.7 also comes with Type&nbsp;1 versions of Bitstream
 Courier and Charter.  These fonts have XLFD
 <tscreen><verb>
 -bitstream-courier-*-*-normal--0-0-0-0-m-0-iso8859-1
@@ -568,7 +566,7 @@
 
 <sect2>Standard Speedo fonts
 
-<p>XFree86 includes Speedo versions of the Bitstream Courier and
+<p>X11R6.7 includes Speedo versions of the Bitstream Courier and
 Charter fonts.  In order to use these fonts, you should ensure that
 your X server is loading the `<tt/Speedo/' font backend; see 
 <ref id="sec:troubleshooting-core" name="Troubleshooting">.
@@ -586,7 +584,7 @@
 
 <sect1>The Bigelow &amp; Holmes Luxi family
 
-<p>XFree86 includes the <it/Luxi/ family of scalable fonts, in both
+<p>X11R6.7 includes the <it/Luxi/ family of scalable fonts, in both
 TrueType and Type&nbsp;1 format.  This family consists of the fonts
 <it/Luxi Serif/, with XLFD
 <tscreen><verb>
@@ -640,11 +638,11 @@
 An earlier version of the Luxi fonts was made available under the
 name <em/Lucidux/.  This name should no longer be used due to trademark
 uncertainties, and all traces of the <em/Lucidux/ name have been
-removed from XFree86.
+removed from X11R6.7.
 
 <sect>More about core fonts <label id="sec:more-core">
 
-<p>This section describes XFree86-specific enhancements to the core
+<p>This section describes X11R6.7-specific enhancements to the core
 X11 fonts system.
 
 <sect1>Core fonts and internationalisation <label id="sec:internationalisation">
@@ -722,7 +720,7 @@
 manual page for more details.
 
 A number of encoding files for common encodings are included with
-XFree86.  Information on writing new encoding files can be found in
+X11R6.7.  Information on writing new encoding files can be found in
 <ref id="sec:format-encoding-directory-files" name="Format of
 encodings directory files"> and <ref id="sec:format-encoding-files"
 name="Format of encoding files"> later in this document.
@@ -1093,7 +1091,7 @@
 
 Since the functionalities for CJKV support introduced by X-TT have been
 merged into the new <it/FreeType/ backend, the X-TT backend will be
-removed from XFree86's tree near the future.  Therefore, the use of
+removed from X11R6.7's tree near the future.  Therefore, the use of
 <it/FreeType/ backend is preferred over the X-TT backend.
 
 General information on X-TrueType may be found at <url
@@ -1258,7 +1256,7 @@
 
 <sect>References
 
-<p>XFree86 comes with extensive documentation in the form of manual
+<p>X11R6.7 comes with extensive documentation in the form of manual
 pages and typeset documents.  Before installing fonts, you really should
 read the <htmlurl name="fontconfig(3)" url="fontconfig.3.html"> and
 <htmlurl name="mkfontdir(1)" url="mkfontdir.1.html"> manual pages; other
@@ -1270,10 +1268,10 @@
 Font Description document, by Jim Flowers, which is provided in the file
 `<tt>xc/doc/xlfd.PS.Z</tt>'.
 
-The latest released version of the XFree86 documentation (including
-this document and all manual pages) is available as
-<url name="current XFree86 documentation"
-     url="http://www.xfree86.org/current/">.
+The latest released version of the X11R6.7 documentation (including
+this document and all manual pages) can be found from
+<url name="current X11R6.7 documentation"
+     url="http://wiki.x.org/">.
 
 The <url name="comp.fonts FAQ"
          url="http://www.netmeg.net/faq/computers/fonts/">, 

Index: i740.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/i740.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/i740.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -7,7 +7,6 @@
 <author>Precision Insight, Inc.
 <date>18 February 1999
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/i740.sgml,v 1.2 1999/08/23 06:18:34 dawes Exp $
 </ident>
 <toc>
 
@@ -90,14 +89,14 @@
 <p>
 The driver auto-detects all device information necessary to
 initialize the card.  The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "Intel i740"
            Driver     "i740"
        EndSection
 </verb>
-or let <tt>xf86config</tt> do this for you.
+or let <tt>xorgconfig</tt> do this for you.
 
 However, if you have problems with auto-detection, you can specify:
 <itemize>
@@ -141,7 +140,9 @@
    <item>Daryll Strauss <email>daryll at precisioninsight.com</email>
 </itemize>
 
-This driver was donated to The XFree86 Project by:
+The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
 <verb>
     Precision Insight, Inc.
     Cedar Park, TX

Index: i810.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/i810.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/i810.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/i810.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -71,14 +71,14 @@
 <p>
 The driver auto-detects all device information necessary to
 initialize the card.  The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "Intel i810"
            Driver     "i810"
        EndSection
 </verb>
-or let <tt>xf86config</tt> do this for you.
+or let <tt>xorgconfig</tt> do this for you.
 
 However, if you have problems with auto-detection, you can specify:
 <itemize>
@@ -120,7 +120,9 @@
    <item>Keith Whitwell
 </itemize>
 
-This driver was donated to The XFree86 Project by:
+The X11R&relvers; version of this driver originally came from XFree86 4.4 rc2.
+
+The XFree86 version of this driver was donated to The XFree86 Project by:
 <verb>
     Precision Insight, Inc.
     Cedar Park, TX

Index: index.pre
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/index.pre	5 Mar 2004 13:40:10 -0000	1.1.4.4
+++ b/index.pre	15 Apr 2004 10:16:15 -0000	1.1.4.5
@@ -6,9 +6,9 @@
 <article>
 
 <!-- Title information -->
-<title>Documentation for XFree86&trade; version &relvers;
-<author>The XFree86 Project, Inc
-<date>29 February 2004
+<title>Documentation for the X Window System Version 11 Release &relvers; (X11R&relvers;)
+<author>The X.Org Foundation
+<date>6 April 2004
 
 <!--
 $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.23 2004/02/15 02:16:49 dawes Exp $ 

Index: mouse.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/mouse.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/mouse.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,31 +1,30 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
 <article>
-<title>Mouse Support in XFree86
+<title>Mouse Support in X11R6.7
 <author>Kazutaka Yokota
 <date>17 December 2002
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.12 2002/02/22 21:45:13 dawes Exp $
 </ident>
 
 <toc>
  
 <sect>Introduction <p>
 
-This document describes mouse support in XFree86 &relvers;.
+This document describes mouse support in X.org Foundation's X11 &relvers; server.
 
 Mouse configuration has often been mysterious task for
 novice users.
 However, once you learn several basics, it is straightforward
 to write the mouse <tt>"InputDevice"</tt>
-section in the <tt>XF86Config</tt> file by hand.
+section in the <tt>xorg.conf</tt> file by hand.
 
 <sect>Supported Hardware <p>
 
-The XFree86 X server supports three classes of mice:
+The X.org Foundation X server supports three classes of mice:
 serial, bus and PS/2 mice.
 
 <descrip>
@@ -41,7 +40,7 @@
 The modern serial mouse conforms to the PnP COM device specification
 so that the host computer can automatically detect the mouse
 and load an appropriate driver.
-The XFree86 X server supports this specification and can detect
+The X server supports this specification and can detect
 popular PnP serial mouse models on most platforms.
 
 <tag>Bus mouse</tag>
@@ -73,7 +72,7 @@
 computers. Several devices can be plugged into this bus, including
 mices and keyboards. 
 
-The XFree86 server includes support for USB mices on some systems.
+The server includes support for USB mices on some systems.
 </descrip>
 
 Many mice nowadays can be used both as a serial mouse and as a PS/2 mouse.
@@ -84,7 +83,7 @@
 adapter with which you can connect the PS/2 mouse to a serial port
 or visa versa.
 
-XFree86 supports the mouse with a wheel, a roller or a knob.
+X11R6.7 supports the mouse with a wheel, a roller or a knob.
 Its action is detected as the Z (third) axis motion of the mouse.
 As the X server or clients normally do not use the Z axis movement of the 
 pointing device, a configuration option, <tt>"ZAxisMapping"</tt>,
@@ -120,7 +119,7 @@
 SP: support is available in a different form
 
 *1 Refer to the following sections for details.
-*2 XFree86/OS2 will support any type of mouse that the OS supports, 
+*2 X11R6.7/OS2 will support any type of mouse that the OS supports, 
    whether it is serial, bus mouse, or PnP type. 
 
 </verb>
@@ -229,11 +228,11 @@
 corresponding to your mouse as the device name.
 
 <sect1>OS/2 <p>
-XFree86/OS2 always uses the native mouse driver of the operating system
+X11R6.7/OS2 always uses the native mouse driver of the operating system
 and will support any type of pointer that the OS supports, whether it is
 serial, bus mouse, or PnP type.
 If the mouse works under Presentation Manager, 
-it will also work under XFree86/OS2.
+it will also work under X11R6.7/OS2.
 
 Always specify <tt>"OSMouse"</tt> as the protocol type.
 
@@ -329,7 +328,7 @@
 adjust itself.
 
 <tag>Serial mouse</tag>
-The XFree86 server supports a wide range of mice, both old and new.
+The server supports a wide range of mice, both old and new.
 If your mouse is of a relatively new model, it may conform to the
 PnP COM device specification and the X server may be able to 
 detect an appropriate protocol type for the mouse automatically.
@@ -389,8 +388,8 @@
 because the X server does not have native support for that model of mouse
 and is using a ``compatible'' protocol according to PnP information.
 
-If you suspect this is the case with your mouse, please send a report to
-<email>XFree86 at XFree86.Org</email>.
+If you suspect this is the case with your mouse, please enter a
+bugreport in bugzilla.freedesktop.org, using the xorg product.
 
 <tag>USB mouse</tag>
 If your mouse is connected to the USB port, it can either be supported 
@@ -407,7 +406,7 @@
 
 </descrip>
 
-<sect>XF86Config Options <p>
+<sect>xorg.conf Options <p>
 
 The old <tt>Pointer</tt> section has been replaced by a more general
 <tt>InputDevice</tt> section.  The following is a minimal example
@@ -469,7 +468,7 @@
 their actions won't be detected by the X server.
 
 NOTE #1: horizontal movement may not always be detected
-by the current version of the XFree86 X servers,
+by the current version of the X11R6.7 X servers,
 because there appears to be no accepted standard as to how the horizontal
 direction is encoded in mouse data.
 
@@ -479,8 +478,7 @@
 and the direction of the second vertical wheel does not match the
 first one's.
 
-Currently this option can not be set in the <tt>XF86Setup</tt> program.
-You need to edit the <tt>XF86Config</tt> file by hand to add this option.
+You need to edit the <tt>xorg.conf</tt> file by hand to add this option.
 
 <sect1>Resolution <p>
 The following option will set the mouse device resolution to <tt>N</tt>
@@ -491,7 +489,6 @@
 </verb>
 
 Not all mice and OSs can support this option.
-This option can be set in the <tt>XF86Setup</tt> program.
 
 <sect1>Drag Lock Buttons <p>
 Some people find it difficult or inconvenient to hold a trackball

Index: newport.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/newport.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/newport.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -7,7 +7,6 @@
 <author>Guido G&uuml;nther
 <date>24 February 2003
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.6 2003/02/25 19:31:02 dawes Exp $
 </ident>
 <toc>
 
@@ -27,7 +26,7 @@
 <sect>Notes
 <p>
 <itemize>
-  <item>X -configure does not generate a XF86Config file.
+  <item>X -configure does not generate a xorg.conf file.
   <item>There's only a 1280x1024 mode.
 </itemize>
 
@@ -36,7 +35,7 @@
 <p>
 The driver auto-detects all device information necessary to
 initialize the card on the Indy. The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "SGI newport"

Index: r128.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/r128.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/r128.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,7 +8,6 @@
 <date>13 June 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/r128.sgml,v 1.7 2000/03/08 15:14:48 dawes Exp $
 </ident>
 
 <toc>
@@ -54,14 +53,14 @@
 <p>
 The driver auto-detects all device information necessary to
 initialize the card.  The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "Rage 128"
            Driver     "r128"
        EndSection
 </verb>
-or let <tt>xf86config</tt> do this for you.
+or let <tt>xorgconfig</tt> do this for you.
 
 However, if you have problems with auto-detection, you can specify:
 <itemize>
@@ -92,6 +91,8 @@
 
 <sect>Authors
 <p>
+The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
+
 The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
 <itemize>
    <item>Rickard E. (Rik) Faith <email>faith at precisioninsight.com</email>

Index: rendition.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/rendition.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.2
+++ b/rendition.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.3
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,7 +8,6 @@
 <date>9 June 2000, last update by Dejan Ilic <email>dejan.ilic at home.se</email>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 2000/06/17 02:30:33 dawes Exp $
 </ident>
 
 <toc>
@@ -20,7 +19,7 @@
 <sect>Limitations <p>
 V1000 cards can only work as primary display card due to hardware limitations. <p>
 V2x00 cards can work even if not primary, but primary display card will be disabled when server is run. This is a driver limitation.<p>
-Hopefully these limitations will be workaround and fixed before final XFree86 4.0 release.<p>
+Hopefully these limitations were worked around and fixed before final XFree86 4.0 release.<p>
 
 <sect>Important notices <p>
 Some V1000-based video cards are known to lock up the computer if you have write-combine activated. Disabling it removes the problem. Look for settings in the motherboards BIOS and disable ALL settings that has to do with write-combine (usually called USWC or just WC for short). <p>
@@ -47,7 +46,7 @@
 </itemize>
 </itemize>
 
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
 <descrip>
 <tag>Option "SW_Cursor"</tag>
 Disables use of the hardware cursor.
@@ -60,7 +59,10 @@
 <tag>Option "FramebufferWC"</tag>
 If writecombine is disabled in BIOS, and you add this option in configuration file, then the driver will try to request writecombined access to the framebuffer. This can drastically increase the performance on unaccelerated server. Requires that "MTRR"-support is compiled into the OS-kernel.
 <tag>Option "NoDDC"</tag>
-Disable probing of DDC-information from your monitor. This information is not used yet and is only there for informational purposes. This might change before final XFree86 4.0 release. Safe to disable if you experience problems during startup of X-server.
+Disable probing of DDC-information from your monitor. This information is
+not used yet and is only there for informational purposes. This might
+have changed before final XFree86 4.0 release. Safe to disable if you experience
+problems during startup of X-server.
 <tag>Option "ShadowFB"</tag>
 If this option is enabled, the driver will cause the CPU to do each drawing
 operation first into a shadow frame buffer in system virtual memory and then
@@ -77,7 +79,10 @@
 The option is not activated by default.
 </descrip>
 
-<sect>News in this release (XFree86 4.1)<p>
+<sect>News in the X11R&relvers; release<p>
+This driver was originally part of the XFree86 4.4 rc2 release.
+
+<sect>News in the XFree86 4.1 release <p>
 <itemize>
 <item>DirectColor support
 <item>SilkenMouse support

Index: s3virge.sgml
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/s3virge.sgml	5 Mar 2004 13:40:10 -0000	1.1.4.1
+++ b/s3virge.sgml	15 Apr 2004 10:16:15 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,18 +8,15 @@
 <date>19 Dec 2001
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.5 2001/12/21 21:01:57 dawes Exp $
 </ident>
 
 <toc>
 
 <sect> Supported hardware
 <p>
-The s3virge driver in XFree86 &relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets.  It also supports Trio3D and Trio3D/2x chips.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has added support for doublescan modes on DX.
+The s3virge driver in X11R&relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets.  It also supports Trio3D and Trio3D/2x chips.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has added support for doublescan modes on DX.
 
-This driver is moderately stable, however please use caution with any new install.  Please report any problems to
-<email>XFree86 at XFree86.org</email>
-using the appropriate bug report sheet. 
+This driver is moderately stable, however please use caution with any new install.  Please report any problems to bugzilla.freedesktop.org, using the xorg component.
 
 <sect>Features:
 <p>
@@ -44,11 +41,11 @@
 <p>
 
 The driver has several supported options which are documented in the s3virge man
-page.  Please refer to it for additional details about XF86Config options.
+page.  Please refer to it for additional details about configuration options.
 
 <sect>Support:
 <p>
-For support with XFree86 video drivers please refer to our web site at <url name="XFree86" url="http://www.XFree86.org">.  For problems not addressed in the web page please contact our support email address  <email>XFree86 at XFree86.org</email>
+For support with X11R&relvers video drivers please refer to our web site at <url name="wiki.x.org" url="http://wiki.x.org">. 
 
 <sect>Authors
 <p>

--- DRI.sgml DELETED ---

--- DRIcomp.sgml DELETED ---

--- isc.sgml DELETED ---


