diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 4ae01a8a6..5216666cb 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-01  Christopher Faylor  <cgf@timesys.com>
+
+	* cygwinenv.sgml: Document [no]dosfilewarning option.
+
 2006-07-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* pathnames.sgml: Change text for the order in which executables
diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
index 9cec61aae..6308125e2 100644
--- a/winsup/doc/cygwinenv.sgml
+++ b/winsup/doc/cygwinenv.sgml
@@ -69,6 +69,12 @@ Cygwin, you can use this option to select an appropriate codepage.
 </para>
 </listitem>
 
+<listitem>
+<para><envar>(no)dosfilewarning</envar> - If set, Cygwin will warn the
+first time a user uses an "MS-DOS" style path name rather than a POSIX-style
+path name.  Defaults to set.</para>
+</listitem>
+
 <listitem>
 <para><envar>(no)envcache</envar> - If set, environment variable
 conversions (between Win32 and POSIX) are cached.  Note that this is may
@@ -77,7 +83,7 @@ and may contain values that depend on the previous mount table
 contents. Defaults to set.</para>
 </listitem>
 <listitem>
-<para><envar>(no)export</envar> - if set, the final values of these
+<para><envar>(no)export</envar> - If set, the final values of these
 settings are re-exported to the environment as <envar>CYGWIN</envar> again.
 Defaults to off.</para>
 </listitem>