diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 994b796ef..c1f207b94 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-26  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+	* cygwinenv.sgml: Add example for CYGWIN=error_start.
+	* pathnames.sgml: Update list of /dev/ devices.
+
 2004-02-22  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
 	* Makefile.in: Fix problem links in faq0.html file.
 	* what.texinfo: Remove outdated 'recent' history.
diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
index b9d9af394..1ebd770df 100644
--- a/winsup/doc/cygwinenv.sgml
+++ b/winsup/doc/cygwinenv.sgml
@@ -20,8 +20,6 @@ for redirection from the Windows command shell.  It will also affect
 the default translation mode of a pipe, although most shells set the
 pipe to binary by default.
 </para>
-<warning><title>Warning!</title><para>If set in 12/98 b20.1, all files 
-always open in binary mode.</para></warning>
 </listitem>
 <listitem>
 <para><envar>check_case:level</envar> - Controls the behaviour of
@@ -81,11 +79,15 @@ settings are re-exported to the environment as <envar>CYGWIN</envar> again.
 Defaults to off.</para>
 </listitem>
 <listitem>
-<para><envar>error_start:filepath</envar> - if set, runs 
-<filename>filepath</filename> when cygwin encounters a fatal error.  This is
-useful for debugging.  <filename>filepath</filename> is usually set to the path
-to the <command>gdb</command> or <command>dumper</command> program.
-There is no default set.</para>
+<para>
+<envar>error_start:Win32filepath</envar> - if set, runs 
+<filename>Win32filepath</filename> when cygwin encounters a fatal error,
+which is useful for debugging.  <filename>Win32filepath</filename> is
+usually set to the path to <command>gdb</command> or
+<command>dumper</command>, for example
+<filename>C:\cygwin\bin\gdb.exe</filename>. 
+There is no default set.
+</para>
 </listitem>
 <listitem>
 <para><envar>forkchunk:32768</envar> - causes <function>fork()</function>
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index 61e374f08..93b492281 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -156,16 +156,28 @@ default printer with the command <command>cat filename > PRN</command>
 
 <sect2> <title>POSIX devices</title>
 <para>There is no need to create a POSIX <filename>/dev</filename> 
-directory as it is simulated within Cygwin automatically.
-It supports the following devices: <filename>/dev/null</filename>,
-<filename>/dev/zero</filename>, <filename>/dev/tty</filename>,
-<filename>/dev/ttyX</filename>, <filename>/dev/ptmx</filename>,
-<filename>/dev/comX</filename> (the serial ports),
-<filename>/dev/windows</filename> (the windows message queue),
-<filename>/dev/random</filename> and <filename>/dev/urandom</filename>.
-These devices cannot be seen with the command <command>ls /dev</command>
+directory as Cygwin automatically simulates it internally. 
+These devices cannot be seen with the command <command>ls /dev/</command>
 although commands such as <command>ls /dev/tty</command> work fine.
 </para>
+<para>
+Cygwin supports the following devices commonly found on POSIX systems:
+<filename>/dev/dsp</filename>, <filename>/dev/null</filename>, 
+<filename>/dev/zero</filename>, <filename>/dev/console</filename>,
+<filename>/dev/tty</filename>, <filename>/dev/ttym</filename>, 
+<filename>/dev/ttyX</filename>, <filename>/dev/ttySX</filename>, 
+<filename>/dev/pipe</filename>, <filename>/dev/port</filename>, 
+<filename>/dev/ptmx</filename>, <filename>/dev/mem</filename>,
+<filename>/dev/random</filename>, and <filename>/dev/urandom</filename>.
+Cygwin also has several Windows-specific devices:
+<filename>/dev/comX</filename> (the serial ports, starting with 
+<filename>COM1</filename> which is the same as <filename>ttyS0</filename>),
+<filename>/dev/conin</filename> (Windows <filename>CONIN$</filename>),
+<filename>/dev/conout</filename> (Windows <filename>CONOUT$</filename>),
+<filename>/dev/clipboard</filename> (the Windows clipboard, currently
+text only), and
+<filename>/dev/windows</filename> (the Windows message queue).
+</para>
 
 <para>Windows NT/W2K/XP additionally support raw devices like floppies,
 disks, partitions and tapes.  These are accessed from Cygwin applications
@@ -232,6 +244,7 @@ ln -s /dev/nst0  /dev/tape
 ...
 </screen>
 
+<warning>
 <para>
 Note that you can't use the mount table to map from fixed device name
 to your own device name or to map from internal NT device name to
@@ -241,10 +254,11 @@ The following three examples will not work as expected:
 </para>
 
 <screen>
-mount -f -b /dev/nst0 /dev/tape
+mount -f -b /dev/nst0 /dev/tape 
 mount -f -b /device/tape0 /dev/tape
 ln -s /device/tape0 /dev/tape
 </screen>
+</warning>
 
 </sect2>