clarify the meaning of "SetHandler None"

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 75f725ee5d5f6cc3597be3e55060a3c68e4ee2c8..655709802eae832e093f4b67e77938f1d01c0931 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1113,7 +1113,7 @@ filenames</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Forces all matching files to be served with the specified
 MIME content-type</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForceType <var>MIME-type</var>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ForceType <var>MIME-type</var>|None</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
@@ -1139,7 +1139,7 @@ MIME content-type</td></tr>
     filename extensions, that might identify the media type.</p>
 
     <p>You can override any <code class="directive">ForceType</code> setting
-    by using the value of <code>none</code>:</p>
+    by using the value of <code>None</code>:</p>
 
     <div class="example"><p><code>
       # force all files to be image/gif:<br />
@@ -1152,7 +1152,7 @@ MIME content-type</td></tr>
       # but normal mime-type associations here:<br />
       &lt;Location /images/mixed&gt;<br />
       <span class="indent">
-        ForceType none<br />
+        ForceType None<br />
       </span>
       &lt;/Location&gt;
     </code></p></div>
@@ -2689,6 +2689,9 @@ handler</td></tr>
       &lt;/Location&gt;
     </code></p></div>
 
+    <p>You can override an earlier defined <code class="directive">SetHandler</code>
+    directive by using the value <code>None</code>.</p>
+
 <h3>See also</h3>
 <ul>
 <li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 260c0d37ff98df46d0039b48ab0bb01e97203445..96f75e8595e489494c1e219c560b04f9b90b7af6 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1064,7 +1064,7 @@ filenames</description>
 <name>ForceType</name>
 <description>Forces all matching files to be served with the specified
 MIME content-type</description>
-<syntax>ForceType <var>MIME-type</var>|none</syntax>
+<syntax>ForceType <var>MIME-type</var>|None</syntax>
 <contextlist><context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>FileInfo</override>
@@ -1090,7 +1090,7 @@ MIME content-type</description>
     filename extensions, that might identify the media type.</p>
 
     <p>You can override any <directive>ForceType</directive> setting
-    by using the value of <code>none</code>:</p>
+    by using the value of <code>None</code>:</p>
 
     <example>
       # force all files to be image/gif:<br />
@@ -1103,7 +1103,7 @@ MIME content-type</description>
       # but normal mime-type associations here:<br />
       &lt;Location /images/mixed&gt;<br />
       <indent>
-        ForceType none<br />
+        ForceType None<br />
       </indent>
       &lt;/Location&gt;
     </example>
@@ -2632,6 +2632,9 @@ handler</description>
       </indent>
       &lt;/Location&gt;
     </example>
+
+    <p>You can override an earlier defined <directive>SetHandler</directive>
+    directive by using the value <code>None</code>.</p>
 </usage>
 
 <seealso><directive module="mod_mime">AddHandler</directive></seealso>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index d290a6c22f5462599b90a2956c8c11da6237000c..0a9c75552ee6541e294823edfdad43588c619b12 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -309,7 +309,7 @@ filenames</td></tr>
 filenames</td></tr>
 <tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action to take if a single acceptable document is not 
 found</td></tr>
-<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|none</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
+<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|None</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
 MIME content-type</td></tr>
 <tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>