From a004dfdb0a5c1f3f63e9db2076266cd8bc06f7da Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Mon, 11 May 2026 20:10:54 +0000 Subject: [PATCH] Rebuild all of the mod_rewrite guide reorg git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934124 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/rewrite/TODO.md | 6 +- docs/manual/rewrite/avoid.html.en.utf8 | 34 +++------- docs/manual/rewrite/avoid.xml.de | 2 +- docs/manual/rewrite/avoid.xml.es | 2 +- docs/manual/rewrite/avoid.xml.fr | 2 +- docs/manual/rewrite/avoid.xml.ja | 2 +- docs/manual/rewrite/avoid.xml.ko | 2 +- docs/manual/rewrite/avoid.xml.tr | 2 +- docs/manual/rewrite/avoid.xml.zh-cn | 2 +- docs/manual/rewrite/flags.html.en.utf8 | 24 +++---- docs/manual/rewrite/flags.xml.de | 2 +- docs/manual/rewrite/flags.xml.es | 2 +- docs/manual/rewrite/flags.xml.fr | 2 +- docs/manual/rewrite/flags.xml.ja | 2 +- docs/manual/rewrite/flags.xml.ko | 2 +- docs/manual/rewrite/flags.xml.tr | 2 +- docs/manual/rewrite/flags.xml.zh-cn | 2 +- docs/manual/rewrite/index.html.en.utf8 | 2 +- docs/manual/rewrite/index.xml.de | 2 +- docs/manual/rewrite/index.xml.es | 2 +- docs/manual/rewrite/index.xml.fr | 2 +- docs/manual/rewrite/index.xml.ja | 2 +- docs/manual/rewrite/index.xml.ko | 2 +- docs/manual/rewrite/index.xml.tr | 2 +- docs/manual/rewrite/index.xml.zh-cn | 2 +- docs/manual/rewrite/intro.html.en.utf8 | 2 +- docs/manual/rewrite/intro.xml.de | 2 +- docs/manual/rewrite/intro.xml.es | 2 +- docs/manual/rewrite/intro.xml.fr | 2 +- docs/manual/rewrite/intro.xml.ja | 2 +- docs/manual/rewrite/intro.xml.ko | 2 +- docs/manual/rewrite/intro.xml.tr | 2 +- docs/manual/rewrite/intro.xml.zh-cn | 2 +- docs/manual/rewrite/remapping.html.en.utf8 | 74 +++++---------------- docs/manual/rewrite/remapping.xml.de | 2 +- docs/manual/rewrite/remapping.xml.es | 2 +- docs/manual/rewrite/remapping.xml.fr | 2 +- docs/manual/rewrite/remapping.xml.ja | 2 +- docs/manual/rewrite/remapping.xml.ko | 2 +- docs/manual/rewrite/remapping.xml.tr | 2 +- docs/manual/rewrite/remapping.xml.zh-cn | 2 +- docs/manual/rewrite/rewritemap.html.en.utf8 | 2 +- docs/manual/rewrite/rewritemap.xml.de | 2 +- docs/manual/rewrite/rewritemap.xml.es | 2 +- docs/manual/rewrite/rewritemap.xml.fr | 2 +- docs/manual/rewrite/rewritemap.xml.ja | 2 +- docs/manual/rewrite/rewritemap.xml.ko | 2 +- docs/manual/rewrite/rewritemap.xml.tr | 2 +- docs/manual/rewrite/rewritemap.xml.zh-cn | 2 +- docs/manual/rewrite/tech.html.en.utf8 | 2 +- docs/manual/rewrite/tech.xml.de | 2 +- docs/manual/rewrite/tech.xml.es | 2 +- docs/manual/rewrite/tech.xml.fr | 2 +- docs/manual/rewrite/tech.xml.ja | 2 +- docs/manual/rewrite/tech.xml.ko | 2 +- docs/manual/rewrite/tech.xml.tr | 2 +- docs/manual/rewrite/tech.xml.zh-cn | 2 +- docs/manual/rewrite/vhosts.html.en.utf8 | 2 +- docs/manual/rewrite/vhosts.xml.de | 2 +- docs/manual/rewrite/vhosts.xml.es | 2 +- docs/manual/rewrite/vhosts.xml.fr | 2 +- docs/manual/rewrite/vhosts.xml.ja | 2 +- docs/manual/rewrite/vhosts.xml.ko | 2 +- docs/manual/rewrite/vhosts.xml.tr | 2 +- docs/manual/rewrite/vhosts.xml.zh-cn | 2 +- 65 files changed, 96 insertions(+), 164 deletions(-) diff --git a/docs/manual/rewrite/TODO.md b/docs/manual/rewrite/TODO.md index 5ba3140a24..57f75f9a2b 100644 --- a/docs/manual/rewrite/TODO.md +++ b/docs/manual/rewrite/TODO.md @@ -41,10 +41,10 @@ result in one file "owning" the content and others cross-referencing it. listed in other files' seealso despite being a major topic. - [ ] **Deprecated stub files** (access.xml, advanced.xml, proxy.xml) — - consider removal or ensure they don't appear in navigation. + Remove from trunk. Leave in 2.4 during sync (they'll drop in 2.6). -- [ ] **Figure numbering collision** — both intro.xml and tech.xml use - "Figure 1" for different images. +- [x] **Figure numbering collision** — both intro.xml and tech.xml use + "Figure 1" for different images. Not a problem — separate pages. --- diff --git a/docs/manual/rewrite/avoid.html.en.utf8 b/docs/manual/rewrite/avoid.html.en.utf8 index a52851ef8d..ee0d528f4f 100644 --- a/docs/manual/rewrite/avoid.html.en.utf8 +++ b/docs/manual/rewrite/avoid.html.en.utf8 @@ -70,7 +70,7 @@ files to work with, you may need to resort to
  • Denying Hosts in a Reject List
  • Virtual Hosting
  • Load Balancing
    • -

    See also

    +

    See also

    top

    Simple Redirection

    @@ -106,31 +106,13 @@ and /one/three/four.html.

    Canonical Hostnames recipe.

    -

    To redirect http URLs to https, do the -following:

    - -
    <VirtualHost *:80>
-    ServerName www.example.com
-    Redirect "/" "https://www.example.com/"
-</VirtualHost>
-
-<VirtualHost *:443>
-    ServerName www.example.com
-    # ... SSL configuration goes here
-</VirtualHost>
    - - -

    The use of RewriteRule to perform this task may be -appropriate if there are other RewriteRule directives in -the same scope. This is because, when there are Redirect -and RewriteRule directives in the same scope, the -RewriteRule directives will run first, regardless of the -order of appearance in the configuration file.

    - -

    In the case of the http-to-https redirection, the use of -RewriteRule would be appropriate if you don't have access -to the main server configuration file, and are obliged to perform this -task in a .htaccess file instead.

    +

    To redirect http URLs to https, a +Redirect in a dedicated +HTTP virtual host is the cleanest approach. See the +Forcing HTTPS recipe for +the recommended configuration and the +mod_rewrite alternative for .htaccess +use.

    top
    diff --git a/docs/manual/rewrite/avoid.xml.de b/docs/manual/rewrite/avoid.xml.de index 09a08c29d6..c9acc8cccf 100644 --- a/docs/manual/rewrite/avoid.xml.de +++ b/docs/manual/rewrite/avoid.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/rewrite/avoid.xml.ja b/docs/manual/rewrite/avoid.xml.ja index bcc7171014..c651a7e804 100644 --- a/docs/manual/rewrite/avoid.xml.ja +++ b/docs/manual/rewrite/avoid.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/flags.xml.ja b/docs/manual/rewrite/flags.xml.ja index a09ec42a1a..8c4def944e 100644 --- a/docs/manual/rewrite/flags.xml.ja +++ b/docs/manual/rewrite/flags.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/index.xml.ja b/docs/manual/rewrite/index.xml.ja index 3b35b94725..c12b95559c 100644 --- a/docs/manual/rewrite/index.xml.ja +++ b/docs/manual/rewrite/index.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/intro.xml.ja b/docs/manual/rewrite/intro.xml.ja index 06a7bc8b52..d2360a51f9 100644 --- a/docs/manual/rewrite/intro.xml.ja +++ b/docs/manual/rewrite/intro.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/remapping.xml.ja b/docs/manual/rewrite/remapping.xml.ja index f192a2b30e..dcd8a3f60f 100644 --- a/docs/manual/rewrite/remapping.xml.ja +++ b/docs/manual/rewrite/remapping.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/rewritemap.xml.ja b/docs/manual/rewrite/rewritemap.xml.ja index a4656191a5..74adafdef9 100644 --- a/docs/manual/rewrite/rewritemap.xml.ja +++ b/docs/manual/rewrite/rewritemap.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/tech.xml.ja b/docs/manual/rewrite/tech.xml.ja index b00ee4da24..5af254104f 100644 --- a/docs/manual/rewrite/tech.xml.ja +++ b/docs/manual/rewrite/tech.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/vhosts.xml.ja b/docs/manual/rewrite/vhosts.xml.ja index 9de2e1e444..a2b40d0b03 100644 --- a/docs/manual/rewrite/vhosts.xml.ja +++ b/docs/manual/rewrite/vhosts.xml.ja @@ -1,7 +1,7 @@ - + + + +