20 files changed, 15 insertions, 249 deletions
diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en
index 7bfb1477b3..4782b876ea 100644
--- a/docs/manual/misc/perf-tuning.html.en
+++ b/docs/manual/misc/perf-tuning.html.en
@@ -795,9 +795,7 @@
       an HTTP server to <strong>reliably</strong> implement the
       protocol it needs to shutdown each direction of the
       communication independently (recall that a TCP connection is
-      bi-directional, each half is independent of the other). This
-      fact is often overlooked by other servers, but is correctly
-      implemented in Apache as of 1.2.</p>
+      bi-directional, each half is independent of the other).</p>
 
       <p>When this feature was added to Apache it caused a flurry of
       problems on various versions of Unix because of a
diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml
index 0d42e79132..6526a4b122 100644
--- a/docs/manual/misc/perf-tuning.xml
+++ b/docs/manual/misc/perf-tuning.xml
@@ -830,9 +830,7 @@
       an HTTP server to <strong>reliably</strong> implement the
       protocol it needs to shutdown each direction of the
       communication independently (recall that a TCP connection is
-      bi-directional, each half is independent of the other). This
-      fact is often overlooked by other servers, but is correctly
-      implemented in Apache as of 1.2.</p>
+      bi-directional, each half is independent of the other).</p>
 
       <p>When this feature was added to Apache it caused a flurry of
       problems on various versions of Unix because of a
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index a891309c74..7aeb507a9f 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:813376 (outdated) -->
+<!-- English Revision: 167959:880811 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 3d7c499965..8a89e80174 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:813376 (outdated) -->
+<!-- English Revision: 669847:880811 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index d32de19573..975602fe88 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -11,6 +11,6 @@
     <variant>en</variant>
     <variant>fr</variant>
     <variant outdated="yes">ja</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 7599a6d4c6..b203789c20 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376 -->
+<!-- English Revision: 813376:880811 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index c9382ab242..6b98a6b5d8 100644
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -35,9 +35,6 @@ consult the reference documentation.</p>
 
 <seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
 <seealso><a href="tech.html">Technical details</a></seealso>
-<seealso><a href="rewrite_guide.html">Rewrite Guide - useful examples</a></seealso>
-<seealso><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide -
-advanced useful examples</a></seealso>
 
 <section id="introduction"><title>Introduction</title>
 <p><directive module="mod_rewrite">RewriteRule</directive>s can have
diff --git a/docs/manual/rewrite/index.html.en b/docs/manual/rewrite/index.html.en
index b52b7893e6..7f1b148807 100644
--- a/docs/manual/rewrite/index.html.en
+++ b/docs/manual/rewrite/index.html.en
@@ -57,7 +57,6 @@
 documentation</a></li>
 <li><a href="intro.html">Introduction to regular expressions and
 mod_rewrite</a></li>
-<li><a href="rewrite_guide.html">Rewrite Guide - useful examples</a></li>
 <li><a href="remapping.html">Using mod_rewrite for redirection and
 remapping of URLs</a></li>
 <li><a href="access.html">Using mod_rewrite to control access</a></li>
diff --git a/docs/manual/rewrite/index.xml b/docs/manual/rewrite/index.xml
index 26203cad85..0fff501eeb 100644
--- a/docs/manual/rewrite/index.xml
+++ b/docs/manual/rewrite/index.xml
@@ -63,7 +63,6 @@
 documentation</a></li>
 <li><a href="intro.html">Introduction to regular expressions and
 mod_rewrite</a></li>
-<li><a href="rewrite_guide.html">Rewrite Guide - useful examples</a></li>
 <li><a href="remapping.html">Using mod_rewrite for redirection and
 remapping of URLs</a></li>
 <li><a href="access.html">Using mod_rewrite to control access</a></li>
diff --git a/docs/manual/rewrite/rewrite_guide.html b/docs/manual/rewrite/rewrite_guide.html
deleted file mode 100644
index a97a1f378a..0000000000
--- a/docs/manual/rewrite/rewrite_guide.html
+++ /dev/null
@@ -1,9 +0,0 @@
-# GENERATED FROM XML -- DO NOT EDIT
-
-URI: rewrite_guide.html.en
-Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
-
-URI: rewrite_guide.html.fr
-Content-Language: fr
-Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_guide.xml b/docs/manual/rewrite/rewrite_guide.xml
deleted file mode 100644
index 3a871075be..0000000000
--- a/docs/manual/rewrite/rewrite_guide.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $LastChangedRevision$ -->
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="rewrite_guide.xml.meta">
-  <parentdocument href="./">Rewrite</parentdocument>
-
-  <title>URL Rewriting Guide</title>
-
-  <summary>
-
-    <p>This document supplements the <module>mod_rewrite</module>
-    <a href="../mod/mod_rewrite.html">reference documentation</a>.
-    It describes how one can use Apache's <module>mod_rewrite</module>
-    to solve typical URL-based problems with which webmasters are
-    commonly confronted. We give detailed descriptions on how to
-    solve each problem by configuring URL rewriting rulesets.</p>
-
-    <note type="warning">ATTENTION: Depending on your server configuration
-    it may be necessary to slightly change the examples for your
-    situation, e.g. adding the <code>[PT]</code> flag when
-    additionally using <module>mod_alias</module> and
-    <module>mod_userdir</module>, etc. Or rewriting a ruleset
-    to fit in <code>.htaccess</code> context instead
-    of per-server context. Always try to understand what a
-    particular ruleset really does before you use it. This
-    avoids many problems.</note>
-
-  </summary>
-<seealso><a href="../mod/mod_rewrite.html">Module
-documentation</a></seealso>
-<seealso><a href="intro.html">mod_rewrite
-introduction</a></seealso>
-<seealso><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide - advanced 
-useful examples</a></seealso>
-<seealso><a href="tech.html">Technical details</a></seealso>
-
-
-</manualpage>
-
diff --git a/docs/manual/rewrite/rewrite_guide.xml.meta b/docs/manual/rewrite/rewrite_guide.xml.meta
deleted file mode 100644
index 747d300f66..0000000000
--- a/docs/manual/rewrite/rewrite_guide.xml.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
-
-<metafile>
-  <basename>rewrite_guide</basename>
-  <path>/rewrite/</path>
-  <relpath>..</relpath>
-
-  <variants>
-    <variant>en</variant>
-    <variant>fr</variant>
-  </variants>
-</metafile>
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html b/docs/manual/rewrite/rewrite_guide_advanced.html
deleted file mode 100644
index 033c866218..0000000000
--- a/docs/manual/rewrite/rewrite_guide_advanced.html
+++ /dev/null
@@ -1,9 +0,0 @@
-# GENERATED FROM XML -- DO NOT EDIT
-
-URI: rewrite_guide_advanced.html.en
-Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
-
-URI: rewrite_guide_advanced.html.fr
-Content-Language: fr
-Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html.en b/docs/manual/rewrite/rewrite_guide_advanced.html.en
deleted file mode 100644
index 76a102eb22..0000000000
--- a/docs/manual/rewrite/rewrite_guide_advanced.html.en
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>URL Rewriting Guide - Advanced topics - Apache HTTP Server</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<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>
-<p class="apache">Apache HTTP Server Version 2.3</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.3</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide - Advanced topics</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide_advanced.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/rewrite/rewrite_guide_advanced.html" hreflang="fr" rel="alternate" title="Fran�ais">&nbsp;fr&nbsp;</a></p>
-</div>
-
-
-    <p>This document supplements the <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-    <a href="../mod/mod_rewrite.html">reference documentation</a>.
-    It describes how one can use Apache's <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-    to solve typical URL-based problems with which webmasters are
-    commonly confronted. We give detailed descriptions on how to
-    solve each problem by configuring URL rewriting rulesets.</p>
-
-    <div class="warning">ATTENTION: Depending on your server configuration
-    it may be necessary to adjust the examples for your
-    situation, e.g., adding the <code>[PT]</code> flag if
-    using <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> and
-    <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code>, etc. Or rewriting a ruleset
-    to work in <code>.htaccess</code> context instead
-    of per-server context. Always try to understand what a
-    particular ruleset really does before you use it; this
-    avoids many problems.</div>
-
-  </div>
-<div id="quickview"><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
-documentation</a></li><li><a href="intro.html">mod_rewrite
-introduction</a></li><li><a href="rewrite_guide.html">Rewrite Guide - useful
-examples</a></li><li><a href="tech.html">Technical details</a></li></ul></div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide_advanced.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/rewrite/rewrite_guide_advanced.html" hreflang="fr" rel="alternate" title="Fran�ais">&nbsp;fr&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2009 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
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.xml b/docs/manual/rewrite/rewrite_guide_advanced.xml
deleted file mode 100644
index 07aeefd9d4..0000000000
--- a/docs/manual/rewrite/rewrite_guide_advanced.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
-<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $LastChangedRevision$ -->
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<manualpage metafile="rewrite_guide_advanced.xml.meta">
-  <parentdocument href="./">Rewrite</parentdocument>
-
-  <title>URL Rewriting Guide - Advanced topics</title>
-
-  <summary>
-
-    <p>This document supplements the <module>mod_rewrite</module>
-    <a href="../mod/mod_rewrite.html">reference documentation</a>.
-    It describes how one can use Apache's <module>mod_rewrite</module>
-    to solve typical URL-based problems with which webmasters are
-    commonly confronted. We give detailed descriptions on how to
-    solve each problem by configuring URL rewriting rulesets.</p>
-
-    <note type="warning">ATTENTION: Depending on your server configuration
-    it may be necessary to adjust the examples for your
-    situation, e.g., adding the <code>[PT]</code> flag if
-    using <module>mod_alias</module> and
-    <module>mod_userdir</module>, etc. Or rewriting a ruleset
-    to work in <code>.htaccess</code> context instead
-    of per-server context. Always try to understand what a
-    particular ruleset really does before you use it; this
-    avoids many problems.</note>
-
-  </summary>
-<seealso><a href="../mod/mod_rewrite.html">Module
-documentation</a></seealso>
-<seealso><a href="intro.html">mod_rewrite
-introduction</a></seealso>
-<seealso><a href="rewrite_guide.html">Rewrite Guide - useful
-examples</a></seealso>
-<seealso><a href="tech.html">Technical details</a></seealso>
-
-
-</manualpage>
-
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.xml.meta b/docs/manual/rewrite/rewrite_guide_advanced.xml.meta
deleted file mode 100644
index ce654fe7b3..0000000000
--- a/docs/manual/rewrite/rewrite_guide_advanced.xml.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
-
-<metafile>
-  <basename>rewrite_guide_advanced</basename>
-  <path>/rewrite/</path>
-  <relpath>..</relpath>
-
-  <variants>
-    <variant>en</variant>
-    <variant>fr</variant>
-  </variants>
-</metafile>
diff --git a/docs/manual/rewrite/tech.html.en b/docs/manual/rewrite/tech.html.en
index 82bb42e63f..337b860c70 100644
--- a/docs/manual/rewrite/tech.html.en
+++ b/docs/manual/rewrite/tech.html.en
@@ -28,11 +28,7 @@ and URL matching.</p>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Internal">Internal Processing</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#InternalAPI">API Phases</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#InternalRuleset">Ruleset Processing</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
-documentation</a></li><li><a href="intro.html">mod_rewrite
-introduction</a></li><li><a href="rewrite_guide.html">Rewrite Guide - useful 
-examples</a></li><li><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide -
-advanced useful examples</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="index.html">mod_rewrite detailed examples</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="Internal" id="Internal">Internal Processing</a></h2>
diff --git a/docs/manual/rewrite/tech.xml b/docs/manual/rewrite/tech.xml
index 183e27e9d6..e7de78a76f 100644
--- a/docs/manual/rewrite/tech.xml
+++ b/docs/manual/rewrite/tech.xml
@@ -29,14 +29,8 @@
 <p>This document discusses some of the technical details of mod_rewrite
 and URL matching.</p>
 </summary>
-<seealso><a href="../mod/mod_rewrite.html">Module
-documentation</a></seealso>
-<seealso><a href="intro.html">mod_rewrite
-introduction</a></seealso>
-<seealso><a href="rewrite_guide.html">Rewrite Guide - useful 
-examples</a></seealso>
-<seealso><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide -
-advanced useful examples</a></seealso>
+<seealso><a href="../mod/mod_rewrite.html">Module documentation</a></seealso>
+<seealso><a href="index.html">mod_rewrite detailed examples</a></seealso>
 
 <section id="Internal"><title>Internal Processing</title>
 
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 2d76309d45..10b8d255c5 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -99,9 +99,9 @@ documentation</a></li>
 <li><a href="rewrite/intro.html">Introduction</a></li>
 <li><a href="rewrite/flags.html">Flags</a></li>
 <li><a href="rewrite/tech.html">Technical details</a></li>
-<li><a href="rewrite/rewrite_guide.html">Rewrite Guide - useful examples</a></li>
-<li><a href="rewrite/rewrite_guide_advanced.html">Advanced Rewrite Guide - more
-useful examples</a></li>
+<li><a href="rewrite/remapping.html">Remapping URLs</a></li>
+<li><a href="rewrite/access.html">Access control</a></li>
+<li><a href="rewrite/advanced.html">Advanced techniques</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section"><h2><a name="ssl" id="ssl">Apache SSL/TLS Encryption</a></h2>
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 339c17e59e..57862d48d8 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -84,9 +84,9 @@ documentation</page>
 <page href="rewrite/intro.html">Introduction</page>
 <page href="rewrite/flags.html">Flags</page>
 <page href="rewrite/tech.html">Technical details</page>
-<page href="rewrite/rewrite_guide.html">Rewrite Guide - useful examples</page>
-<page href="rewrite/rewrite_guide_advanced.html">Advanced Rewrite Guide - more
-useful examples</page>
+<page href="rewrite/remapping.html">Remapping URLs</page>
+<page href="rewrite/access.html">Access control</page>
+<page href="rewrite/advanced.html">Advanced techniques</page>
 </category>
 
 <category id="ssl">