From 6d2f3f9dba28655975f08e5d72b2a98c152f86d7 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Thu, 18 Aug 2016 04:56:56 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1756709 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_alias.html.en | 23 ++++++++++++----------- docs/manual/mod/mod_alias.xml.fr | 2 +- docs/manual/mod/mod_alias.xml.ja | 2 +- docs/manual/mod/mod_alias.xml.ko | 2 +- docs/manual/mod/mod_alias.xml.meta | 4 ++-- docs/manual/mod/mod_alias.xml.tr | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index a569185846..47375d7631 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -54,7 +54,7 @@ a new location.

When the Alias, - ScriptAlias and + ScriptAlias and Redirect directives are used within a <Location> or <LocationMatch> @@ -118,13 +118,13 @@ Alias "/foo" "/gaq" ignored.

When the Alias, - ScriptAlias and + ScriptAlias and Redirect directives are used within a <Location> or <LocationMatch> section, these directives will take precedence over any globally defined Alias, - ScriptAlias and + ScriptAlias and Redirect directives.

@@ -302,7 +302,7 @@ a different URL Status:Base Module:mod_alias -

The Redirect directive maps an old URL into a new one by asking +

The Redirect directive maps an old URL into a new one by asking the client to refetch the resource at the new location.

The old URL-path is a case-sensitive (%-decoded) path @@ -313,10 +313,10 @@ a different URL In this latter case the scheme and hostname of the current server will be added.

-

Then any request beginning with URL-Path will return a +

Then any request beginning with URL-path will return a redirect request to the client at the location of the target URL. Additional path information beyond the matched - URL-Path will be appended to the target URL.

+ URL-path will be appended to the target URL.

# Redirect to a URL on a different host
 Redirect "/service" "http://foo2.example.com/service"
@@ -342,10 +342,11 @@ Redirect "/one" "/two"

Note

-

Redirect directives take precedence over Alias and ScriptAlias +

Redirect directives take precedence over Alias and ScriptAlias directives, irrespective of their ordering in the configuration - file. Redirect directives inside a Location take precedence over - Redirect and Alias directives with an URL-path.

+ file. Redirect directives inside a Location take + precedence over Redirect and Alias directives with an URL-path.

+

If no status argument is given, the redirect will be "temporary" (HTTP status 302). This indicates to the client @@ -390,8 +391,8 @@ Redirect 303 "/three" "http://example.com/other"

If the Redirect directive is used within a <Location> or <LocationMatch> - section with the URL-path omitted, then the URL parameter will be - interpreted using expression syntax.
+ section with the URL-path omitted, then the URL parameter + will be interpreted using expression syntax.
This syntax is available in Apache 2.4.19 and later.

<Location "/one">
diff --git a/docs/manual/mod/mod_alias.xml.fr b/docs/manual/mod/mod_alias.xml.fr
index c2e1afe0ab..e7894c5a95 100644
--- a/docs/manual/mod/mod_alias.xml.fr
+++ b/docs/manual/mod/mod_alias.xml.fr
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index 116e6fe158..09aa10e1e8 100644
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.xml.ja
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
+
 
 
+