Add per-directory context glossary entry; link key rewrite docs references to it

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

diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index 2a7e570be0f0df98c2af8f5d530f07c7366a6f38..61d99124159dec7897728281804648caedd1140c 100644 (file)
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -333,6 +333,19 @@
       See: <a href="ssl/">SSL/TLS Encryption</a>
     </dd>
 
+    <dt><a name="perdirectory" id="perdirectory">Per-directory Context</a></dt>
+    <dd>A <glossary ref="directive">directive</glossary> is in
+      per-directory context when it appears in a <directive type="section"
+      module="core">Directory</directive>, <directive type="section"
+      module="core">DirectoryMatch</directive>, <directive type="section"
+      module="core">Files</directive>, or <directive type="section"
+      module="core">FilesMatch</directive> section in the main
+      configuration files, or in a <code>.htaccess</code> file.
+      In per-directory context, directives apply only to the
+      directory (or set of files) they are associated with.<br />
+      See: <a href="sections.html">Configuration Sections</a>
+    </dd>
+
     <dt><a name="plaintext" id="plaintext">Plaintext</a></dt>
     <dd>The unencrypted text.</dd>
 

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 49629c20720bdd74d70fc97d2213de16f0b52d0c..421f8484cf56e7e7d3f66b168bff5ffc40133adf 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1108,7 +1108,8 @@ RewriteRule  "^/$"                 "/homepage.std.html"     [L]
       URL after the hostname and port, and before the query string (e.g. "/app1/index.html").
       This is the (%-decoded) <a href="directive-dict.html#Syntax">URL-path</a>.</p></li>
 
-      <li><p>In per-directory context (<directive module="core">Directory</directive> and .htaccess),
+      <li><p>In <glossary ref="perdirectory">per-directory context</glossary>
+      (<directive module="core">Directory</directive> and .htaccess),
       the <em>Pattern</em> is matched against only a partial path, for example a request
       of "/app1/index.html" may result in comparison against "app1/index.html" 
       or "index.html" depending on the directory-path for which the
@@ -1134,7 +1135,7 @@ RewriteRule  "^/$"                 "/homepage.std.html"     [L]
 </ul>
 </note>
 
-<note><title>Per-directory Rewrites</title>
+<note><title><glossary ref="perdirectory">Per-directory</glossary> Rewrites</title>
 <ul>
 <li>The rewrite engine may be used in <a
 href="../howto/htaccess.html">.htaccess</a> files and in <directive type="section"

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index ac742418008ab16c683c8db01ce35e4a6e391f8b..9a053c48016cc56f8109de733b2cc0e297face50 100644 (file)
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -58,7 +58,7 @@ long form, so that you remember what each flag is supposed to do.
 Some flags take one or more arguments. Flags are not case sensitive.</p>
 
 <p>Flags that alter metadata associated with the request (T=, H=, E=)
-have no effect in per-directory context, when a substitution
+have no effect in <glossary ref="perdirectory">per-directory context</glossary>, when a substitution
 (other than '-') is performed during the same round of rewrite processing.
 </p>
 

diff --git a/docs/manual/rewrite/index.xml b/docs/manual/rewrite/index.xml
index ebb531733815133bef5394fd5f210756284dbf81..b0c40b3ed06b8ef4657163be181de3383e364ce4 100644 (file)
--- a/docs/manual/rewrite/index.xml
+++ b/docs/manual/rewrite/index.xml
@@ -45,7 +45,8 @@
       and query string portions, and may be used in per-server context
       (<code>httpd.conf</code>), per-virtualhost context (<directive
       type="section" module="core">VirtualHost</directive> blocks), or
-      per-directory context (<code>.htaccess</code> files and <directive
+      <glossary ref="perdirectory">per-directory context</glossary>
+      (<code>.htaccess</code> files and <directive
       type="section" module="core">Directory</directive> blocks). The
       rewritten result can lead to further rules, internal
       sub-processing, external request redirection, or proxy

diff --git a/docs/manual/rewrite/intro.xml b/docs/manual/rewrite/intro.xml
index 46179d441b8f7b8738cf1773784656ec87a4ee53..f1dd0643bcef9e578889a7c8c34aac3c654f097d 100644 (file)
--- a/docs/manual/rewrite/intro.xml
+++ b/docs/manual/rewrite/intro.xml
@@ -382,7 +382,7 @@ recommended. It is possible, however, to do rewriting
 inside <directive type="section" module="core">Directory</directive>
 sections or <a href="../howto/htaccess.html"><code>.htaccess</code>
 files</a> at the expense of some additional complexity. This technique
-is called per-directory rewrites.</p>
+is called <glossary ref="perdirectory">per-directory</glossary> rewrites.</p>
 
 <p>The main difference from per-server rewrites is that the path
 prefix of the directory containing the <code>.htaccess</code> file is

diff --git a/docs/manual/rewrite/tech.xml b/docs/manual/rewrite/tech.xml
index df47bb460f5f052082e32b7c7f109a0c50ba94b7..28d0024d452a9ebc916d7483d42c5dda4506e65f 100644 (file)
--- a/docs/manual/rewrite/tech.xml
+++ b/docs/manual/rewrite/tech.xml
@@ -73,7 +73,7 @@ and URL matching.</p>
     <p>In each of these cases, <module>mod_rewrite</module> rewrites the
     <code>REQUEST_URI</code> either to a new URL, or to a filename.</p>
 
-    <p>In per-directory context (i.e., within <code>.htaccess</code> files
+    <p>In <glossary ref="perdirectory">per-directory context</glossary> (i.e., within <code>.htaccess</code> files
     and <code>Directory</code> blocks), these rules are being applied
     after a URL has already been translated to a filename. Because of
     this, the URL-path that <module>mod_rewrite</module> initially compares <directive