From: Daniel Gruno <humbedooh@apache.org>
Date: Mon, 29 Apr 2013 12:19:14 +0000 (+0000)
Subject: Expand on how to set context specific directives.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe47404e193da4e090733e2e4fa0d7dfd4f129b7;p=thirdparty%2Fapache%2Fhttpd.git

Expand on how to set context specific directives.

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

diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml
index 01e8e1f80a6..3acb2803067 100644
--- a/docs/manual/developer/modguide.xml
+++ b/docs/manual/developer/modguide.xml
@@ -1184,8 +1184,19 @@ AP_INIT_TAKE1("exampleEnabled", example_set_enabled, NULL, RSRC_CONF, "Enable or
 this directive in a global server context, but since we are now trying out 
 a context aware version of our module, we should set this to something 
 more lenient, namely the value <code>ACCESS_CONF</code>, which lets us use 
-the directive inside &lt;Directory&gt; and &lt;Location&gt; blocks.
+the directive inside &lt;Directory&gt; and &lt;Location&gt; blocks. For more 
+control over the placement of your directives, you can combine the following 
+restrictions together to form a specific rule:
 </p>
+<ul>
+<li><code>RSRC_CONF</code>: Allow in .conf files (not .htaccess) outside &lt;Directory&gt; or &lt;Location&gt;</li>
+<li><code>ACCESS_CONF</code>: Allow in .conf files (not .htaccess) inside &lt;Directory&gt; or &lt;Location&gt;</li>
+<li><code>OR_OPTIONS</code>: Allow in .conf files and .htaccess when <code>AllowOverride Options</code> is set</li>
+<li><code>OR_FILEINFO</code>: Allow in .conf files and .htaccess when <code>AllowOverride FileInfo</code> is set</li>
+<li><code>OR_AUTHCFG</code>: Allow in .conf files and .htaccess when <code>AllowOverride AuthConfig</code> is set</li>
+<li><code>OR_INDEXES</code>: Allow in .conf files and .htaccess when <code>AllowOverride Indexes</code> is set</li>
+<li><code>OR_ALL</code>: Allow anywhere in .conf files and .htaccess</li>
+</ul>
 </section>
 
 <section id="context_pool"><title>Using the server to allocate configuration slots</title>