diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 248f93a48..3e69c5121 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* setup2.sgml (setup-env-ov): Make sure everybody knows that the
+	CYGWIN settings are just an example.
+
 2011-05-08  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* new-features.sgml (ov-new1.7.10): Document clock_settime.
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index e3127bd20..6a5a5e757 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -18,17 +18,18 @@ Cygwin processes.</para>
 <para>
 The <envar>CYGWIN</envar> variable is used to configure many global
 settings for the Cygwin runtime system.  Initially you can leave
-<envar>CYGWIN</envar> unset or set it to <literal>tty</literal> (e.g.
-to support job control with ^Z etc...) using a syntax like this in the
-DOS shell, before launching bash.</para>
+<envar>CYGWIN</envar> unset or set it to a value indicating several
+global Cygwin settings, using a syntax like this in the DOS shell,
+before launching bash:</para>
 
 <screen>
-<prompt>C:\&gt;</prompt> <userinput>set CYGWIN=tty notitle glob</userinput>
+<prompt>C:\&gt;</prompt> <userinput>set CYGWIN=notitle glob</userinput>
 </screen>
 
 <para>
-For all possible settings of the <envar>CYGWIN</envar> environment variable,
-see <xref linkend="using-cygwinenv"></xref>.
+This is, of course, just an example.  For all possible settings of the
+<envar>CYGWIN</envar> environment variable, see
+<xref linkend="using-cygwinenv"></xref>.
 </para>
 
 <para>