cygwin-x-doc/cg cygwin-x-cg.xml, 1.2, 1.3 programming-cross.xml, 1.3,
1.4 programming-distribution.xml, 1.2,
1.3 programming-native.xml, 1.3,
1.4 programming-obtaining-source.xml, 1.1.1.1,
1.2 programming-tree-layout.xml, 1.3, 1.4 programming.xml,
1.1.1.1, 1.2
Harold L Hunt II
xserver-commit at pdx.freedesktop.org
Fri Apr 2 23:14:29 PST 2004
Committed by: harold
Update of /cvs/xserver/cygwin-x-doc/cg
In directory pdx:/tmp/cvs-serv28816/cg
Modified Files:
cygwin-x-cg.xml programming-cross.xml
programming-distribution.xml programming-native.xml
programming-obtaining-source.xml programming-tree-layout.xml
programming.xml
Log Message:
Remove old information, add simpler answer to OpenSSH 3.8 question.
Index: cygwin-x-cg.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/cygwin-x-cg.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/cygwin-x-cg.xml 10 Mar 2004 01:36:51 -0000 1.2
+++ b/cygwin-x-cg.xml 3 Apr 2004 07:14:25 -0000 1.3
@@ -177,6 +177,14 @@
-->
+<revision>
+<revnumber>0.6.6</revnumber>
+<date>2004-04-03</date>
+<authorinitials>harold at codeweavers.com</authorinitials>
+
+<revremark>Remove outdated instructions.</revremark>
+</revision>
+
<revision>
<revnumber>0.6.5</revnumber>
Index: programming-cross.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming-cross.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/programming-cross.xml 9 Nov 2003 23:34:32 -0000 1.3
+++ b/programming-cross.xml 3 Apr 2004 07:14:26 -0000 1.4
@@ -519,7 +519,7 @@
<sect2 id="prog-cross-build">
<title>&title-prog-cross-build;</title>
-<para>Building the source code when cross compiling &xfree; is nearly
+<para>Building the source code when cross compiling &x-window-system; is nearly
identical to the process described below in
<xref linkend="prog-build-native"></xref> of the &title-prog-build-native;
section. One divergence from the aforementioned instructions is that
@@ -612,7 +612,7 @@
<tip>
<para>Never run <command>make install install.man</command> on your
host platform without the <parameter>DESTDIR</parameter> parameter, as
-that will cause the &cygwin; build of &xfree; to be installed over top
+that will cause the &cygwin; build of &x-window-system; to be installed over top
of your local X Window System installation, which would completely
destroy your host system's X Window System installation.</para>
</tip>
@@ -639,7 +639,7 @@
<tip>
<para>Never run <command>makeg install install.man</command> on your
host platform without the <parameter>DESTDIR</parameter> parameter, as
-that will cause the &cygwin; debug build of &xfree; to be installed
+that will cause the &cygwin; debug build of &x-window-system; to be installed
over top of your local X Window System installation, which would
completely destroy your host system's X Window System
installation.</para>
Index: programming-distribution.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming-distribution.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/programming-distribution.xml 9 Nov 2003 23:34:32 -0000 1.2
+++ b/programming-distribution.xml 3 Apr 2004 07:14:26 -0000 1.3
@@ -1,189 +1,26 @@
<sect1 id="prog-distribution">
<title>&title-prog-distribution;</title>
-<para>&project; uses the standard &xfree; distribution build scripts.
-You will need to start by downloading the &xfree; <filename
-class="directory">util</filename> <glossterm
-linkend="gloss-cvs">CVS</glossterm> module. The following
-instructions are paraphrased from <filename>bindist-notes</filename>
-in the &xfree; <filename class="directory">devel</filename> CVS
-module, with adaptations to make them &project; specific.</para>
-
-<orderedlist numeration="arabic">
-
-<listitem>
-<para>Copy
-<filename>xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/host.def</filename>
-to <filename>xc/config/cf/host.def</filename>.</para>
-</listitem>
-
-<listitem>
-<para>Build and install the <command>extract</command> tool from the
-<filename class="directory">utils</filename> module.</para>
-</listitem>
-
-<listitem>
-<para>Run a full build of the &xfree; CVS tree, following the
-instructions in <xref linkend="prog-build-native"></xref>.</para>
-</listitem>
-
-<!--
-<listitem>
-<para>The rest of the instructions must be done as root if cross
-compiling.</para>
-</listitem>
--->
-
-<listitem>
-<para>Install the full build of &xfree; to a staging directory:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-build-std;
-$ mkdir &project-path-stagingdir;
-
-&cygwin-bash-prompt; &project-path-build-std;
-$ make DESTDIR=&project-path-stagingdir; install install.man
-</screen>
-</listitem>
-
-<listitem>
-<para>Create directories for the bindist and commondist:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-build-std;
-$ mkdir &project-path-bindistdir;
-
-&cygwin-bash-prompt; &project-path-build-std;
-$ mkdir &project-path-commondistdir;
-</screen>
-</listitem>
-
-<listitem>
-<para>Copy the bindist and commondist scripts to their respective
-directories:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-xc;
-$ cp programs/Xserver/hw/xfree86/etc/bindist/Cygwin/* &project-path-bindistdir;
-
-&cygwin-bash-prompt; &project-path-xc;
-$ cp programs/Xserver/hw/xfree86/etc/bindist/common/* &project-path-commondistdir;
-</screen>
-</listitem>
-
-<listitem>
-<para>Copy the <command>build-bindist</command> script to somewhere in
-your search path, such as <filename
-class="directory">/usr/bin</filename>:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-xc;
-$ cp programs/Xserver/hw/xfree86/etc/bindist/build-bindist /usr/bin
-</screen>
-</listitem>
-
-<listitem>
-<para>Build the distribution tarballs:</para>
-
-<screen>
-&cygwin-bash-prompt; ~
-$ build-bindist &project-path-stagingdir; &project-path-bindistdir;
-
-&cygwin-bash-prompt; ~
-$ build-bindist &project-path-stagingdir; &project-path-commondistdir;
-</screen>
-</listitem>
-
-<listitem>
-<para>Verify the tarball contents by extracting them in a test
-directory and comparing them to what is in the staging
-directory:</para>
-
-<screen>
-&cygwin-bash-prompt; ~
-$ mkdir -p &project-path-testdir;/usr/X11R6 &project-path-testdir;/etc/X11 &project-path-testdir;/var
-
-&cygwin-bash-prompt; ~
-$ cd &project-path-bindistdir;/bindist
-
-&cygwin-bash-prompt; &project-path-bindistdir;/bindist
-$ extract -C &project-path-testdir;/etc/X11 Xetc.tgz
-
-&cygwin-bash-prompt; &project-path-bindistdir;/bindist
-$ extract -C &project-path-testdir;/var Xvar.tgz
-
-&cygwin-bash-prompt; &project-path-bindistdir;/bindist
-$ extract -C &project-path-testdir;/usr/X11R6 `pwd`/X[a-df-uw-z]*.tgz `pwd`/Xvfb.tgz
-
-&cygwin-bash-prompt; &project-path-bindistdir;/bindist
-$ cd &project-path-commondistdir;/bindist
-
-&cygwin-bash-prompt; &project-path-commondistdir;/bindist
-$ extract -C &project-path-testdir;/usr/X11R6 `pwd`/*.tgz
-
-&cygwin-bash-prompt; &project-path-commondistdir;/bindist
-$ cd &project-path-testdir;; find . ! -type d -print | sort > /tmp/dist.list
-
-&cygwin-bash-prompt; &project-path-testdir;
-$ cd &project-path-stagingdir;; find . ! -type d -print | sort > /tmp/stage.list
-
-&cygwin-bash-prompt; &project-path-stagingdir;
-$ diff -u /tmp/stage.list /tmp/dist.list
-</screen>
-</listitem>
-
-<listitem>
-<para>The following differences are expected because the directories
-referred to are symlinks created by the installation script, other
-differences indicate that the bindist data files need to be fixed:</para>
-
-<itemizedlist>
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/app-defaults</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/fs</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/lbxproxy</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/proxymngr</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/rstart</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/twm</filename></para>
-</listitem>
-
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/xdm</filename></para>
-</listitem>
+<para>&project; uses a custom build and packaging script that
+automates all of the tasks required to build, create binary packages,
+and source code packages.</para>
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/xinit</filename></para>
-</listitem>
+<note>
+<para>These instructions assume that you want to build a distribution
+from the source packages available from &cygwin;'s
+<command>setup.exe</command>. You can use these instructions to build
+a distribution from CVS instead by just replacing references to
+<filename>/usr/src/xc</filename> with the path to the
+<filename>xc/</filename> directory that you checked out of CVS.</para>
+</note>
-<listitem>
-<para><filename>./usr/X11R6/lib/X11/xserver</filename></para>
-</listitem>
+<orderedlist numeration="arabic">
<listitem>
-<para><filename>./usr/X11R6/lib/X11/xsm</filename></para>
-</listitem>
-</itemizedlist>
-</listitem>
+<para>Wait for these instructions to be updated, sometime after
+2004-04-03.</para>
-<listitem>
-<para>Upload <filename>*.tgz</filename> and
-<filename>extract</filename> to your distribution site.</para>
</listitem>
</orderedlist>
Index: programming-native.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming-native.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/programming-native.xml 16 Mar 2004 03:03:26 -0000 1.3
+++ b/programming-native.xml 3 Apr 2004 07:14:26 -0000 1.4
@@ -7,7 +7,7 @@
<title>Compiling the Source Code</title>
<para>Compiling &project; doesn't have to be hard, although the
-&xfree; source code tree contains over 250 MiB of data. There are a
+&x-window-system; source code tree contains over 250 MiB of data. There are a
few simple techniques that make building the source code, keeping the
source code up to date, and keeping the source code organized much
easier.</para>
@@ -17,7 +17,7 @@
<sect3 id="prog-compiling-overview">
<title>Compiling Overview</title>
-<para>Compiling the &xfree; source code tree is a lot easier when you
+<para>Compiling the &x-window-system; source code tree is a lot easier when you
keep your builds in directories separate from the source code
directory. Keeping the source code and builds in separate
directories, using the <command>lndir</command> utility, allows you to
@@ -164,7 +164,7 @@
<command>ln</command> command on &unix;, but <command>lndir</command>
creates links recursively for all files and directories in the
specified directory. The <command>lndir</command> utility is included
-with the &xfree; source code tree and you can build
+with the &x-window-system; source code tree and you can build
<command>lndir</command> seperately before you build the
whole source code tree. Follow the simple instructions below to build
and install the utility:</para>
@@ -183,7 +183,7 @@
<listitem>
-<para>Change the current directory to your &xfree; development
+<para>Change the current directory to your &x-window-system; development
directory:</para>
<screen>
@@ -198,7 +198,7 @@
<listitem>
<para>Change the current directory to <filename
-class="directory">config/util/</filename> in the root of the &xfree;
+class="directory">config/util/</filename> in the root of the &x-window-system;
source code tree, <filename class="directory">xc/</filename>:</para>
<screen>
@@ -273,7 +273,7 @@
<orderedlist numeration="arabic">
<listitem>
-<para>Change the current directory to your &xfree; development
+<para>Change the current directory to your &x-window-system; development
directory:</para>
<screen>
@@ -424,7 +424,7 @@
<orderedlist numeration="arabic">
<listitem>
-<para>Change the current directory to your &xfree; development
+<para>Change the current directory to your &x-window-system; development
directory:</para>
<screen>
@@ -576,7 +576,7 @@
the entire source tree is operational. It is wise to verify the
operation of full builds of the source tree from time to time, as full
builds will occasionally be broken by changes that other developers
-are making to the &xfree source code tree.</para>
+are making to the &x-window-system; source code tree.</para>
<para>Installing a local build on top of an existing build is not a
good idea, as this can mask problems that occurred during the build
@@ -617,7 +617,7 @@
</listitem>
<listitem>
-<para>Change the current directory to your desired &xfree; build
+<para>Change the current directory to your desired &x-window-system; build
directory:</para>
<screen>
@@ -712,7 +712,7 @@
<orderedlist numeration="arabic">
<listitem>
-<para>Change the current directory to your &xfree; development
+<para>Change the current directory to your &x-window-system; development
directory:</para>
<screen>
@@ -726,7 +726,7 @@
<listitem>
-<para>Change the current directory to the root of the &xfree; source
+<para>Change the current directory to the root of the &x-window-system; source
code tree, <filename class="directory">xc/</filename>:</para>
<screen>
@@ -740,7 +740,7 @@
<listitem>
-<para>To update your entire &xfree; source code tree, run the
+<para>To update your entire &x-window-system; source code tree, run the
following command:</para>
<tip>
@@ -794,7 +794,7 @@
<orderedlist numeration="arabic">
<listitem>
-<para>Change the current directory to your &xfree; development
+<para>Change the current directory to your &x-window-system; development
directory:</para>
<screen>
Index: programming-obtaining-source.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming-obtaining-source.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/programming-obtaining-source.xml 5 Sep 2003 17:37:20 -0000 1.1.1.1
+++ b/programming-obtaining-source.xml 3 Apr 2004 07:14:26 -0000 1.2
@@ -4,164 +4,19 @@
<note>
<title>Cross Compiling</title>
-<para>Obtaining the source code when cross compiling &xfree; is nearly
-identical to the process described below. The only divergence from
-the following instructions is that you will be using a
+<para>Obtaining the source code when cross compiling &x-window-system;
+is nearly identical to the process described below. The only
+divergence from the following instructions is that you will be using a
<command>bash</command> shell on your cross compiling host, rather
than on your native &cygwin; host.</para>
</note>
<para>&project; source code is contained in, and distributed with, the
-&xfree; source code tree. Read-only <ulink url="&xfree-url-cvs;">CVS
-access to the &xfree; source tree</ulink> is also available from the
-&xfree; project.</para>
-
-<para>The &xfree; CVS tree is not always buildable on &cygwin;, as the
-&xfree; CVS tree is modified frequently, and sometimes those
-modifications cause building on &cygwin; to fail; however, there are a
-few developers monitoring the build state of the &xfree; CVS tree on
-&cygwin;, and they quickly fix build problems as they appear. It is
-unlikely that you will experience problems building &xfree; on
-&cygwin;; in the event that you do experience build problems, you may
-wish to drop a note to &project-ml; to let the developers there know
-that the tree is not building correctly.</para>
-
-<para>Periodically the &project; project releases a snapshot of the
-&xfree; source code that is known to compile. It is perfectly
-acceptable, though rarely necessary, to do your independent
-development work from a stable source code snapshot, rather than from
-the &xfree; CVS tree. Developing from a stable source code snapshots
-minimizes the scope of problems that you may encounter, which can
-greatly ease debugging of new features and other code
-modifications.</para>
-
-<para>It is highly recommended to get the &xfree; <glossterm
-linkend="gloss-cvs">CVS</glossterm> tree by using the CVS <glossterm
-linkend="gloss-pserver">pserver</glossterm> method. CVS
-pserver is the easiest CVS method to use for anonymous access to
-public CVS trees, as you need only type in a well-known password to
-download the CVS tree. CVS pserver is rarely used to control checkins
-to CVS trees, as the passwords are stored and sent as plain text;
-thus, pserver is extremely insecure. However, security does not
-matter for a public read-only CVS tree.</para>
-
-<para>Follow these steps to checkout the &xfree; CVS tree:</para>
-
-<orderedlist numeration="arabic">
-
-<listitem>
-<para>Open a &cygwin; <command>bash</command> shell by double clicking
-the &cygwin; icon on your desktop, or by selecting
-<guimenu>Start</guimenu>, then <guisubmenu>Programs</guisubmenu>,
-followed by <guisubmenu>&cygnus-menu;</guisubmenu>, and finally
-<guimenuitem>&cygwin-menu-bash;</guimenuitem>. You will see output
-similar to the following:</para>
-
-<screen>
-&cygwin-bash-prompt; ~
-$
-</screen>
-</listitem>
-
-<listitem>
-<para>Create a directory in which to store your &xfree; CVS tree and
-your builds; <filename
-class="directory">&project-path-devel;</filename> is
-recommended:</para>
-
-<screen>
-&cygwin-bash-prompt; ~
-$ mkdir x-devel
-
-&cygwin-bash-prompt; ~
-$
-</screen>
-</listitem>
-
-<listitem>
-<para>Change the current directory to your new &xfree; development
-directory:</para>
-
-<screen>
-&cygwin-bash-prompt; ~
-$ cd x-devel
-
-&cygwin-bash-prompt; &project-path-devel;
-$
-</screen>
-</listitem>
-
-<listitem>
-<para>Set the <envar>CVSROOT</envar> environment variable to point to
-the &xfree; CVS repository:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-devel;
-$ CVSROOT=:pserver:&xfree-anoncvs;:/cvs
-
-&cygwin-bash-prompt; &project-path-devel;
-$ export CVSROOT
-
-&cygwin-bash-prompt; &project-path-devel;
-$
-</screen>
-</listitem>
-
-<listitem>
-<para>Login to the CVS server, using password
-<quote>anoncvs</quote>:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-devel;
-$ cvs login
-(Logging in to &xfree-anoncvs;)
-CVS password:
-
-&cygwin-bash-prompt; &project-path-devel;
-$
-</screen>
-</listitem>
-
-<listitem>
-<para>Checkout the <filename class="directory">xc/</filename>
-directory from the &xfree; CVS tree:</para>
-
-<tip>
-<para>The <parameter>-z<replaceable>n</replaceable></parameter>
-parameter specifies the compression level to use, from 1 to 9, with 9
-being maximum compression.</para>
-</tip>
-
-<note>
-<para>As of 2001-06-12, a checked out &xfree; CVS source code tree
-contains 16,199 files in 3,021 folders, which is 242 MiB of data, but
-requires 285 MiB of storage space on a file system using 4 KiB
-allocation units.</para>
-</note>
-
-<screen>
-&cygwin-bash-prompt; &project-path-devel;
-$ cvs -z4 checkout xc
-cvs server: Updating xc
-
-...
-
-&cygwin-bash-prompt; &project-path-devel;
-$
-</screen>
-
-<para>You may preserve a log file for the checkout session by instead
-using the following command:</para>
-
-<screen>
-&cygwin-bash-prompt; &project-path-devel;
-$ cvs -z4 checkout xc > xc-cvs-checkout.log 2>&1
-
-&cygwin-bash-prompt; &project-path-devel;
-$
-</screen>
-</listitem>
+&x-window-system; source code tree. Read-only <ulink
+url="&xorg-url-cvs;">CVS access to the &x-window-system; source
+tree</ulink> is also available.</para>
-</orderedlist>
+<para>Wait for these instructions to be updated some time after
+2004-04-03.</para>
</sect1>
Index: programming-tree-layout.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming-tree-layout.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/programming-tree-layout.xml 16 Mar 2004 03:03:26 -0000 1.3
+++ b/programming-tree-layout.xml 3 Apr 2004 07:14:26 -0000 1.4
@@ -1,44 +1,6 @@
<sect1 id="prog-tree-layout">
<title>&title-prog-tree-layout;</title>
-<para>The &xfree; CVS tree consists of several top-level directories,
-only three of which are of concern to &project; as of 2001-10-26.</para>
-
-
-<orderedlist numeration="arabic">
-<title>Abridged Top Level &xfree; CVS Directories (in order of
-interest)</title>
-
-<listitem>
-<para><filename class="directory">xc</filename> contains source code
-for X libraries, the X servers, and all X clients distributed with
-&xfree;.</para>
-</listitem>
-
-<listitem>
-<para><filename class="directory">devel</filename> contains the
-scripts used to package a standard &xfree; distribution; thus,
-&project; uses these scripts to build distributions. You will need
-the <filename class="directory">util</filename> directory to use these
-build scripts.</para>
-</listitem>
-
-<listitem>
-<para><filename class="directory">util</filename> contains gnutar and
-zlib needed by the <filename class="directory">devel</filename>
-scripts. You will not need this directory for any other
-reason.</para>
-</listitem>
-</orderedlist>
-
-
-<para>The layout of the <filename class="directory">devel</filename>
-and <filename class="directory">util</filename> directories are
-documented in <xref linkend="prog-distribution"></xref>. The
-remainder of this section deals only with the <filename
-class="directory">xc</filename> directory.</para>
-
-
<itemizedlist>
<title>Descriptions of Important <filename
class="directory">xc</filename> Directories and Subdirectories</title>
@@ -72,7 +34,7 @@
produce a <filename>Makefile</filename> that will work correctly for a
given platform; in our case, that platform is &cygwin;. Any build
problems with <command>imake</command> will stop compilation of the
-&xfree; CVS tree, as there will not be any
+&x-window-system; CVS tree, as there will not be any
<filename>Makefile</filename>'s to operate on. This directory will
therefore be of interest only when <command>imake</command> fails to
build.</para>
@@ -142,7 +104,7 @@
client and X Server libraries. &project; does not generally call any
functions in these libraries directly; however, we do have to link to
several of these libraries to get our X Server to build. These
-libraries are maintained by various developers from the &xfree;
+libraries are maintained by various developers from the &x-window-system;
project and there are occasional synchronizations with <ulink
url="&tog-home;">&tog;</ulink>'s <ulink
url="&tog-x-home;">&tog-x;</ulink>. &project; programmers
@@ -153,7 +115,7 @@
<listitem>
<para><filename class="directory">nls</filename> contains locale
definition files. These files are maintained by the <ulink
-url="&xfree-url-i18n;">&xfree; I18N</ulink> project. This directory
+url="&xfree-url-i18n;">&x-window-system; I18N</ulink> project. This directory
is of little interest to &project; programmers.</para>
</listitem>
@@ -207,10 +169,10 @@
<listitem>
<para><filename class="directory">xfree86</filename> contains source
-code for the &xfree; servers that run on various operating systems
+code for the &x-window-system; servers that run on various operating systems
that generally have low-level access to the graphics hardware.
&project; does not have low-level access to the graphics hardware,
-thus &project; is not able to utilize the &xfree; server.</para>
+thus &project; is not able to utilize the &x-window-system; server.</para>
</listitem>
<listitem>
Index: programming.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/cg/programming.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/programming.xml 5 Sep 2003 17:37:20 -0000 1.1.1.1
+++ b/programming.xml 3 Apr 2004 07:14:26 -0000 1.2
@@ -17,10 +17,10 @@
&project; after reading this chapter. Programming gurus are great;
our intention is to create more of them.</para>
-<para>Downloading the &xfree; source code tree can take anywhere from
-10 minutes to 10 hours, depending upon the speed of your network
-connection. If you have an active network connection at your disposal
-you may want to skip ahead to <xref
+<para>Downloading the &x-window-system; source code tree can take
+anywhere from 10 minutes to 10 hours, depending upon the speed of your
+network connection. If you have an active network connection at your
+disposal you may want to skip ahead to <xref
linkend="prog-obtaining-source"></xref> and start downloading the
source code tree now. You will find it advantageous to have a source
code tree as you read the other sections.</para>
More information about the xserver-commit
mailing list