Imported Upstream version 2.4.9upstream/2.4.9

1 files changed, 29 insertions, 69 deletions

diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index a394b122..5f1dbb8a 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -9,7 +9,7 @@
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.js" type="text/javascript">
+<script src="../style/scripts/prettify.min.js" type="text/javascript">
 </script>
 
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
@@ -157,11 +157,9 @@
     script, but not the file <code>bar.cgi.html</code>, then instead
     of using <code>AddHandler cgi-script .cgi</code>, use</p>
 
-    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">
-&lt;FilesMatch \.cgi$&gt;
+    <div class="example"><h3>Configure handler based on final extension only</h3><pre class="prettyprint lang-config">&lt;FilesMatch \.cgi$&gt;
   SetHandler cgi-script
-&lt;/FilesMatch&gt;
-    </pre>
+&lt;/FilesMatch&gt;</pre>
 </div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -269,12 +267,10 @@ charset</td></tr>
     overriding any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddLanguage ja .ja
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddLanguage ja .ja
 AddCharset EUC-JP .euc
 AddCharset ISO-2022-JP .jis
-AddCharset SHIFT_JIS .sjis
-      </pre>
+AddCharset SHIFT_JIS .sjis</pre>
 </div>
 
     <p>Then the document <code>xxxx.ja.jis</code> will be treated
@@ -318,10 +314,8 @@ type</td></tr>
     overriding any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddEncoding x-gzip .gz
-AddEncoding x-compress .Z
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddEncoding x-gzip .gz
+AddEncoding x-compress .Z</pre>
 </div>
 
     <p>This will cause filenames containing the <code>.gz</code> extension
@@ -368,9 +362,7 @@ handler</td></tr>
     activate CGI scripts with the file extension <code>.cgi</code>, you
     might use:</p>
 
-    <pre class="prettyprint lang-config">
-      AddHandler cgi-script .cgi
-    </pre>
+    <pre class="prettyprint lang-config">AddHandler cgi-script .cgi</pre>
 
 
     <p>Once that has been put into your httpd.conf file, any file containing
@@ -442,11 +434,9 @@ language</td></tr>
     This directive overrides any mappings that already exist for the same
     <var>extension</var>.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-AddEncoding x-compress .Z
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddEncoding x-compress .Z
 AddLanguage en .en
-AddLanguage fr .fr
-      </pre>
+AddLanguage fr .fr</pre>
 </div>
 
     <p>Then the document <code>xxxx.en.Z</code> will be treated as
@@ -462,11 +452,9 @@ AddLanguage fr .fr
     extension, the last one encountered is the one that is used.
     That is, for the case of:</p>
 
-    <pre class="prettyprint lang-config">
-AddLanguage en .en
+    <pre class="prettyprint lang-config">AddLanguage en .en
 AddLanguage en-gb .en
-AddLanguage en-us .en
-    </pre>
+AddLanguage en-us .en</pre>
 
 
     <p>documents with the extension <code>.en</code> would be treated as
@@ -505,9 +493,7 @@ responses from the server</td></tr>
     <code>.shtml</code> files for server-side includes and will then
     compress the output using <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>.</p>
 
-    <pre class="prettyprint lang-config">
-      AddOutputFilter INCLUDES;DEFLATE shtml
-    </pre>
+    <pre class="prettyprint lang-config">AddOutputFilter INCLUDES;DEFLATE shtml</pre>
 
 
     <p>If more than one filter is specified, they must be separated
@@ -525,8 +511,7 @@ responses from the server</td></tr>
     the <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code>
     directive.</p>
 
-    <pre class="prettyprint lang-config">
-# Effective filter "DEFLATE"
+    <pre class="prettyprint lang-config"># Effective filter "DEFLATE"
 AddOutputFilter DEFLATE shtml
 &lt;Location /foo&gt;
   # Effective filter "INCLUDES", replacing "DEFLATE"
@@ -543,8 +528,7 @@ AddOutputFilter DEFLATE shtml
 &lt;Location /bar/baz/buz&gt;
   # No effective filter, replacing "BUFFER"
   RemoveOutputFilter shtml
-&lt;/Location&gt;
-    </pre>
+&lt;/Location&gt;</pre>
 
 
 <h3>See also</h3>
@@ -579,16 +563,12 @@ type</td></tr>
       <code class="directive"><a href="#typesconfig">TypesConfig</a></code> file.
     </div>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType image/gif .gif
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddType image/gif .gif</pre>
 </div>
 
     <p>Or, to specify multiple file extensions in one directive:</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType image/jpeg jpeg jpg jpe
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddType image/jpeg jpeg jpg jpe</pre>
 </div>
 
     <p>The <var>extension</var> argument is case-insensitive and can
@@ -601,9 +581,7 @@ type</td></tr>
     can be achieved by qualifying a <var>media-type</var> with
     <code>qs</code>:</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      AddType application/rss+xml;qs=0.8 .xml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">AddType application/rss+xml;qs=0.8 .xml</pre>
 </div>
 
     <p>This is useful in situations, <em>e.g.</em> when a client
@@ -650,9 +628,7 @@ assigned a language-tag by some other means.</td></tr>
     by <code class="directive"><a href="#addlanguage">AddLanguage</a></code>, then no
     Content-Language header field will be generated.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      DefaultLanguage en
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">DefaultLanguage en</pre>
 </div>
 
 <h3>See also</h3>
@@ -679,9 +655,7 @@ components as part of the filename</td></tr>
 
     <p>This directive is recommended when you have a virtual filesystem.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      ModMimeUsePathInfo On
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">ModMimeUsePathInfo On</pre>
 </div>
 
     <p>If you have a request for <code>/index.php/foo.shtml</code>
@@ -745,9 +719,7 @@ a matching file with MultiViews</td></tr>
     and filters to participate in Multviews, but will exclude unknown
     files:</p>
 
-    <pre class="prettyprint lang-config">
-      MultiviewsMatch Handlers Filters
-    </pre>
+    <pre class="prettyprint lang-config">MultiviewsMatch Handlers Filters</pre>
 
 
     <p><code class="directive">MultiviewsMatch</code> is not allowed in a
@@ -781,9 +753,7 @@ extensions</td></tr>
     <p>The <var>extension</var> argument is case-insensitive and can
     be specified with or without a leading dot.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      RemoveCharset .html .shtml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">RemoveCharset .html .shtml</pre>
 </div>
 
 </div>
@@ -805,13 +775,11 @@ extensions</td></tr>
     any associations inherited from parent directories or the
     server config files. An example of its use might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-AddEncoding x-gzip .gz
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">AddEncoding x-gzip .gz
 AddType text/plain .asc
 &lt;Files *.gz.asc&gt;
     RemoveEncoding .gz
-&lt;/Files&gt;
-      </pre>
+&lt;/Files&gt;</pre>
 </div>
 
     <p>This will cause <code>foo.gz</code> to be marked as being
@@ -847,14 +815,10 @@ extensions</td></tr>
     associations inherited from parent directories or the server
     config files. An example of its use might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-      AddHandler server-parsed .html
-      </pre>
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">AddHandler server-parsed .html</pre>
 </div>
 
-    <div class="example"><h3>/foo/bar/.htaccess:</h3><pre class="prettyprint lang-config">
-      RemoveHandler .html
-      </pre>
+    <div class="example"><h3>/foo/bar/.htaccess:</h3><pre class="prettyprint lang-config">RemoveHandler .html</pre>
 </div>
 
     <p>This has the effect of returning <code>.html</code> files in
@@ -937,9 +901,7 @@ extensions</td></tr>
     <p>The <var>extension</var> argument is case-insensitive and can
     be specified with or without a leading dot.</p>
 
-    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">
-      RemoveOutputFilter shtml
-      </pre>
+    <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">RemoveOutputFilter shtml</pre>
 </div>
 
 <h3>See also</h3>
@@ -966,9 +928,7 @@ extensions</td></tr>
     directories or the server config files. An example of its use
     might be:</p>
 
-    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">
-      RemoveType .cgi
-      </pre>
+    <div class="example"><h3>/foo/.htaccess:</h3><pre class="prettyprint lang-config">RemoveType .cgi</pre>
 </div>
 
     <p>This will remove any special handling of <code>.cgi</code>
@@ -1066,7 +1026,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_mime.html';
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2013 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2014 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();