* faq-using.xml (faq.using.converting-paths): Remove reference to

	cygwin.bat.
	(faq.using.emacs): Drop "CYGWIN=tty" setting.
	* pathnames.sgml (pathnames-posixdevices): Align list of device names
	with changes in 1.7.10.
	* setup2.sgml (setup-env-ov): Drop text which assumes that Cygwin
	processes are started in console window.  Align wording to lessened
	relevance of $CYGWIN.  Don't use dropped CYGWIN setting in example.
	(setup-locale-how): Put using console and Cygwin.bat file into
	perspective.
	(setup-locale-problems): Ditto.

4 files changed, 59 insertions, 48 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 3c373eb05..9c1b7c21c 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,17 @@
+2011-11-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-using.xml (faq.using.converting-paths): Remove reference to
+	cygwin.bat.
+	(faq.using.emacs): Drop "CYGWIN=tty" setting.
+	* pathnames.sgml (pathnames-posixdevices): Align list of device names
+	with changes in 1.7.10.
+	* setup2.sgml (setup-env-ov): Drop text which assumes that Cygwin
+	processes are started in console window.  Align wording to lessened
+	relevance of $CYGWIN.  Don't use dropped CYGWIN setting in example.
+	(setup-locale-how): Put using console and Cygwin.bat file into
+	perspective.
+	(setup-locale-problems): Ditto.
+
 2011-11-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.sgml (ov-new1.7.10): Document ptsname_r.
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 27f77837f..edce36d9f 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -113,10 +113,10 @@ information.  For example (on my installation):
 <screen>
 	bash$ cygpath --windows ~/.bashrc
         D:\starksb\.bashrc
-        bash$ cygpath --unix C:/cygwin/bin/cygwin.bat
-        /usr/bin/cygwin.bat
-        bash$ cygpath --unix C:\\cygwin\\bin\\cygwin.bat
-        /usr/bin/cygwin.bat
+        bash$ cygpath --unix C:/cygwin/bin/ls.exe
+        /usr/bin/ls.exe
+        bash$ cygpath --unix C:\\cygwin\\bin\\ls.exe
+        /usr/bin/ls.exe
 </screen>
 Note that bash interprets the backslash '\' as an escape character, so
 you must type it twice in the bash shell if you want it to be recognized
@@ -785,9 +785,7 @@ need in order to run GNU emacs in a terminal window.  If you also want
 to be able to use the X11
 (<ulink url="http://cygwin.com/xfree/">http://cygwin.com/xfree/</ulink>)
 GUI, install the emacs-X11 package.  In either case, you run emacs by
-typing 'emacs' or '/usr/bin/emacs'.  If you run emacs in the cygwin
-console, be sure that your CYGWIN environment variable contains tty.
-See /usr/share/doc/Cygwin/emacs.README for further information.
+typing 'emacs' or '/usr/bin/emacs'.
 </para>
 </answer></qandaentry>
 
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index 3ad200b7c..d32d50c23 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -706,17 +706,23 @@ Cygwin supports the following character devices commonly found on POSIX systems:
 /dev/zero
 /dev/full
 
-/dev/console	Pseudo device name for the standard console window created
-		by Windows.  Same as the one used for cmd.exe.  Every one
-		of them has this name.  It's not quite comparable with the
-		console device on UNIX machines.
+/dev/console	Pseudo device name for the current console window of a session.
+		Up to Cygwin 1.7.9, this was the only name for a console.
+		Different consoles were indistinguishable.
+		Cygwin's /dev/console is not quite comparable with the console
+		device on UNIX machines.
+
+/dev/cons0      Starting with Cygwin 1.7.10, Console sessions are numbered from 
+/dev/cons1	/dev/cons0 upwards.  Console device names are pseudo device
+...		names, only accessible from processes within this very console
+		session.  This is due to a restriction in Windows.
+
+/dev/tty	The current controlling tty of a session.
 
-/dev/tty	The current tty of a session running in a pseudo tty.
 /dev/ptmx	Pseudo tty master device.
-/dev/ttym
 
-/dev/tty0	Pseudo ttys are numbered from /dev/tty0 upwards as they are
-/dev/tty1	requested.
+/dev/pty0	Pseudo ttys are numbered from /dev/pty0 upwards as they are
+/dev/pty1	requested.
 ...
 
 /dev/ttyS0	Serial communication devices.  ttyS0 == Win32 COM1,
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index 1ffe8f8f8..52daf8875 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -3,31 +3,23 @@
 <sect2 id="setup-env-ov"><title>Overview</title>
 
 <para>
-You may wish to specify settings of several important environment
-variables that affect Cygwin's operation.  Some of these settings need
-to be in effect prior to launching the initial Cygwin session (before
-starting your bash shell, for instance).  They should therefore be set
-in the Windows environment; all Windows environment variables are
-imported when Cygwin starts.  Such settings can be
-placed in a .bat file.  An initial file is named Cygwin.bat and is created
-in the Cygwin root directory that you specified during setup.  Note that
-the "Cygwin" option of the Start Menu points to Cygwin.bat.  Edit
-Cygwin.bat to your liking or create your own .bat files to start
-Cygwin processes.</para>
+All Windows environment variables are imported when Cygwin starts.
+Apart from that, you may wish to specify settings of several important
+environment variables that affect Cygwin's operation.</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 a value indicating several
-global Cygwin settings, using a syntax like this in the DOS shell,
-before launching bash:</para>
+The <envar>CYGWIN</envar> variable is used to configure a few global
+settings for the Cygwin runtime system.  Typically you can leave
+<envar>CYGWIN</envar> unset, but if you want to set one ore more
+options, you can set it using a syntax like this, depending on the shell
+in which you're setting it.  Here is an example in CMD syntax:</para>
 
 <screen>
-<prompt>C:\&gt;</prompt> <userinput>set CYGWIN=notitle glob</userinput>
+<prompt>C:\&gt;</prompt> <userinput>set CYGWIN=error_start:C:\cygwin\bin\gdb.exe glob</userinput>
 </screen>
 
 <para>
-This is, of course, just an example.  For all possible settings of the
+This is, of course, just an example.  For the recognized settings of the
 <envar>CYGWIN</envar> environment variable, see
 <xref linkend="using-cygwinenv"></xref>.
 </para>
@@ -395,9 +387,10 @@ You don't want to use the default character set?  In that case you have to
 specify the charset explicitly.  For instance, assume you're from Japan and
 don't want to use the japanese default charset EUC-JP, but the Windows
 default charset SJIS.  What you can do, for instance, is to set the
-<envar>LANG</envar> variable in the <filename>C:\cygwin\Cygwin.bat</filename>
-file which is the batch file to start a Cygwin session from the "Cygwin"
-desktop shortcut.</para>
+<envar>LANG</envar> variable in the <command>mintty</command> Cygwin Terminal
+in the "Text" section of its "Options" dialog.  If you're starting your
+Cygwin session via a batch file or a shortcut to a batch file, you can also
+just set LANG there:</para>
 
 <screen>
   @echo off
@@ -443,19 +436,19 @@ every Unicode character.</emphasis></para>
 
 <sect2 id="setup-locale-console"><title>The Windows Console character set</title>
 
-<para>Most of the time the Windows console is used to run Cygwin applications.
-While terminal emulations like <command>xterm</command> or
-<command>mintty</command> have a distinct way to set the character set
+<para>Sometimes the Windows console is used to run Cygwin applications.
+While terminal emulations like the Cygwin Terminal <command>mintty</command>
+or <command>xterm</command> have a distinct way to set the character set
 used for in- and output, the Windows console hasn't such a way, since it's
 not an application in its own right.</para>
 
 <para>This problem is solved in Cygwin as follows.  When a Cygwin
 process is started in a Windows console (either explicitly from cmd.exe,
-or implicitly by, for instance, clicking on the Cygwin desktop icon, or
-running the Cygwin.bat file), the Console character set is determined by the
-setting of the aforementioned internationalization environment variables,
-the same way as described in <xref linkend="setup-locale-how"></xref>.
-</para>
+or implicitly by, for instance, running the
+<filename>C:\cygwin\Cygwin.bat</filename> batch file), the Console character
+set is determined by the setting of the aforementioned
+internationalization environment variables, the same way as described in
+<xref linkend="setup-locale-how"></xref>.  </para>
 
 <para>What is that good for?  Why not switch the console character set with
 the applications requirements?  After all, the application knows if it uses
@@ -473,10 +466,10 @@ problem.</para>
 <sect2 id="setup-locale-problems"><title>Potential Problems when using Locales</title>
 
 <para>
-You can set the above internationalization variables not only in
-<filename>Cygwin.bat</filename> or in the Windows environment, but also
-in your Cygwin shell on the fly, even switch to yet another character
-set, and yet another.  In bash for instance:</para>
+You can set the above internationalization variables not only when
+starting the first Cygwin process, but also in your Cygwin shell on the
+fly, even switch to yet another character set, and yet another.  In bash
+for instance:</para>
 
 <screen>
   <prompt>bash$</prompt> export LC_CTYPE="nl_BE.UTF-8"