Backport:

  Reference the config file syntax in the htaccess tutorial.

  PR: 17236

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

diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index e19343c5522115ed3632e8e6b1e402a1c255aaf7..683a8ca8dc6b82823e0ffc4a2e62f48a1d46dc94 100644 (file)
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -59,13 +59,16 @@ changes on a per-directory basis.</p>
       </code></p></div>
     </div>
 
-    <p>What you can put in these files is determined by the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    directive. This directive specifies, in categories, what directives
-    will be honored if they are found in a <code>.htaccess</code> file. If
-    a directive is permitted in a <code>.htaccess</code> file, the
+    <p>In general, <code>.htaccess</code> files use the same syntax as
+    the <a href="../configuring.html#syntax">main configuration
+    files</a>.  What you can put in these files is determined by the
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive. This
+    directive specifies, in categories, what directives will be
+    honored if they are found in a <code>.htaccess</code> file. If a
+    directive is permitted in a <code>.htaccess</code> file, the
     documentation for that directive will contain an Override section,
-    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> in order
-    for that directive to be permitted.</p>
+    specifying what value must be in <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> in order for that
+    directive to be permitted.</p>
 
     <p>For example, if you look at the documentation for the <code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code>
     directive, you will find that it is permitted in <code>.htaccess</code>
@@ -348,4 +351,4 @@ changes on a per-directory basis.</p>
 </div><div id="footer">
 <p class="apache">Copyright 1999-2004 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index bc3190ae6652036a5a53296f158d94feb4ffc07a..57c926088ae5fc8b9771e2a6a279832f78642f43 100755 (executable)
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -75,15 +75,17 @@ changes on a per-directory basis.</p>
       </example>
     </note>
 
-    <p>What you can put in these files is determined by the <directive
-    module="core">AllowOverride</directive>
-    directive. This directive specifies, in categories, what directives
-    will be honored if they are found in a <code>.htaccess</code> file. If
-    a directive is permitted in a <code>.htaccess</code> file, the
+    <p>In general, <code>.htaccess</code> files use the same syntax as
+    the <a href="../configuring.html#syntax">main configuration
+    files</a>.  What you can put in these files is determined by the
+    <directive module="core">AllowOverride</directive> directive. This
+    directive specifies, in categories, what directives will be
+    honored if they are found in a <code>.htaccess</code> file. If a
+    directive is permitted in a <code>.htaccess</code> file, the
     documentation for that directive will contain an Override section,
     specifying what value must be in <directive 
-    module="core">AllowOverride</directive> in order
-    for that directive to be permitted.</p>
+    module="core">AllowOverride</directive> in order for that
+    directive to be permitted.</p>
 
     <p>For example, if you look at the documentation for the <directive
     module="core">AddDefaultCharset</directive>