[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/doc BUILD, 1.1.4.5.2.4, 1.1.4.5.2.5 README, 1.1.4.5.2.5, 1.1.4.5.2.6 Versions, 1.1.4.2.2.4, 1.1.4.2.2.5

Keith Packard xorg-commit at pdx.freedesktop.org
Tue Apr 6 21:03:51 PDT 2004 

Committed by: keithp

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc
In directory pdx:/tmp/cvs-serv15080/programs/Xserver/hw/xfree86/doc

Modified Files:
      Tag: XORG-RELEASE-1
	BUILD README Versions 
Log Message:
2004-04-06  Keith Packard  <keithp at keithp.com>

	* BUILD:
	* README:
	* RELNOTES:
	* programs/Xserver/hw/xfree86/doc/BUILD 
	* programs/Xserver/hw/xfree86/doc/DESIGN 
	* programs/Xserver/hw/xfree86/doc/Install 
	* programs/Xserver/hw/xfree86/doc/LICENSE 
	* programs/Xserver/hw/xfree86/doc/OS2.Notes 
	* programs/Xserver/hw/xfree86/doc/README 
	* programs/Xserver/hw/xfree86/doc/README.DECtga 
	* programs/Xserver/hw/xfree86/doc/README.Darwin 
	* programs/Xserver/hw/xfree86/doc/README.I128 
	* programs/Xserver/hw/xfree86/doc/README.LynxOS 
	* programs/Xserver/hw/xfree86/doc/README.NetBSD 
	* programs/Xserver/hw/xfree86/doc/README.OpenBSD 
	* programs/Xserver/hw/xfree86/doc/README.SCO 
	* programs/Xserver/hw/xfree86/doc/README.SiS 
	* programs/Xserver/hw/xfree86/doc/README.Solaris 
	* programs/Xserver/hw/xfree86/doc/README.XKB-Config 
	* programs/Xserver/hw/xfree86/doc/README.XKB-Enhancing 
	* programs/Xserver/hw/xfree86/doc/README.apm 
	* programs/Xserver/hw/xfree86/doc/README.ati 
	* programs/Xserver/hw/xfree86/doc/README.chips 
	* programs/Xserver/hw/xfree86/doc/README.cyrix 
	* programs/Xserver/hw/xfree86/doc/README.dps 
	* programs/Xserver/hw/xfree86/doc/README.fonts 
	* programs/Xserver/hw/xfree86/doc/README.i740 
	* programs/Xserver/hw/xfree86/doc/README.i810 
	* programs/Xserver/hw/xfree86/doc/README.mouse 
	* programs/Xserver/hw/xfree86/doc/README.newport 
	* programs/Xserver/hw/xfree86/doc/README.r128 
	* programs/Xserver/hw/xfree86/doc/README.rendition 
	* programs/Xserver/hw/xfree86/doc/README.s3virge 
	* programs/Xserver/hw/xfree86/doc/RELNOTES 
	* programs/Xserver/hw/xfree86/doc/Versions 
	Update formatted docs


Index: BUILD
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/BUILD,v
retrieving revision 1.1.4.5.2.4
retrieving revision 1.1.4.5.2.5
diff -u -d -r1.1.4.5.2.4 -r1.1.4.5.2.5
--- a/BUILD	6 Apr 2004 23:33:05 -0000	1.1.4.5.2.4
+++ b/BUILD	7 Apr 2004 04:03:48 -0000	1.1.4.5.2.5
@@ -8,7 +8,7 @@
                                   Abstract
 
      This document describes how to build the X Window System from the
-     X.org monolithic source distribution and is designed to be used in
+     X.Org monolithic source distribution and is designed to be used in
      conjunction with the operating system (OS) specific README files.
 
      NOTE:  Refer to the appropriate OS-specific README file before
@@ -27,8 +27,8 @@
 One way of getting the X11R6.7.0 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 wiki <URL:http://wiki.x.org> The CVS tag
-for this release is "XORG-6_7_0".   The tag for the maintenance branch for
-this release is "XORG-6_7-branch".
+for this release is "xo-6_7_0".   The tag for the maintenance branch for this
+release is "xo-6_7-branch".
 
 Another method of getting the X11R6.7.0 source is to either download the
 6.7.0 source tarballs sites from freedesktop.org using either ftp or http.
@@ -36,48 +36,48 @@
 
    o The X11R6.7.0 source is contained in the files:
 
-          X116.7.0-src1.tar.gz
+          X11R6.7.0-src1.tar.gz
 
-          X116.7.0-src2.tar.gz
+          X11R6.7.0-src2.tar.gz
 
-          X116.7.0-src3.tar.gz
+          X11R6.7.0-src3.tar.gz
 
-          X116.7.0-src4.tar.gz
+          X11R6.7.0-src4.tar.gz
 
-          X116.7.0-src5.tar.gz
+          X11R6.7.0-src5.tar.gz
 
-          X116.7.0-src6.tar.gz
+          X11R6.7.0-src6.tar.gz
 
-          X116.7.0-src7.tar.gz
+          X11R6.7.0-src7.tar.gz
 
      These can be found at ftp://ftp.freedesktop.org/xorg/X11R6.7.0/src/ or
      http://freedesktop.org/~xorg/X11R6.7.0/src/     and similar locations on
-     X.org mirror sites.  X116.7.0-src4.tgz and X116.7.0-src5.tar.gz contains
-     the fonts.  X116.7.0-src6.tar.gz contains the documentation source.
-     X116.7.0-src7.tar.gz contains the hardcopy documentation.
-     X116.7.0-src1.tar.gz, X116.7.0-src2.tar.gz and X116.7.0-src3.tar.gz con-
-     tains everything else.  If you don't need the docs or fonts you can get
-     by with only X116.7.0-src1.tar.gz, X116.7.0-src2.tar.gz and
-     X116.7.0-src3.tar.gz.
+     X.org mirror sites.  X11R6.7.0-src4.tgz and X11R6.7.0-src5.tar.gz con-
+     tains the fonts.  X11R6.7.0-src6.tar.gz contains the documentation
+     source.  X11R6.7.0-src7.tar.gz contains the hardcopy documentation.
+     X11R6.7.0-src1.tar.gz, X11R6.7.0-src2.tar.gz and X11R6.7.0-src3.tar.gz
+     contains everything else.  If you don't need the docs or fonts you can
+     get by with only X11R6.7.0-src1.tar.gz, X11R6.7.0-src2.tar.gz and
+     X11R6.7.0-src3.tar.gz.
 
    o 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 com-
      piled binaries):
 
-          gzip -d < X116.7.0-src1.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src1.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src2.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src2.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src3.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src3.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src4.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src4.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src5.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src5.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src6.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src6.tar.gz | tar vxf -
 
-          gzip -d < X116.7.0-src7.tar.gz | tar vxf -
+          gzip -d < X11R6.7.0-src7.tar.gz | tar vxf -
 
 All methods will produce one main source directory called xc.
 
@@ -96,9 +96,9 @@
 easy to create build problems by changing the default configuration.  Check
 the configuration parameters specified in the xc/config/cf/README.
 
-If you are using just the X116.7.0-src1.tar.gz, X116.7.0-src2.tar.gz and
-X116.7.0-src3.tar.gz parts of the source dist, you will need to define Build-
-Fonts to NO.
+If you are using just the X11R6.7.0-src1.tar.gz, X11R6.7.0-src2.tar.gz and
+X11R6.7.0-src3.tar.gz parts of the source dist, you will need to define
+BuildFonts to NO.
 
 3.  Using a shadow directory of symbolic links for the build
 
@@ -178,23 +178,21 @@
 
 When the build is finished, you should check the World.Log file to see if
 there were any problems.  If there weren't any then you can install the bina-
-ries.  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.  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".
+ries.  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 correct-
+ing 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
-following way instead of the way described above:
+If you would prefer "make World" to ignore errors and build as much as possi-
+ble, run it in the following way instead of the way described above:
 
 for Bourne-like shells:
 
-     make WORLDOPTS= World > World.log 2>&1
+     make WORLDOPTS=-k World > World.log 2>&1
 
 for C-shell variants:
 
-     make WORLDOPTS= World >& World.log
+     make WORLDOPTS=-k World >& World.log
 
 To do the install, run "make install" and "make install.man".  Make sure you
 have enough space in /usr/X11R6 for the install to succeed.  If you want to
@@ -259,6 +257,5 @@
      shown do not match your system, you probably need to set them manually
      in host.def and report the problem to <xorg at freedesktop.org>.
 
-     Generated from Id: BUILD.sgml,v 1.1.4.3.4.3 keithp Exp $
-
+     Generated from Id: BUILD.sgml,v 1.1.4.3.4.2 eich Exp $
 

Index: README
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/README,v
retrieving revision 1.1.4.5.2.5
retrieving revision 1.1.4.5.2.6
diff -u -d -r1.1.4.5.2.5 -r1.1.4.5.2.6
--- a/README	6 Apr 2004 23:33:05 -0000	1.1.4.5.2.5
+++ b/README	7 Apr 2004 04:03:48 -0000	1.1.4.5.2.6
@@ -2,7 +2,7 @@
 
                             The X.Org Foundation
 
-                                25 March 2004
+                                6 April 2004
 
                                   Abstract
 
@@ -114,13 +114,13 @@
 
 The source for version 6.7.0 is split into seven tarballs:
 
-     xorg-6.7.0-1.tgz
-     xorg-6.7.0-2.tgz
-     xorg-6.7.0-3.tgz
-     xorg-6.7.0-4.tgz
-     xorg-6.7.0-5.tgz
-     xorg-6.7.0-6.tgz
-     xorg-6.7.0-7.tgz
+     X11R6.7.0-src1.tar.gz
+     X11R6.7.0-src2.tar.gz
+     X11R6.7.0-src3.tar.gz
+     X11R6.7.0-src4.tar.gz
+     X11R6.7.0-src5.tar.gz
+     X11R6.7.0-src6.tar.gz
+     X11R6.7.0-src7.tar.gz
 
 The first three contain everything except the fonts and general X11 documen-
 tation.  Those three are sufficient for building X11R6.7.0 if you already
@@ -128,32 +128,6 @@
 tains the source for the general X11 documentation.  The seventh contains the
 general X11 documentation in hardcopy format.
 
-A source patch relative to version 6.6.0 is also available.  Because of its
-size, it is split into four parts.  The patch files are:
-
-     X11R6.7.0-6.6.0-6.7.0.diff1.gz
-     X11R6.7.0-6.6.0-6.7.0.diff2.gz
-     X11R6.7.0-6.6.0-6.7.0.diff3.gz
-     X11R6.7.0-6.6.0-6.7.0.diff4.gz
-
-There is also a tarball and a cleanup script that handle files that have com-
-ponents that can't be included in a diff.  These are:
-
-     X11R6.7.0-6.6.0-6.7.0-diff0.tgz
-     X11R6.7.0-6.6.0-6.7.0-cleanup.sh
-
-These patches should be applied to a clean 6.6.0 source tree, working from
-the directory containing the xc/ directory.  The patches should be applied by
-running:
-
-     gzip -d < X11R6.7.0-6.6.0-6.7.0.diff1.gz | patch -p0 -E
-     gzip -d < X11R6.7.0-6.6.0-6.7.0.diff2.gz | patch -p0 -E
-     gzip -d < X11R6.7.0-6.6.0-6.7.0.diff3.gz | patch -p0 -E
-     gzip -d < X11R6.7.0-6.6.0-6.7.0.diff4.gz | patch -p0 -E
-
-     sh X11R6.7.0-6.6.0-6.7.0-cleanup.sh
-     gzip -d < X11R6.7.0-6.6.0-6.7.0-diff0.tgz | tar vxf -
-
 To format the X11R6.7.0 documentation use the latest version of our doctools
 package available from the Xorg CVS repository's "doctools" module.
 
@@ -161,9 +135,9 @@
 versions can also be accessed via the Freedesktop.org CVS repository.  It's
 also possible to browse the freedesktop CVS repository
 <URL:http://cvs.freedesktop.org/>.  The CVS tag for this version is
-"XORG-6_7_0".  The CVS tag for the stable branch for this release is
-"XORG-6_7-branch".  To check out the latest development version, don't spec-
-ify any tag.
+"xo-6_7_0".  The CVS tag for the stable branch for this release is
+"xo-6_7-branch".  To check out the latest development version, don't specify
+any tag.
 
 7.  Reporting Bugs
 
@@ -175,5 +149,5 @@
 as our developers use it to reproduce and debug your problem.  Please attach
 it to your bug report.
 
-     Generated from Id: README.sgml,v 1.1.4.5.2.3 alanc Exp $.
+     Generated from Id: README.sgml,v 1.1.4.5.2.2 eich Exp $.
 

Index: Versions
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/doc/Versions,v
retrieving revision 1.1.4.2.2.4
retrieving revision 1.1.4.2.2.5
diff -u -d -r1.1.4.2.2.4 -r1.1.4.2.2.5
--- a/Versions	6 Apr 2004 23:33:05 -0000	1.1.4.2.2.4
+++ b/Versions	7 Apr 2004 04:03:48 -0000	1.1.4.2.2.5
@@ -21,7 +21,7 @@
 
 Second is the stable bugfix branch for the latest full release (6.7.0).  It
 is created around the time of the release.  The branch for this one is called
-"XORG-6_7-branch".  Fixes for bugs found in the release will be added to this
+"xo-6_7-branch".  Fixes for bugs found in the release will be added to this
 branch (as well as the trunk), and updates to this release (if any) will be
 cut from this branch.  Similar stable branches are present for previous full
 releases.

More information about the xorg-commit-diffs mailing list