Corrected/added the context/override information.

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

diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en
index 7f05e4f7d33a60c1a948faa0e474584cf843b062..d79babdea15bb0c1e85efc9bd382619ce038f5dc 100644 (file)
--- a/docs/manual/mod/mod_cern_meta.html.en
+++ b/docs/manual/mod/mod_cern_meta.html.en
@@ -22,7 +22,8 @@
 files</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" class="help">Syntax:
                   </a></td><td>MetaDir <em>directory</em></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                     </a></td><td><code>MetaDir .web</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
-                  </a></td><td>directory</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
+                  </a></td><td>server config, virtual host, directory, .htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override" class="help">Override:
+                    </a></td><td>Indexes</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                   </a></td><td>Extension</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                   </a></td><td>mod_cern_meta</td></tr></table></td></tr></table>
     <p>Specifies the name of the directory in which Apache can find
@@ -41,7 +42,8 @@ files</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" clas
                   </strong></td><td>Activates CERN meta-file processing</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" class="help">Syntax:
                   </a></td><td>MetaFiles on|off</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                     </a></td><td><code>MetaFiles off</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
-                  </a></td><td>directory</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
+                  </a></td><td>server config, virtual host, directory, .htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override" class="help">Override:
+                    </a></td><td>Indexes</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                   </a></td><td>Extension</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                   </a></td><td>mod_cern_meta</td></tr></table></td></tr></table>
     <p>Turns on/off Meta file processing on a per-directory basis.</p>
@@ -50,7 +52,8 @@ files</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" clas
 meta information</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Syntax" class="help">Syntax:
                   </a></td><td>MetaSuffix <em>suffix</em></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Default" class="help">Default: 
                     </a></td><td><code>MetaSuffix .meta</code></td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Context" class="help">Context:
-                  </a></td><td>directory</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
+                  </a></td><td>server config, virtual host, directory, .htaccess</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Override" class="help">Override:
+                    </a></td><td>Indexes</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Status" class="help">Status:
                   </a></td><td>Extension</td></tr><tr><td nowrap="nowrap"><a href="directive-dict.html#Module" class="help">Module:
                   </a></td><td>mod_cern_meta</td></tr></table></td></tr></table>
     <p>Specifies the file name suffix for the file containing the

diff --git a/docs/manual/mod/mod_cern_meta.xml b/docs/manual/mod/mod_cern_meta.xml
index 9b7f4552fe069c88fd9bbcdbb2fc8722393b3342..52111276ded04245a030c09c22fdd1519687c9d6 100644 (file)
--- a/docs/manual/mod/mod_cern_meta.xml
+++ b/docs/manual/mod/mod_cern_meta.xml
@@ -32,7 +32,11 @@
 <description>Activates CERN meta-file processing</description>
 <syntax>MetaFiles on|off</syntax>
 <default>MetaFiles off</default>
-<contextlist><context>directory</context></contextlist>
+<contextlist><context>server config</context>
+<context>virtual host</context>
+<context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>Indexes</override>
 
 <usage>
     <p>Turns on/off Meta file processing on a per-directory basis.</p>
@@ -45,7 +49,11 @@
 files</description>
 <syntax>MetaDir <em>directory</em></syntax>
 <default>MetaDir .web</default>
-<contextlist><context>directory</context></contextlist>
+<contextlist><context>server config</context>
+<context>virtual host</context>
+<context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>Indexes</override>
 
 <usage>
     <p>Specifies the name of the directory in which Apache can find
@@ -69,7 +77,11 @@ files</description>
 meta information</description>
 <syntax>MetaSuffix <em>suffix</em></syntax>
 <default>MetaSuffix .meta</default>
-<contextlist><context>directory</context></contextlist>
+<contextlist><context>server config</context>
+<context>virtual host</context>
+<context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>Indexes</override>
 
 <usage>
     <p>Specifies the file name suffix for the file containing the