Update all the references I can find to use SetOutputFilter to

actives SSIs.

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

diff --git a/docs/manual/howto/ssi.html b/docs/manual/howto/ssi.html
index d804733738b3d399bc893466610aecde005d97c8..da17836b410df4ad63260246ab69d4681d6cfd4b 100644 (file)
--- a/docs/manual/howto/ssi.html
+++ b/docs/manual/howto/ssi.html
@@ -143,7 +143,9 @@ such as <code>.shtml</code>, with the following directives:</p>
 
 <pre>
         AddType text/html .shtml
-        AddHandler server-parsed .shtml
+        &lt;FilesMatch "\.shtml[.$]"&gt;
+          SetOutputFilter INCLUDES<br>
+        &lt;/FilesMatch&gt;
 </pre>
 
 <p>One disadvantage to this approach is that if you wanted to add SSI

diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en
index d804733738b3d399bc893466610aecde005d97c8..da17836b410df4ad63260246ab69d4681d6cfd4b 100644 (file)
--- a/docs/manual/howto/ssi.html.en
+++ b/docs/manual/howto/ssi.html.en
@@ -143,7 +143,9 @@ such as <code>.shtml</code>, with the following directives:</p>
 
 <pre>
         AddType text/html .shtml
-        AddHandler server-parsed .shtml
+        &lt;FilesMatch "\.shtml[.$]"&gt;
+          SetOutputFilter INCLUDES<br>
+        &lt;/FilesMatch&gt;
 </pre>
 
 <p>One disadvantage to this approach is that if you wanted to add SSI

diff --git a/docs/manual/misc/FAQ-F.html b/docs/manual/misc/FAQ-F.html
index 7acb96e5169cbfd57ee813f8ff9823f4a50ebef0..87c71faeae8824e06e4fa9572791e237a4932463 100644 (file)
--- a/docs/manual/misc/FAQ-F.html
+++ b/docs/manual/misc/FAQ-F.html
@@ -31,7 +31,7 @@
   <!--#include virtual="header.html" -->
   <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
   <P>
-  $Revision: 1.7 $ ($Date: 2000/12/02 21:39:03 $)
+  $Revision: 1.8 $ ($Date: 2001/02/10 23:33:36 $)
   </P>
   <P>
   The latest version of this FAQ is always available from the main
@@ -383,22 +383,24 @@
     directive which permits <SAMP>Includes</SAMP>.
    </LI>
    <LI>Make sure that the directory where you want the SSI documents to
-    live is covered by the &quot;server-parsed&quot; content handler,
+    live is covered by the &quot;INCLUDES&quot; output filter,
     either explicitly or in some ancestral location.  That can be done
     with the following
-    <A HREF="../mod/mod_mime.html#addhandler"><SAMP>AddHandler</SAMP></A>
+    <A HREF="../mod/core.html#setoutputfilter"><SAMP>SetOutputFilter</SAMP></A>
     directive:
     <P>
-    <DL>
-     <DD><CODE>AddHandler server-parsed .shtml</CODE>
-     </DD>
-    </DL>
+    <blockquote><code>
+    &lt;FilesMatch "\.shtml[.$]"&gt;<br>
+    &nbsp;&nbsp;SetOutputFilter INCLUDES<br>
+    &lt;/FilesMatch&gt;
+    </code></blockquote>
     <P></P>
     <P>
-    This indicates that all files ending in &quot;.shtml&quot; in that
-    location (or its descendants) should be parsed.  Note that using
-    &quot;.html&quot; will cause all normal HTML files to be parsed,
-    which may put an inordinate load on your server.
+    This indicates that all files with the extension
+    &quot;.shtml&quot; in that location (or its descendants) should be
+    parsed.  Note that using &quot;.html&quot; will cause all normal
+    HTML files to be parsed, which may put an inordinate load on your
+    server.
     </P>
    </LI>
   </UL>

diff --git a/docs/manual/misc/custom_errordocs.html b/docs/manual/misc/custom_errordocs.html
index 983d46beb62ec18e7bc3aeb3f9f3720f84c69b7c..c2c2310a13dc97db3e9fdfa1e519caaeb3e63d5b 100644 (file)
--- a/docs/manual/misc/custom_errordocs.html
+++ b/docs/manual/misc/custom_errordocs.html
@@ -145,7 +145,9 @@ the contained directives- must be omitted.)</SMALL>
    AllowOverride none
    Options MultiViews IncludesNoExec FollowSymLinks
    AddType text/html .shtml
-   AddHandler server-parsed .shtml
+   &lt;FilesMatch "\.shtml[.$]"&gt;
+    SetOutputFilter INCLUDES
+   &lt;/FilesMatch&gt;
   &lt;/Directory&gt;
   #    "400 Bad Request",
   ErrorDocument  400  /errordocs/400

diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html
index ce373b8fa8434b2911748096760f9eb566ff5f0d..ae0500cdcf2eecd264141db1bc6c6d278fdecc00 100644 (file)
--- a/docs/manual/mod/mod_include.html
+++ b/docs/manual/mod/mod_include.html
@@ -61,34 +61,38 @@ and <a href="mod_mime.html#addhandler">AddHandler</a>.</p>
 
 <H2>Enabling Server-Side Includes</H2>
 
-Any document with handler of "server-parsed" will be parsed by this
-module, if the <CODE>Includes</CODE> option is set. If documents
-containing server-side include directives are given the extension
-.shtml, the following directives will make Apache parse them and
-assign the resulting document the mime type of <CODE>text/html</CODE>:
-
-<PRE>
-AddType text/html .shtml
-AddHandler server-parsed .shtml
-</PRE>
-
-The following directive must be given for the directories containing
+<p>Server Side Includes are implemented by the <code>INCLUDES</code>
+<a href="../filter.html">filter</a>.  If documents containing
+server-side include directives are given the extension .shtml, the
+following directives will make Apache parse them and assign the
+resulting document the mime type of <CODE>text/html</CODE>:
+</p>
+
+<blockquote><code>
+AddType text/html .shtml<br>
+&lt;FilesMatch "\.shtml[.$]"&gt;<br>
+&nbsp;&nbsp;SetOutputFilter INCLUDES<br>
+&lt;/FilesMatch&gt;
+</code></blockquote>
+
+<p>The following directive must be given for the directories containing
 the shtml files (typically in a <CODE>&lt;Directory&gt;</CODE> section,
 but this directive is also valid .htaccess files if <CODE>AllowOverride
-Options</CODE> is set):
+Options</CODE> is set):</p>
 
-<PRE>
+<blockquote><code>
 Options +Includes
-</PRE>
+</code></blockquote>
 
-Alternatively the <A HREF="#xbithack"><CODE>XBitHack</CODE></A>
+<p>Alternatively the <A HREF="#xbithack"><CODE>XBitHack</CODE></A>
 directive can be used to parse normal (<CODE>text/html</CODE>) files,
-based on file permissions.  <P>
+based on file permissions.</p>
 
-For backwards compatibility, documents with mime type
+<p>For backwards compatibility, documents with mime type
 <CODE>text/x-server-parsed-html</CODE> or
 <CODE>text/x-server-parsed-html3</CODE> will also be parsed
-(and the resulting output given the mime type <CODE>text/html</CODE>).
+(and the resulting output given the mime type <CODE>text/html</CODE>)
+as will documents with the handler <code>server-parsed</code>.
 
 <H2>Basic Elements</H2>