Add information on backwards-compatible handler and magic-mime-types

for mod_include.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90727 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html
index 785131aac5b5605eabb2ce1e0eb0b1e13b2ddef1..7f137cf973b5fb821d6534f3f5aebe836b58e065 100644 (file)
--- a/docs/manual/mod/mod_include.html
+++ b/docs/manual/mod/mod_include.html
@@ -87,6 +87,13 @@ Options</CODE> is set):</p>
 Options +Includes
 </code></blockquote>
 
+<p>For backwards compatibility, the <code>server-parsed</code> <a
+href="../handler.html">handler</a> also activates the INCLUDES filter.
+As well, Apache will activate the INCLUDES filter for any document
+with mime type <code>text/x-server-parsed-html</code> or
+<code>text/x-server-parsed-html3</code> (and the resulting output will
+have the mime type <code>text/html</code>).</p>
+
 <p>For more information, see our <a href="../howto/ssi.html">Tutorial
 on Server Side Includes</a>.</p>
 

diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 901927f595e39ebeedfc6b13a8cb8bd4db44adf1..3a8c47c248696ab77bb006e23284f1561b4ee761 100644 (file)
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -44,22 +44,6 @@ you should select the <a href="mod/prefork.html">prefork</a>
 MPM.  Other MPMs will have different directives to control process
 creation and request processing.</li>
 
-<li>Server-Side Includes provided by <a
-href="mod/mod_include.html">mod_include</a> are now implemented using
-the new
-<a href="filter.html">filter system</a> rather than as a handler.
-This provides much more power and flexibility, but requires 
-the use of the <a href="mod/core.html#setoutputfilter">SetOutputFilter</a>
-to activate server-parsed content.  If you were using
-<code>AddHandler server-parsed .shtml</code>, you can get
-similar functionality using
-<blockquote><code>
-&lt;FilesMatch "\.shtml(\..+)?$"&gt;<br>
-&nbsp;&nbsp;SetOutputFilter INCLUDES<br>
-&lt;/FilesMatch&gt;
-</code></blockquote></li>
-
-
 <li>The <code>CacheNegotiatedDocs</code> directive now takes
 the argument <code>on</code> or <code>off</code>.  Existing
 instances of <code>CacheNegotiatedDocs</code> should be replaced