Merge r1544629, r1544626 from trunk:

give a hint about the requirements for <If

include <if> in the list of things that are directory contexts before
clicking through to the sections.html

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1544630 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 7f559812d02339f4226ea75f6c191c1a372529f8..e16a009367e59374cb828578d9a4413aa14dc9c0 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1881,6 +1881,9 @@ satisfied by a request at runtime</description>
     documentation is available in <a href="../expr.html">Expressions in
     Apache HTTP Server</a>.</p>
 
+    <p>Only directives that support the <a href="mod/directive-dict.html#Context"
+    >directory context</a> can be used within this configuration section.</p>
+
 </usage>
 
 <seealso><a href="../expr.html">Expressions in Apache HTTP Server</a>,

diff --git a/docs/manual/mod/directive-dict.xml b/docs/manual/mod/directive-dict.xml
index 976b44465d83ed41d4ce1ece603ea78647dd626f..f1862fb831d06479dc1712b8d1454a870a20a18e 100644 (file)
--- a/docs/manual/mod/directive-dict.xml
+++ b/docs/manual/mod/directive-dict.xml
@@ -167,7 +167,8 @@
       used inside <directive module="core"
       type="section">Directory</directive>, <directive type="section"
       module="core">Location</directive>, <directive module="core"
-      type="section">Files</directive>, and <directive
+      type="section">Files</directive>, <directive module="core"
+      type="section">If</directive>, and <directive
       module="mod_proxy" type="section">Proxy</directive> containers
       in the server configuration files, subject to the restrictions
       outlined in <a href="../sections.html">Configuration