diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index d4beface4..6c1b8f175 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-12  Ken Brown  <kbrown@cornell.edu>
+
+	* faq-using.xml: Remove obsolete entry about the standard console
+	window.
+	* new-features.sgml: Remove obsolete entry which references cygwin.bat.
+	* setup-net.sgml: Clarify new shortcut behavior for the "Cygwin
+	Terminal".
+
 2011-11-21  Andy Koppe  <andy.koppe@gmail.com>
 
 	* faq-using.xml (faq.using.weirdchars): Rewrite.
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 162629f5f..72546abfd 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -939,16 +939,6 @@ Emacs or XEmacs from Cygwin Setup.
 </para>
 </answer></qandaentry>
 
-<qandaentry id="faq.using.console-window">
-<question><para>Is there a better alternative to the standard console window?</para></question>
-<answer>
-
-<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>
-
 <qandaentry id="faq.using.symlinkstoppedworking">
 <question><para>Why do some of my old symlinks don't work anymore?</para></question>
 <answer>
diff --git a/winsup/doc/new-features.sgml b/winsup/doc/new-features.sgml
index 546bfd1a5..0ca17797a 100644
--- a/winsup/doc/new-features.sgml
+++ b/winsup/doc/new-features.sgml
@@ -497,14 +497,8 @@ of the character.  This allows to access all files, even those not
 having a valid representation of their filename in the current character
 set.  To always have a valid string, use the UTF-8 charset by
 setting the environment variable $LANG, $LC_ALL, or $LC_CTYPE to a valid
-POSIX value, for instance in Cygwin.bat like this:
-</para>
-
-<screen>
-set LC_CTYPE=en_US.UTF-8
-</screen>
-
-</listitem>
+POSIX value, such as "en_US.UTF-8".
+</para></listitem>
 
 <listitem><para>
 PATH_MAX is now 4096.  Internally, path names can be as long as the
diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml
index 83f0cbb66..3059a59d3 100644
--- a/winsup/doc/setup-net.sgml
+++ b/winsup/doc/setup-net.sgml
@@ -223,13 +223,12 @@ shows progress bars for the current task and total remaining disk space.
 </para>
 </sect2>
 
-<sect2 id="setup-icons"><title>Icons</title>
+<sect2 id="setup-icons"><title>Shortcuts</title>
 <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 terminal emulator such as <literal>mintty</literal> or
-<literal>xterm</literal>, you can use these shortcuts as a guide to
-creating your own. 
+You may choose to install "Cygwin Terminal" shortcuts on the Desktop
+and/or Start Menu.  These shortcuts run <command>mintty</command>,
+which will start your default shell as specified
+in <filename>/etc/passwd</filename>.
 </para>
 </sect2>