./build.sh all - fixed htaccess validation error.

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

diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index 37207d0625ac424cc2f5736e95870f2d0b06b596..2a237c88fb00c266009ce2851e9485ae91116f99 100644 (file)
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -40,10 +40,11 @@ changes on a per-directory basis.</p>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="related" id="related">.htaccess files</a></h2>
+    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li></ul></td></tr></table>
+
     <div class="note">You should avoid using <code>.htaccess</code> files completely if you have access to
     httpd main server config file. Using <code>.htaccess</code> files slows down your Apache server.
     Any directive that you can include in a <code>.htaccess</code> file is better set in a <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> block, as it will have the same effect with better performance.</div>
-    <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li></ul></td></tr></table>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="what" id="what">What they are/How to use them</a></h2>

diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index 80aa013c5f5326e3fe139f3ef9e14096a1462444..c3f53013f9236d048e207bcd93c68f0d8cccc6ce 100644 (file)
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -31,9 +31,6 @@ changes on a per-directory basis.</p>
 </summary>
 
 <section id="related"><title>.htaccess files</title>
-    <note>You should avoid using <code>.htaccess</code> files completely if you have access to
-    httpd main server config file. Using <code>.htaccess</code> files slows down your Apache server.
-    Any directive that you can include in a <code>.htaccess</code> file is better set in a <directive module="core">Directory</directive> block, as it will have the same effect with better performance.</note>
     <related>
         <modulelist>
             <module>core</module>
@@ -58,6 +55,10 @@ changes on a per-directory basis.</p>
         </directivelist>
 
     </related>
+
+    <note>You should avoid using <code>.htaccess</code> files completely if you have access to
+    httpd main server config file. Using <code>.htaccess</code> files slows down your Apache server.
+    Any directive that you can include in a <code>.htaccess</code> file is better set in a <directive module="core">Directory</directive> block, as it will have the same effect with better performance.</note>
 </section>
 
 <section id="what">

diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 3e39b9932ee2a40d0bb2b95e2ef24e091083a508..c53e5ac266b0ad0543d1b8ea40f9ef7ceac9ce1c 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1026184 (outdated) -->
+<!-- English Revision: 344971:1030681 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index ab2f34aa3bef3d93d88e06af2d39843a12797ed9..69c7a750b28f906e4422658c2414bb9d33aee191 100644 (file)
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -38,8 +38,7 @@ to avoid answering the same questions over and over.</p>
 search for your problem here before submitting a problem report to the
 author.</p>
 </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#about">About The Module</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#installation">Installation</a></li>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#installation">Installation</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#aboutconfig">Configuration</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#aboutcerts">Certificates</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#aboutssl">The SSL Protocol</a></li>
@@ -47,58 +46,6 @@ author.</p>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="about" id="about">About The Module</a></h2>
-<ul>
-<li><a href="#history">What is the history of mod_ssl?</a></li>
-<li><a href="#wassenaar">mod_ssl and Wassenaar Arrangement?</a></li>
-</ul>
-
-<h3><a name="history" id="history">What is the history of mod_ssl?</a></h3>
-<p>The mod_ssl v1 package was initially created in April 1998 by <a href="mailto:rse@engelschall.com">Ralf S. Engelschall</a> via porting <a href="mailto:ben@algroup.co.uk">Ben Laurie</a>'s <a href="http://www.apache-ssl.org/">Apache-SSL</a> 1.17 source patches for
-    Apache 1.2.6 to Apache 1.3b6. Because of conflicts with Ben
-    Laurie's development cycle it then was re-assembled from scratch for
-    Apache 1.3.0 by merging the old mod_ssl 1.x with the newer Apache-SSL
-    1.18. From this point on mod_ssl lived its own life as mod_ssl v2. The
-    first publicly released version was mod_ssl 2.0.0 from August 10th,
-    1998. </p>
-    
-    <p>After US export restrictions on cryptographic software were
-    loosened, <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> became part of the Apache HTTP
-    Server with the release of Apache httpd 2.</p>
-
-
-<h3><a name="wassenaar" id="wassenaar">Is mod_ssl affected by the Wassenaar Arrangement?</a></h3>
-<p>First, let us explain what <dfn>Wassenaar</dfn> and its <dfn>Arrangement on
-    Export Controls for Conventional Arms and Dual-Use Goods and
-    Technologies</dfn> is: This is a international regime, established in 1995, to
-    control trade in conventional arms and dual-use goods and technology. It
-    replaced the previous <dfn>CoCom</dfn> regime. Further details on 
-    both the Arrangement and its signatories are available at <a href="http://www.wassenaar.org/">http://www.wassenaar.org/</a>.</p>
-
-    <p>In short, the aim of the Wassenaar Arrangement is to prevent the build up
-    of military capabilities that threaten regional and international security
-    and stability. The Wassenaar Arrangement controls the export of
-    cryptography as a dual-use good, that is, something that has both military and
-    civilian applications. However, the Wassenaar Arrangement also provides an
-    exemption from export controls for mass-market software and free software.</p>
-    
-    <p>In the current Wassenaar <cite>List of Dual Use Goods and Technologies And
-    Munitions</cite>, under <q>GENERAL SOFTWARE NOTE (GSN)</q> it says
-    <q>The Lists do not control "software" which is either: 1. [...] 2. "in
-    the public domain".</q> And under <q>DEFINITIONS OF TERMS USED IN
-    THESE LISTS</q> we find <q>In the public
-    domain</q> defined as <q>"technology" or "software" which has been made
-    available without restrictions upon its further dissemination. Note:
-    Copyright restrictions do not remove "technology" or "software" from being
-    "in the public domain".</q></p>
-    
-    <p>So, both mod_ssl and OpenSSL are <q>in the public domain</q> for the purposes
-    of the Wassenaar Arrangement and its <q>List of Dual Use Goods and
-    Technologies And Munitions List</q>, and thus not affected by its provisions.</p>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
 <h2><a name="installation" id="installation">Installation</a></h2>
 <ul>
 <li><a href="#mutex">Why do I get permission errors related to