[xserver-commit] cygwin-x-doc/ug cygwin-x-ug.xml,NONE,1.1 Makefile.am,1.2,1.3 Makefile.in,1.2,1.3 configure.xml,1.3,1.4 overview.xml,1.2,1.3 setup.xml,1.4,1.5 using.xml,1.3,1.4 cygwin-xfree-ug.xml,1.3,NONE

Harold L Hunt II xserver-commit@pdx.freedesktop.org
Previous message: [xserver-commit] cygwin-x-doc/ug/figures Makefile.am,1.2,1.3 Makefile.in,1.2,1.3
Next message: [xserver-commit] cygwin-x-doc/common entities.xml,1.5,1.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Committed by: harold

Update of /cvs/xserver/cygwin-x-doc/ug
In directory pdx:/tmp/cvs-serv10011/ug

Modified Files:
	Makefile.am Makefile.in configure.xml overview.xml setup.xml 
	using.xml 
Added Files:
	cygwin-x-ug.xml 
Removed Files:
	cygwin-xfree-ug.xml 
Log Message:
Fix problems with install target for documentation.  Final cleanups to allow the package to be distributed in binary form.

--- NEW FILE: cygwin-x-ug.xml ---
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [

<!-- Include the common entities -->
<!ENTITY % common SYSTEM "../common/entities.xml"> %common;

<!-- System entities -->
<!ENTITY overview SYSTEM "overview.xml">
<!ENTITY setup SYSTEM "setup.xml">
<!ENTITY configure SYSTEM "configure.xml">
<!ENTITY using SYSTEM "using.xml">

<!-- Title entities -->
<!ENTITY title-overview "&project; Overview">
<!ENTITY title-configure "Configuring &project;">
<!ENTITY title-configure-cygwin-x-overview "Configuration Overview">
<!ENTITY title-configure-cygwin-x-options "Command Line Parameters">
<!ENTITY title-setup "Setting Up &project;">
<!ENTITY title-setup-project-contents "&project; Contents">
<!ENTITY title-setup-cygwin-downloading "Downloading &cygwin;">
<!ENTITY title-setup-cygwin-installing "Installing &cygwin;">
<!ENTITY title-setup-cygwin-x-downloading "Downloading &project;">
<!ENTITY title-setup-cygwin-x-installing "Installing &project;">
<!ENTITY title-using "Using &project;">
<!ENTITY title-using-starting "Starting &project;">
<!ENTITY title-using-starting-bat "startxwin.bat">
<!ENTITY title-using-starting-sh "startxwin.sh">
<!ENTITY title-using-starting-startx "startx">
<!ENTITY title-using-switching "Switching Out of &project;">
<!ENTITY title-using-stopping "Stopping &project;">
<!ENTITY title-using-window-managers "Window Managers">
<!ENTITY title-using-clipboard-integration "&windows; Clipboard Integration">
<!ENTITY title-using-shared-memory "Shared Memory Support (MIT-SHM Extension)">
<!ENTITY title-using-remote-session "Remote Sessions via XDMCP">
<!ENTITY title-using-remote-apps "Displaying Remote Clients">
<!ENTITY title-using-remote-apps-telnet "Unsecure Telnet">
<!ENTITY title-using-remote-apps-ssh "Secure ssh">

<!-- Project file names and sizes -->
<!ENTITY package-bin "XFree86-bin">
<!ENTITY package-bin-size "8.7 MiB">

<!ENTITY package-bin-icons "XFree86-bin-icons">
<!ENTITY package-bin-icons-size "3 KiB">

<!ENTITY package-doc "XFree86-doc">
<!ENTITY package-doc-size "1.26 MiB">

<!ENTITY package-etc "XFree86-etc">
<!ENTITY package-etc-size "470 KiB">

<!ENTITY package-f100 "XFree86-f100">
<!ENTITY package-f100-size "11.9 MiB">

<!ENTITY package-fcyr "XFree86-fcyr">
<!ENTITY package-fcyr-size "364 KiB">

<!ENTITY package-fenc "XFree86-fenc">
<!ENTITY package-fenc-size "337 KiB">

<!ENTITY package-fnts "XFree86-fnts">
<!ENTITY package-fnts-size "15.9 MiB">

<!ENTITY package-fscl "XFree86-fscl">
<!ENTITY package-fscl-size "1.96 MiB">

<!ENTITY package-fsrv "XFree86-fsrv">
<!ENTITY package-fsrv-size "202 KiB">

<!ENTITY package-html "XFree86-html">
<!ENTITY package-html-size "904 KiB">

<!ENTITY package-jdoc "XFree86-jdoc">
<!ENTITY package-jdoc-size "84 KiB">

<!ENTITY package-lib "XFree86-lib">
<!ENTITY package-lib-size "83 KiB">

<!ENTITY package-lib-compat "XFree86-lib-compat">
<!ENTITY package-lib-compat-size "1.5 MiB">

<!ENTITY package-man "XFree86-man">
<!ENTITY package-man-size "548 KiB">

<!ENTITY package-nest "XFree86-nest">
<!ENTITY package-nest-size "1.1 MiB">

<!ENTITY package-prog "XFree86-prog">
<!ENTITY package-prog-size "595 KiB">

<!ENTITY package-prt "XFree86-prt">
<!ENTITY package-prt-size "791 KiB">

<!ENTITY package-ps "XFree86-ps">
<!ENTITY package-ps-size "4.41 MiB">

<!ENTITY package-startup-scripts "XFree86-startup-scripts">
<!ENTITY package-startup-scripts-size "10 KiB">

<!ENTITY package-vfb "XFree86-vfb">
<!ENTITY package-vfb-size "1.22 MiB">

<!ENTITY package-xserv "XFree86-xserv">
<!ENTITY package-xserv-size "1.19 MiB">

<!ENTITY package-xwinclip "XFree86-xwinclip">
<!ENTITY package-xwinclip-size "6 KiB">
]>

<book id="cygwin-x-ug">

<bookinfo id="book-info">

<date>2000-09-13</date>

<title>&project; User's Guide</title>

<author>
<firstname>Harold</firstname>
<othername role="mi">L</othername>
<surname>Hunt</surname>
<lineage>II</lineage>
</author>

<legalnotice id="legal-notice">
<blockquote id="legal-notice-quote"><para>
Copyright (c)  2000  Harold L Hunt II.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
or any later version published by the Free Software Foundation;
with no Invariant Sections, with no
Front-Cover Texts, and with no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
</para></blockquote>
</legalnotice>

<revhistory id="revision-history">

<revision>
<revnumber>1.0.7</revnumber>
<date>2003-12-18</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Flip the position of the ssh and telnet sections.</revremark>
</revision>

<revision>
<revnumber>1.0.6</revnumber>
<date>2003-09-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>New Window Managers, Clipboard Integration, and Shared
Memory sections.</revremark>
</revision>

<revision>
<revnumber>1.0.5</revnumber>
<date>2003-01-01</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Document installation with setup.exe.</revremark>
</revision>

<revision>
<revnumber>1.0.4</revnumber>
<date>2002-06-13</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Document the -lesspointer parameter.</revremark>
</revision>

<revision>
<revnumber>1.0.3</revnumber>
<date>2002-06-07</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Document the -nodecoration parameter.</revremark>
</revision>


<revision>
<revnumber>1.0.2</revnumber>
<date>2002-01-08</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Add information about each command line
parameter.</revremark>
</revision>


<revision>
<revnumber>1.0.1</revnumber>
<date>2001-11-01</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Displaying Remote Clients - Added a section on using ssh;
moved the telnet steps into a new section.  Thanks to Steinar Bang for
pointing out the -X parameter for ssh.</revremark>
</revision>


<revision>
<revnumber>1.0.0</revnumber>
<date>2001-10-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Bumped the revision number to 1.0.0 to indicate that all
planed content is now present.</revremark>
</revision>


<revision>
<revnumber>0.0.5</revnumber>
<date>2001-07-03</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Change the download directory from / to /tmp.</revremark>
</revision>


<revision>
<revnumber>0.0.4</revnumber>
<date>2001-07-02</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Updated the &project; downloading instructions with the new
archive names that are created by the &xfree; build-bindist
script.  Updated the &project; installation instructions to desribe
installtion with the &xfree; Xinstall.sh script.</revremark>
</revision>


<revision>
<revnumber>0.0.3</revnumber>
<date>2001-06-11</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Replaced the &project; Installation graphics with screen
markup.</revremark>
</revision>


<revision>
<revnumber>0.0.2</revnumber>
<date>2001-05-06</date>
<authorinitials>huntharo@msu.edu</authorinitials>
</revision>


<revision>
<revnumber>0.0.1</revnumber>
<date>2001-04-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>
</revision>


<revision>
<revnumber>0.0.0</revnumber>
<date>2000-09-13</date>
<authorinitials>harold@compasstechnologies.com</authorinitials>
</revision>
</revhistory>

</bookinfo>

<toc></toc>

&overview;
&setup;
&configure;
&using;
&fdl;

</book>

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	29 Feb 2004 23:36:11 -0000	1.2
+++ b/Makefile.am	10 Mar 2004 00:52:01 -0000	1.3
@@ -12,7 +12,7 @@
 
 ## Source files
 
-ug_xml_source = cygwin-xfree-ug.xml
+ug_xml_source = cygwin-x-ug.xml
 extra_ug_xml_source = configure.xml \
 	overview.xml \
 	setup.xml \
@@ -21,11 +21,11 @@
 ## Files generated by HTML build
 
 extra_ug_html = configure.html \
-	configure-cygwin-xfree-options.html \
+	configure-cygwin-x-options.html \
 	setup-cygwin-downloading.html \
 	setup-cygwin-installing.html \
-	setup-cygwin-xfree-downloading.html \
-	setup-cygwin-xfree-installing.html \
+	setup-cygwin-x-downloading.html \
+	setup-cygwin-x-installing.html \
 	gfdl.html \
 	gfdl-aggregation-with-independent-works.html \
 	gfdl-applicability-and-definitions.html \
@@ -44,17 +44,20 @@
 	using-remote-apps.html \
 	using-remote-session.html \
 	using-stopping.html \
-	using-switching.html
+	using-switching.html \
+	using-window-managers.html \
+	using-clipboard-integration.html \
+	using-shared-memory.html
 
 ## Files generated by other builds
 
-extra_ug_ps = cygwin-xfree-ug.ps
-extra_ug_ps_gz = cygwin-xfree-ug.ps.gz
-extra_ug_pdf = cygwin-xfree-ug.pdf
-extra_ug_txt = cygwin-xfree-ug.txt
-extra_ug_rtf = cygwin-xfree-ug.rtf
-extra_ug_dvi = cygwin-xfree-ug.dvi
-extra_ug_tex = cygwin-xfree-ug.tex
+extra_ug_ps = cygwin-x-ug.ps
+extra_ug_ps_gz = cygwin-x-ug.ps.gz
+extra_ug_pdf = cygwin-x-ug.pdf
+extra_ug_txt = cygwin-x-ug.txt
+extra_ug_rtf = cygwin-x-ug.rtf
+extra_ug_dvi = cygwin-x-ug.dvi
+extra_ug_tex = cygwin-x-ug.tex
 
 ## Figure list for dependencies
 
@@ -82,14 +85,14 @@
 	figures/cyi10createicons.png \
 	figures/cyi11complete.png
 
-ugdir = $(pkgdatadir)/ug
-ug_DATA = cygwin-xfree-ug.html $(extra_ug_html) $(extra_ug_ps_gz) \
+ugdir = $(docdir)/ug
+ug_DATA = cygwin-x-ug.html $(extra_ug_html) $(extra_ug_ps_gz) \
 	$(extra_ug_pdf) $(extra_ug_txt) $(extra_ug_rtf)
 EXTRA_DIST = $(ug_xml_source) $(extra_ug_xml_source)
 
 ## Dependency rules follow
 
-cygwin-xfree-ug.html $(extra_ug_html): $(HTML_SS) $(ug_xml_source) \
+cygwin-x-ug.html $(extra_ug_html): $(HTML_SS) $(ug_xml_source) \
 	$(extra_ug_xml_source) $(ENTITIES) $(FDL) \
 	$(figures_png)
 
@@ -113,7 +116,8 @@
 ## General rules follow
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag $(XML_DECL) -s $(srcdir)/$(ug_xml_source)
@@ -149,7 +153,7 @@
 $(extra_ug_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-ug.html:
+cygwin-x-ug.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(ug_xml_source)"
 

Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.in	29 Feb 2004 23:36:11 -0000	1.2
+++ b/Makefile.in	10 Mar 2004 00:52:01 -0000	1.3
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,66 +12,84 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-HAVE_LIB = @HAVE_LIB@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JADE = @JADE@
-LIB = @LIB@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIB = @LTLIB@
+LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
-
+ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+docdir = @docdir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 SUBDIRS = figures .
 
 MAX_TEX_RECURSION = 4
@@ -82,69 +102,123 @@
 ENTITIES = $(srcdir)/../common/entities.xml
 FDL = $(srcdir)/../common/fdl.xml
 
-ug_xml_source = cygwin-xfree-ug.xml
-extra_ug_xml_source = configure.xml 	overview.xml 	setup.xml 	using.xml
+ug_xml_source = cygwin-x-ug.xml
+extra_ug_xml_source = configure.xml \
+	overview.xml \
+	setup.xml \
+	using.xml
 
 
-extra_ug_html = configure.html 	configure-cygwin-xfree-options.html 	setup-cygwin-downloading.html 	setup-cygwin-installing.html 	setup-cygwin-xfree-downloading.html 	setup-cygwin-xfree-installing.html 	gfdl.html 	gfdl-aggregation-with-independent-works.html 	gfdl-applicability-and-definitions.html 	gfdl-collections-of-documents.html 	gfdl-combining-documents.html 	gfdl-copying-in-quantity.html 	gfdl-future-revisions-of-this-license.html 	gfdl-modifications.html 	gfdl-termination.html 	gfdl-translation.html 	gfdl-using-for-your-documents.html 	gfdl-verbation-copying.html 	overview.html 	setup.html 	using.html 	using-remote-apps.html 	using-remote-session.html 	using-stopping.html 	using-switching.html
+extra_ug_html = configure.html \
+	configure-cygwin-x-options.html \
+	setup-cygwin-downloading.html \
+	setup-cygwin-installing.html \
+	setup-cygwin-x-downloading.html \
+	setup-cygwin-x-installing.html \
+	gfdl.html \
+	gfdl-aggregation-with-independent-works.html \
+	gfdl-applicability-and-definitions.html \
+	gfdl-collections-of-documents.html \
+	gfdl-combining-documents.html \
+	gfdl-copying-in-quantity.html \
+	gfdl-future-revisions-of-this-license.html \
+	gfdl-modifications.html \
+	gfdl-termination.html \
+	gfdl-translation.html \
+	gfdl-using-for-your-documents.html \
+	gfdl-verbation-copying.html \
+	overview.html \
+	setup.html \
+	using.html \
+	using-remote-apps.html \
+	using-remote-session.html \
+	using-stopping.html \
+	using-switching.html \
+	using-window-managers.html \
+	using-clipboard-integration.html \
+	using-shared-memory.html
 
 
-extra_ug_ps = cygwin-xfree-ug.ps
-extra_ug_ps_gz = cygwin-xfree-ug.ps.gz
-extra_ug_pdf = cygwin-xfree-ug.pdf
-extra_ug_txt = cygwin-xfree-ug.txt
-extra_ug_rtf = cygwin-xfree-ug.rtf
-extra_ug_dvi = cygwin-xfree-ug.dvi
-extra_ug_tex = cygwin-xfree-ug.tex
+extra_ug_ps = cygwin-x-ug.ps
+extra_ug_ps_gz = cygwin-x-ug.ps.gz
+extra_ug_pdf = cygwin-x-ug.pdf
+extra_ug_txt = cygwin-x-ug.txt
+extra_ug_rtf = cygwin-x-ug.rtf
+extra_ug_dvi = cygwin-x-ug.dvi
+extra_ug_tex = cygwin-x-ug.tex
 
-figures_eps = figures/cyi01welcome.ps 	figures/cyi02installoption.ps 	figures/cyi03installto.ps 	figures/cyi04directory.ps 	figures/cyi05proxy.ps 	figures/cyi06mirror.ps 	figures/cyi07packages.ps 	figures/cyi08downloading.ps 	figures/cyi09installing.ps 	figures/cyi10createicons.ps 	figures/cyi11complete.ps
+figures_eps = figures/cyi01welcome.ps \
+	figures/cyi02installoption.ps \
+	figures/cyi03installto.ps \
+	figures/cyi04directory.ps \
+	figures/cyi05proxy.ps \
+	figures/cyi06mirror.ps \
+	figures/cyi07packages.ps \
+	figures/cyi08downloading.ps \
+	figures/cyi09installing.ps \
+	figures/cyi10createicons.ps \
+	figures/cyi11complete.ps
 
 
-figures_png = figures/cyi01welcome.png 	figures/cyi02installoption.png 	figures/cyi03installto.png 	figures/cyi04directory.png 	figures/cyi05proxy.png 	figures/cyi06mirror.png 	figures/cyi07packages.png 	figures/cyi08downloading.png 	figures/cyi09installing.png 	figures/cyi10createicons.png 	figures/cyi11complete.png
+figures_png = figures/cyi01welcome.png \
+	figures/cyi02installoption.png \
+	figures/cyi03installto.png \
+	figures/cyi04directory.png \
+	figures/cyi05proxy.png \
+	figures/cyi06mirror.png \
+	figures/cyi07packages.png \
+	figures/cyi08downloading.png \
+	figures/cyi09installing.png \
+	figures/cyi10createicons.png \
+	figures/cyi11complete.png
 
 
-ugdir = $(pkgdatadir)/ug
-ug_DATA = cygwin-xfree-ug.html $(extra_ug_html) $(extra_ug_ps_gz) 	$(extra_ug_pdf) $(extra_ug_txt) $(extra_ug_rtf)
+ugdir = $(docdir)/ug
+ug_DATA = cygwin-x-ug.html $(extra_ug_html) $(extra_ug_ps_gz) \
+	$(extra_ug_pdf) $(extra_ug_txt) $(extra_ug_rtf)
 
 EXTRA_DIST = $(ug_xml_source) $(extra_ug_xml_source)
+subdir = ug
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(ug_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(ug_DATA)
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
+	ps-recursive install-info-recursive uninstall-info-recursive \
+	all-recursive install-data-recursive install-exec-recursive \
+	installdirs-recursive install-recursive uninstall-recursive \
+	check-recursive installcheck-recursive
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
 
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign ug/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  ug/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+ugDATA_INSTALL = $(INSTALL_DATA)
 install-ugDATA: $(ug_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(ugdir)
 	@list='$(ug_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ugdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ugdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(ugdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(ugdir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(ugDATA_INSTALL) $$d$$p $(DESTDIR)$(ugdir)/$$f"; \
+	  $(ugDATA_INSTALL) $$d$$p $(DESTDIR)$(ugdir)/$$f; \
 	done
 
 uninstall-ugDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(ug_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(ugdir)/$$p; \
+	@list='$(ug_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(ugdir)/$$f"; \
+	  rm -f $(DESTDIR)$(ugdir)/$$f; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -153,13 +227,8 @@
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -179,13 +248,18 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -201,142 +275,216 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+CTAGS = ctags
+CTAGSFLAGS =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	else \
+	  include_option=--include; \
+	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = ug
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign ug/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs) $(DESTDIR)$(ugdir)
 
-install-data-am: install-ugDATA
+install: install-recursive
+install-exec: install-exec-recursive
 install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-ugDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(ugdir)
-
 
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
 
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic clean-local mostlyclean-am
 
-clean-am:  clean-tags clean-generic mostlyclean-am clean-local
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
 
-clean: clean-recursive
+dvi: dvi-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-recursive
+info: info-recursive
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am: install-ugDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
-.PHONY: uninstall-ugDATA install-ugDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-recursive
 
+mostlyclean-am: mostlyclean-generic
 
-cygwin-xfree-ug.html $(extra_ug_html): $(HTML_SS) $(ug_xml_source) \
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-ugDATA
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+	clean-generic clean-local clean-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-recursive distclean-tags \
+	distdir dvi dvi-am dvi-recursive info info-am info-recursive \
+	install install-am install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip install-ugDATA installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+	ps-recursive tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-info-recursive uninstall-recursive \
+	uninstall-ugDATA
+
+
+cygwin-x-ug.html $(extra_ug_html): $(HTML_SS) $(ug_xml_source) \
 	$(extra_ug_xml_source) $(ENTITIES) $(FDL) \
 	$(figures_png)
 
@@ -358,7 +506,8 @@
 	$(ENTITIES) $(FDL) $(figures_png)
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag $(XML_DECL) -s $(srcdir)/$(ug_xml_source)
@@ -390,7 +539,7 @@
 $(extra_ug_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-ug.html:
+cygwin-x-ug.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(ug_xml_source)"
 
@@ -404,7 +553,6 @@
 $(extra_ug_rtf):
 	$(SHELL) -c "$(JADE) -t rtf -d $(PRINT_SS) -o $@ $(XML_DECL) \
 	$(srcdir)/$(ug_xml_source)"
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: configure.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/configure.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/configure.xml	9 Nov 2003 23:34:33 -0000	1.3
+++ b/configure.xml	10 Mar 2004 00:52:01 -0000	1.4
@@ -1,8 +1,8 @@
 <chapter id="configure">
 <title>&title-configure;</title>
 
-<sect1 id="configure-cygwin-xfree-overview">
-<title>&title-configure-cygwin-xfree-overview;</title>
+<sect1 id="configure-cygwin-x-overview">
+<title>&title-configure-cygwin-x-overview;</title>
 
 <para>&project; settings are configured primarily through command-line
 parameters passed to <filename>&file-server-exe;</filename>.
@@ -11,8 +11,8 @@
 
 </sect1>
 
-<sect1 id="configure-cygwin-xfree-options">
-<title>&title-configure-cygwin-xfree-options;</title>
+<sect1 id="configure-cygwin-x-options">
+<title>&title-configure-cygwin-x-options;</title>
 
 <para>&project;, by default, runs in windowed mode with the largest
 window that will fit on your Windows desktop, using the best

Index: overview.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/overview.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/overview.xml	9 Nov 2003 23:34:33 -0000	1.2
+++ b/overview.xml	10 Mar 2004 00:52:02 -0000	1.3
@@ -1,9 +1,10 @@
 <chapter id="overview">
 <title>&title-overview;</title>
 
-<para>&project; is a port of &xfree; to &cygwin;; &cygwin; provides a
-UNIX-like API on the Win32 platform.  As of 2003-01-01 the supported
-Win32 platforms are Windows 95, Windows 98, Windows Me, Windows NT
-4.0, Windows 2000, and Windows XP.</para>
+<para>&project; is a port of the &x-window-system; to &cygwin;;
+&cygwin; provides a UNIX-like API on the Win32 platform.  As of
+2004-03-09 the supported Win32 platforms are Windows 95, Windows 98,
+Windows Me, Windows NT 4.0, Windows 2000, Windows XP, and Windows
+Server 2003.</para>
 
 </chapter>

Index: setup.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/setup.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/setup.xml	29 Feb 2004 23:36:11 -0000	1.4
+++ b/setup.xml	10 Mar 2004 00:52:02 -0000	1.5
@@ -11,8 +11,8 @@
 
 </sect1>
 
-<sect1 id="setup-cygwin-xfree-installing">
-<title>&title-setup-cygwin-xfree-installing;</title>
+<sect1 id="setup-cygwin-x-installing">
+<title>&title-setup-cygwin-x-installing;</title>
 
 <para>Cygwin tools are, in the words of the &cygwin; development
 homepage, <ulink url="&cygwin-home;">&cygwin-home;</ulink>, <quote>ports of

Index: using.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/using.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/using.xml	19 Dec 2003 05:34:34 -0000	1.3
+++ b/using.xml	10 Mar 2004 00:52:02 -0000	1.4
@@ -19,7 +19,7 @@
 the startup script.  An example <filename>startxwin.bat</filename> is
 included in <filename>&package-startup-scripts;</filename>, which is
 extracted according to the instructions in <xref
-linkend="setup-cygwin-xfree-installing"></xref>.  Run
+linkend="setup-cygwin-x-installing"></xref>.  Run
 <filename>/usr/X11R6/bin/startxwin.bat</filename> by double-clicking
 it in Windows Explorer.</para>
 
@@ -33,7 +33,7 @@
 <filename>startxwin.sh</filename> is included in
 <filename>&package-startup-scripts;</filename>, which is extracted
 according to the instructions in <xref
-linkend="setup-cygwin-xfree-installing"></xref>.  Run
+linkend="setup-cygwin-x-installing"></xref>.  Run
 <filename>/usr/X11R6/bin/startxwin.sh</filename> in a &cygwin;
 shell:</para>
 
@@ -147,7 +147,7 @@
 &windows; window for each top-level X window.  The internal window
 manager is launched using the <parameter>-multiwindow</parameter>
 command-line parameter to <command>XWin.exe</command>.  See <xref
-linkend="configure-cygwin-xfree-options"></xref> for more information
+linkend="configure-cygwin-x-options"></xref> for more information
 on the <parameter>-multiwindow</parameter> command-line
 parameter.</para>
 </listitem>
@@ -192,7 +192,7 @@
 
 <para>&project; has an internal clipboard integration system that is
 envoked via the <parameter>-clipboard</parameter> command-line
-parameter.  See <xref linkend="configure-cygwin-xfree-options"></xref>
+parameter.  See <xref linkend="configure-cygwin-x-options"></xref>
 for more information on the <parameter>-clipboard</parameter>
 command-line parameter.</para>
 

--- cygwin-xfree-ug.xml DELETED ---
Previous message: [xserver-commit] cygwin-x-doc/ug/figures Makefile.am,1.2,1.3 Makefile.in,1.2,1.3
Next message: [xserver-commit] cygwin-x-doc/common entities.xml,1.5,1.6
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]