diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 73ff91fe6..e552a123c 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-19  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+
+	* cygwinenv.sgml: Remove incorrect ^Z information. Add 
+	some tags to server option description.
+	* textbinary.sgml: Remove incorrect ^Z information.
+
 2004-02-16  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwinenv.sgml: Add server option description.
diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
index b32813e8a..b9d9af394 100644
--- a/winsup/doc/cygwinenv.sgml
+++ b/winsup/doc/cygwinenv.sgml
@@ -139,8 +139,13 @@ time and when handles are inherited.  Defaults to set.</para>
 <para><envar>(no)server</envar> - if set, allows client applications
 to use the Cygserver facilities.  This option must be enabled explicitely
 on the client side, otherwise your applications won't be able to use the
-XSI IPC function calls (msgget, semget, shmget and friends) successfully.
-These function calls will return with ENOSYS, "Bad system call".</para>
+XSI IPC function calls (<function>msgget</function>,
+<function>semget</function>, <function>shmget</function>, and friends)
+successfully.  These function calls will return with
+<literal>ENOSYS</literal>, "Bad system call".
+</para>
+</listitem>
+<listitem>
 <para><envar>(no)strip_title</envar> - if set, strips the directory
 part off the window title, if any.  Default is not set.</para>
 </listitem>
@@ -156,9 +161,9 @@ nostrip_title</literal>.</para>
 <para><envar>(no)tty</envar> - if set, Cygwin enables extra support
 (i.e., termios) for UNIX-like ttys. 
 It is not compatible with some Windows programs.
-Defaults to not set, in which case the tty is opened in text mode 
-with ^Z as EOF. Note that this has been changed such that ^D works as
-expected instead of ^Z, and is settable via stty.
+Defaults to not set, in which case the tty is opened in text mode.
+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.</para>
 </listitem>
diff --git a/winsup/doc/textbinary.sgml b/winsup/doc/textbinary.sgml
index c561d030a..7c8efb79a 100644
--- a/winsup/doc/textbinary.sgml
+++ b/winsup/doc/textbinary.sgml
@@ -6,20 +6,9 @@
 exactly what's in the file on disk and the converse is true for writing.
 The situation is different in the DOS/Windows world where a file can
 be opened in one of two modes, binary or text.  In the binary mode the
-system behaves exactly as in UNIX.  However in text mode there are
-major differences:</para>
-<OrderedList Numeration="Loweralpha" Spacing="Compact">
-<listitem>
-<para>
-On writing in text mode, a NL (\n, ^J) is transformed into the 
-sequence CR (\r, ^M) NL.</para>
-</listitem>
-<listitem>
-<para>
-On reading in text mode, a CR followed by an NL is deleted and a ^Z
-character signals the end of file.</para>
-</listitem>
-</OrderedList>
+system behaves exactly as in UNIX.  However on writing in text mode, a
+NL (\n, ^J) is transformed into the sequence CR (\r, ^M) NL.
+</para>
 
 <para>This can wreak havoc with the seek/fseek calls since the number
 of bytes actually in the file may differ from that seen by the
@@ -140,9 +129,8 @@ should work well in the default mode. </para>
 Windows programs, since Windows programs will usually use the CRLF
 format.  Unfortunately you may still have some problems with text
 mode.  First, some of the utilities included with Cygwin do not yet
-specify binary mode when they should, e.g. <command>cat</command> will
-not work with binary files (input will stop at ^Z, CRs will be
-introduced in the output). Second, you will introduce CRs in text
+specify binary mode when they should.
+Second, you will introduce CRs in text
 files you write, which can cause problems when moving them back to a
 UNIX system. </para>