A few minor nitpicks. Removal of a double negative. Alteration of example

using AllowOverride All in <Directory /> to use something less awful.

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

diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index 1e2b1a72015db655d10e970c60890afb0b126305..2751ddd2dda4bd31ca40c6073b665b2651a95eed 100644 (file)
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -65,7 +65,7 @@ changes on a per-directory basis.</p>
 
     <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
+    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
@@ -100,7 +100,7 @@ changes on a per-directory basis.</p>
 <div class="section">
 <h2><a name="when" id="when">When (not) to use .htaccess files</a></h2>
 
-    <p>In general, you should never use <code>.htaccess</code> files unless
+    <p>In general, you should only use <code>.htaccess</code> files when
     you don't have access to the main server configuration file. There is,
     for example, a common misconception that user authentication should
     always be done in <code>.htaccess</code> files, and, in more recent years, 
@@ -259,14 +259,14 @@ changes on a per-directory basis.</p>
     <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
     <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
     the corresponding directory, but will be overriden by other types
-    of configuration sections from the main configuration files.  This
+    of configuration sections from the main configuration files. This
     fact can be used to enforce certain configurations, even in the
-    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
+    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting. For example, to
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 
     <div class="example"><p><code>
-&lt;Directory /&gt;<br />
+&lt;Directory /www/htdocs&gt;<br />
 <span class="indent">
 Allowoverride All<br />
 </span>
@@ -279,6 +279,8 @@ Options +IncludesNoExec -ExecCGI<br />
 &lt;/Location&gt;
     </code></p></div>
 
+    <div class="note">This example assumes that your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is <code>/www/htdocs</code>.</div>
+
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index 5406e2b1e3e50c17678bf39aa224b94285ff6308..3ef18e95395ebed4d1e724cb18aa1be8fd68293a 100644 (file)
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -80,7 +80,7 @@ changes on a per-directory basis.</p>
 
     <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
+    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
@@ -122,7 +122,7 @@ changes on a per-directory basis.</p>
 
     <section id="when"><title>When (not) to use .htaccess files</title>
 
-    <p>In general, you should never use <code>.htaccess</code> files unless
+    <p>In general, you should only use <code>.htaccess</code> files when
     you don't have access to the main server configuration file. There is,
     for example, a common misconception that user authentication should
     always be done in <code>.htaccess</code> files, and, in more recent years, 
@@ -288,15 +288,15 @@ changes on a per-directory basis.</p>
     <code>.htaccess</code> files can override the <directive
     type="section" module="core">Directory</directive> sections for
     the corresponding directory, but will be overriden by other types
-    of configuration sections from the main configuration files.  This
+    of configuration sections from the main configuration files. This
     fact can be used to enforce certain configurations, even in the
     presence of a liberal <directive
-    module="core">AllowOverride</directive> setting.  For example, to
+    module="core">AllowOverride</directive> setting. For example, to
     prevent script execution while allowing anything else to be set in
     <code>.htaccess</code> you can use:</p>
 
     <example>
-&lt;Directory /&gt;<br />
+&lt;Directory /www/htdocs&gt;<br />
 <indent>
 Allowoverride All<br />
 </indent>
@@ -308,6 +308,9 @@ Options +IncludesNoExec -ExecCGI<br />
 </indent>
 &lt;/Location&gt;
     </example>
+
+    <note>This example assumes that your <directive 
+    module="core">DocumentRoot</directive> is <code>/www/htdocs</code>.</note>
 </section>
 
 </section>

diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
index d3a048676e85dfa22584169c09f1d00082229535..84940ab75d57d1ecc375932c8c7f1debdd7aaf8f 100644 (file)
--- a/docs/manual/howto/htaccess.xml.ja
+++ b/docs/manual/howto/htaccess.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 574882:933606 (outdated) -->
+<!-- English Revision: 574882:1002112 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/htaccess.xml.ko b/docs/manual/howto/htaccess.xml.ko
index dcf07e8ad82f067ab59f63d6f6cde3415de3d7fa..af54ff6f1abc4dd675d6d0c1ff532c93d3d5eb1d 100644 (file)
--- a/docs/manual/howto/htaccess.xml.ko
+++ b/docs/manual/howto/htaccess.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:933606 (outdated) -->
+<!-- English Revision: 151408:1002112 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/htaccess.xml.pt-br b/docs/manual/howto/htaccess.xml.pt-br
index a9058cd1b9d05ac9137f3b2943b4285b73d6d7e1..ee6bc0b5cdd0e2bf4d5e92449587fa10a3245793 100644 (file)
--- a/docs/manual/howto/htaccess.xml.pt-br
+++ b/docs/manual/howto/htaccess.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:933606 (outdated) -->
+<!-- English Revision: 151408:1002112 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more