Access.conf? Nope.

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

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 5c1c1f7a9e94832bec98bfb95024691178a1c154..c42ce5f777972eb6855c588022a624e91c44092c 100644 (file)
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -189,7 +189,7 @@ Negotiation</a></li>
     <p><code>MultiViews</code> is a per-directory option, meaning it
     can be set with an <code class="directive"><a href="./mod/core.html#options">Options</a></code>
     directive within a <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> or <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> section in
-    <code>access.conf</code>, or (if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is properly set) in
+    <code>httpd.conf</code>, or (if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is properly set) in
     <code>.htaccess</code> files. Note that <code>Options All</code>
     does not set <code>MultiViews</code>; you have to ask for it by
     name.</p>

diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml
index 9e2605d022eb77557585366effe6bf857ebd50c8..d5f287d890affb9202336dd7db49a545735b2b75 100644 (file)
--- a/docs/manual/content-negotiation.xml
+++ b/docs/manual/content-negotiation.xml
@@ -171,7 +171,7 @@
     type="section">Directory</directive>, <directive module="core"
     type="section">Location</directive> or <directive module="core"
     type="section">Files</directive> section in
-    <code>access.conf</code>, or (if <directive
+    <code>httpd.conf</code>, or (if <directive
     module="core">AllowOverride</directive> is properly set) in
     <code>.htaccess</code> files. Note that <code>Options All</code>
     does not set <code>MultiViews</code>; you have to ask for it by