Bug 60377: Remaining .htaccess-specific wording in rewrite docs; .htaccess IS per...

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

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 6cd8e76343bdb3f2d22ba2cade9753c0eafb59e8..49629c20720bdd74d70fc97d2213de16f0b52d0c 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -1246,8 +1246,8 @@ cannot use <code>$N</code> in the substitution string!
         you specify a <em>Substitution</em> string of
         <code>/www/file.html</code>, then this will be treated as a
         URL-path <em>unless</em> a directory named <code>www</code>
-        exists at the root or your file-system (or, in the case of
-        using rewrites in a <code>.htaccess</code> file, relative to
+        exists at the root of your file-system (or, in the case of
+        per-directory rewrites, relative to
         your document root), in which case it will
         be treated as a file-system path. If you wish other
         URL-mapping directives (such as <directive
@@ -1417,8 +1417,7 @@ cannot use <code>$N</code> in the substitution string!
     <tr>
         <td>last|L</td>
         <td>Stop the rewriting process immediately and don't apply any
-        more rules. Especially note caveats for per-directory and
-        .htaccess context (see also the END flag). <em><a
+        more rules. Especially note caveats for per-directory context (see also the END flag). <em><a
         href="../rewrite/flags.html#flag_l">details ...</a></em></td>
     </tr>
     <tr>

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index 5b8da69ca204ac46dd7035561652513b4de1f7d6..ac742418008ab16c683c8db01ce35e4a6e391f8b 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 affect in per-directory and htaccess context, when a substitution
+have no effect in per-directory context, when a substitution
 (other than '-') is performed during the same round of rewrite processing.
 </p>
 
@@ -370,7 +370,7 @@ RewriteCond "%{ENV:rewritten}"  =1
 
 <p>Note that environment variables do not survive an external
 redirect. You might consider using the [CO] flag to set a
-cookie. For per-directory and htaccess rewrites, where the final
+cookie. For per-directory rewrites, where the final
 substitution is processed as an internal redirect, environment
 variables from the previous round of rewriting are prefixed with
 "REDIRECT_". </p>