cygwin-x-doc/ug cygwin-x-ug.xml, 1.2, 1.3 setup.xml, 1.6, 1.7 using.xml, 1.4, 1.5

[Harold L Hunt II]

Committed by: harold

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

Modified Files:
	cygwin-x-ug.xml setup.xml using.xml 
Log Message:
Remove old information, add simpler answer to OpenSSH 3.8 question.

Index: cygwin-x-ug.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/cygwin-x-ug.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/cygwin-x-ug.xml	16 Mar 2004 03:03:26 -0000	1.2
+++ b/cygwin-x-ug.xml	3 Apr 2004 07:14:26 -0000	1.3
@@ -67,6 +67,14 @@
 <revhistory id="revision-history">
 
 <revision>
+<revnumber>1.0.9</revnumber>
+<date>2004-04-03</date>
+<authorinitials>harold at codeweavers.com</authorinitials>
+
+<revremark>Update the ssh instructions.</revremark>
+</revision>
+
+<revision>
 <revnumber>1.0.8</revnumber>
 <date>2004-03-15</date>
 <authorinitials>harold at codeweavers.com</authorinitials>
@@ -164,7 +172,7 @@
 <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>
+installtion with the XFree86 Xinstall.sh script.</revremark>
 </revision>
 
 

Index: setup.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/setup.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/setup.xml	16 Mar 2004 03:03:26 -0000	1.6
+++ b/setup.xml	3 Apr 2004 07:14:26 -0000	1.7
@@ -4,10 +4,10 @@
 <sect1 id="setup-project-contents">
 <title>&project; Contents</title>
 
-<para>&project; consists of two parts: &cygwin;, a port of the GNU tools
-to Win32, and &project;, a port of &xfree; to Win32.  Both parts of
-&project; are needed to successfully run an X Server on a Win32
-platform. </para>
+<para>&project; consists of two parts: &cygwin;, a port of the GNU
+tools to Win32, and &project;, a port of the &x-window-system; to
+Win32.  Both parts of &project; are needed to successfully run an X
+Server on a Win32 platform. </para>
 
 </sect1>
 
@@ -15,14 +15,13 @@
 <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
-the popular GNU development tools and utilities for Windows 95, 98,
-and NT. They function by using the &cygwin; library which provides a
-<acronym>UNIX</acronym>-like API on top of the Win32 API.</quote>  &cygwin;
-allows the compilation of the &xfree; source on Win32; several patches
-were made to the &xfree; source to make &xfree; actually compile and
-run under &cygwin;; those patches have been merged into the &xfree;
-4.0 source tree.</para>
+homepage, <ulink url="&cygwin-home;">&cygwin-home;</ulink>,
+<quote>ports of the popular GNU development tools and utilities for
+Windows 95, 98, and NT.  They function by using the &cygwin; library
+which provides a <acronym>UNIX</acronym>-like API on top of the Win32
+API.</quote> &cygwin; allows the compilation of the &x-window-system;
+source on Win32; several patches were made to the &x-window-system;
+source to make it actually compile and run under &cygwin;.</para>
 
 <para>&cygwin; has a nice setup program that downloads and installs
 the necessary &cygwin; packages for you.</para>
@@ -321,13 +320,13 @@
 </listitem>
 
 <listitem>
-<para>You must select the <literal>XFree86-base</literal> package,
-which is located in the <literal>XFree86</literal> category.  The
-<literal>XFree86-base</literal> package is a helper package that
-automatically selects a working set of packages for you that will
-allow &project; to work.  You may also want to ensure that the
-<literal>inetutils</literal> and <literal>openssh</literal> packages
-are selected if you wish to use <command>telnet</command> and
+<para>You must select the <literal>&package-base;</literal> package,
+which is located in the <literal>&package-category;</literal>
+category.  The <literal>&package-base;</literal> package is a helper
+package that automatically selects a working set of packages for you
+that will allow &project; to work.  You may also want to ensure that
+the <literal>inetutils</literal> and <literal>openssh</literal>
+packages are selected if you wish to use <command>telnet</command> and
 <command>ssh</command> to connect to remote machines.</para>
 
 <mediaobject>

Index: using.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/using.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/using.xml	10 Mar 2004 00:52:02 -0000	1.4
+++ b/using.xml	3 Apr 2004 07:14:26 -0000	1.5
@@ -48,7 +48,7 @@
 <sect2 id="using-starting-startx">
 <title>&title-using-starting-startx;</title>
 
-<para><filename>startx</filename> - Use the standard &xfree;
+<para><filename>startx</filename> - Use the standard &x-window-system;
 <filename>startx</filename> script with its attendant
 <filename>~/.xinitrc</filename> configuration file.  First you need to
 create <filename>~/.xinitrc</filename> from the template in <filename
@@ -324,7 +324,7 @@
 
 <screen>
 &cygwin-bash-prompt; ~
-$ ssh -X -l <replaceable>username</replaceable> <replaceable>remote_hostname_or_ip_address</replaceable>
+$ ssh -Y -l <replaceable>username</replaceable> <replaceable>remote_hostname_or_ip_address</replaceable>
 </screen>
 </listitem>