* cygwinenv.sgml: Remove/deprecate mention of rxvt.

* effectively.sgml: Ditto.
* faq-using.xml: Ditto.
* setup-net.sgml: Ditto.

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 10a0f22..4547eab 100644 (file)
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-31  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * cygwinenv.sgml: Remove/deprecate mention of rxvt.
+       * effectively.sgml: Ditto.
+       * faq-using.xml: Ditto.
+       * setup-net.sgml: Ditto.
+
 2010-03-29  Corinna Vinschen  <corinna@vinschen.de>
 
        * new-features.sgml (ov-new1.7.3): New section.

diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
index 23e4d64..ea1f074 100644 (file)
--- a/winsup/doc/cygwinenv.sgml
+++ b/winsup/doc/cygwinenv.sgml
@@ -97,7 +97,7 @@ Note that this has been changed such that ^D works as
 expected instead of ^Z, and is settable via <command>stty</command>.
 This option must be specified before starting a Cygwin shell 
 and it cannot be changed in the shell.  It should not be set when using
-other terminals (i.e., rxvt or xterm). 
+other terminals (i.e., mintty or xterm). 
 </para>
 </listitem>
 

diff --git a/winsup/doc/effectively.sgml b/winsup/doc/effectively.sgml
index 945414b..73d9d28 100644 (file)
--- a/winsup/doc/effectively.sgml
+++ b/winsup/doc/effectively.sgml
@@ -87,10 +87,12 @@ Windows programs, use a DOS prompt, running only the occasional Cygwin
 command or script. Next would be to run <command>bash</command> within 
 a default DOS box. To make Cygwin more Unix compatible in this case, 
 set <envar>CYGWIN=tty</envar> (see <xref linkend="using-cygwinenv"></xref>).
-Alternatively, the optional <systemitem>rxvt</systemitem> package provides 
-a native-Windows version of the popular X11 terminal emulator (it is not 
-necessary to set <envar>CYGWIN=tty</envar> with <command>rxvt</command>). 
-Using <command>rxvt.exe</command> provides the most Unix-like environment, 
+Alternatively, the optional <systemitem>mintty</systemitem> package
+provides a terminal emulator similar to such X11 programs as
+<command>xterm</command> (it is not necessary to set
+<envar>CYGWIN=tty</envar> with <command>mintty</command> nor is it
+necessary to be running <systemitem>/Cygwin/X</systemitem>).  Using
+<command>mintty.exe</command> provides the most Unix-like environment,
 but expect some compatibility problems with Windows programs.
 </para>
 

diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index d8fbcf3..f013703 100644 (file)
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -580,8 +580,8 @@ for more details.
 <question><para>How can I copy and paste into Cygwin console windows?</para></question>
 <answer>
 
-<para>First, consider using rxvt or mintty instead of the standard console
-window.  In rxvt/mintty, selecting with the left-mouse also copies,
+<para>First, consider using mintty instead of the standard console
+window.  In mintty, selecting with the left-mouse also copies,
 and middle-mouse pastes.  It couldn't be easier!
 </para>
 <para>In Windows's console window, open the properties dialog.
@@ -946,9 +946,9 @@ Emacs or XEmacs from Cygwin Setup.
 <question><para>Is there a better alternative to the standard console window?</para></question>
 <answer>
 
-<para>Yes!  Use rxvt or mintty instead.  Both are optional packages in
-Cygwin Setup.  You can use rxvt with or without X11, while mintty is a 
-Cygwin application providing a native GUI.
+<para>Yes!  Use <command>mintty</command> instead.  <command>mintty</command> is an optional packages in
+Cygwin Setup.  <command>mintty</command> is a Cygwin application providing a native GUI without
+the need of X11.
 </para>
 </answer></qandaentry>
 

diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml
index 55099ff..8ce7c1a 100644 (file)
--- a/winsup/doc/setup-net.sgml
+++ b/winsup/doc/setup-net.sgml
@@ -215,7 +215,7 @@ shows progress bars for the current task and total remaining disk space.
 <para>
 You may choose to install shortcuts on the Desktop and/or Start Menu
 to start a <literal>bash</literal> shell. If you prefer to use a different
-shell or the native Windows version of <literal>rxvt</literal>, you can
+shell or the native Windows version of <literal>mintty</literal> or <literal>rxvt</literal>, you can
 use these shortcuts as a guide to creating your own. 
 </para>
 </sect2>