Index: httpd-trunk/docs/manual/mod/mod_cgi.xml
===================================================================
--- httpd-trunk/docs/manual/mod/mod_cgi.xml     (revision 552320)
+++ httpd-trunk/docs/manual/mod/mod_cgi.xml     (working copy)
@@ -33,22 +33,15 @@
           is the link to howto/cgi not sufficient? -nd
     -->
 
-    <p>Any file that has the mime type
-    <code>application/x-httpd-cgi</code> or handler
-    <code>cgi-script</code> (Apache 1.1 or later) will be treated
+    <p>Any file that has the handler
+    <code>cgi-script</code> will be treated
     as a CGI script, and run by the server, with its output being
-    returned to the client. Files acquire this type either by
+    returned to the client. Files acquire this handler either by
     having a name containing an extension defined by the
-    <directive module="mod_mime">AddType</directive> directive, or by being
+    <directive module="mod_mime">AddHandler</directive> directive, or by being
     in a <directive module="mod_alias">ScriptAlias</directive>
     directory.</p>
 
-    <p>When the server invokes a CGI script, it will add a variable
-    called <code>DOCUMENT_ROOT</code> to the environment. This
-    variable will contain the value of the
-    <directive module="core">DocumentRoot</directive> configuration
-    variable.</p>
-
     <p>For an introduction to using CGI scripts with Apache, see
     our tutorial on <a href="../howto/cgi.html">Dynamic Content
     With CGI</a>.</p>
@@ -57,6 +50,10 @@
     <module>mod_cgid</module> should be used in place of
     this module. At the user level, the two modules are essentially
     identical.</p>
+    
+    <p>For backward-compatibility, the cgi-script handler will also be activated
+    for any file with the mime-type <code>application/x-httpd-cgi</code>. The
+    use of the magic mime-type is deprecated.<p>
 </summary>
 
 <seealso><directive module="core">AcceptPathInfo</directive></seealso>