From: Joshua Slive Date: Tue, 11 Mar 2008 18:19:58 +0000 (+0000) Subject: Merge r636043 from trunk. X-Git-Tag: 2.2.9~307 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d50fc1a9377a708bc3d2e90d392e3fcb41401e93;p=thirdparty%2Fapache%2Fhttpd.git Merge r636043 from trunk. Minor updates on rewrite guide -- mostly linking fixes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@636048 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/rewrite/rewrite_guide.html.en b/docs/manual/rewrite/rewrite_guide.html.en index db4a2b34a43..77e8187a975 100644 --- a/docs/manual/rewrite/rewrite_guide.html.en +++ b/docs/manual/rewrite/rewrite_guide.html.en @@ -14,11 +14,12 @@

Modules | Directives | FAQ | Glossary | Sitemap

Apache HTTP Server Version 2.2

-
<-
+
<-
-Apache > HTTP Server > Documentation > Version 2.2

URL Rewriting Guide

+Apache > HTTP Server > Documentation > Version 2.2 > Rewrite
top
-

Time-Dependent Rewriting

+

Time-Dependent Rewriting

@@ -459,7 +464,7 @@ RewriteRule ^foo\.html$ foo.night.html
top
-

Backward Compatibility for YYYY to XXXX migration

+

Backward Compatibility for YYYY to XXXX migration

@@ -502,11 +507,7 @@ RewriteRule ^(.*)$ $1.html
top
-

Content Handling

- - - -

From Old to New (intern)

+

From Old to New (intern)

@@ -535,9 +536,9 @@ RewriteRule ^foo\.html$ bar.html - - -

From Old to New (extern)

+
top
+
+

From Old to New (extern)

@@ -567,9 +568,9 @@ RewriteRule ^foo\.html$ bar.html [ - - -

From Static to Dynamic

+
top
+
+

From Static to Dynamic

@@ -600,14 +601,9 @@ RewriteRule ^foo\.html$ foo.cgi [T= - -
top
+
top
-

Access Restriction

- - - -

Blocking of Robots

+

Blocking of Robots

@@ -643,9 +639,9 @@ RewriteRule ^/~quux/foo/arc/.+ - [F] - - -

Blocked Inline-Images

+
top
+
+

Blocked Inline-Images

@@ -681,9 +677,9 @@ RewriteRule ^inlined-in-foo\.gif$ - [F - - -

Proxy Deny

+
top
+
+

Proxy Deny

@@ -718,15 +714,9 @@ RewriteRule !^http://[^/.]\.mydomain.com.* - [F] - - -
top
+
top
-

Other

- - - -

External Rewriting Engine

+

External Rewriting Engine

@@ -778,11 +768,10 @@ while (<>) { - - -
+
-

Available Languages:  en 

+

Available Languages:  en  | + working 

diff --git a/docs/manual/rewrite/rewrite_guide.xml b/docs/manual/rewrite/rewrite_guide.xml index 19e3b0b926e..64facc30f45 100644 --- a/docs/manual/rewrite/rewrite_guide.xml +++ b/docs/manual/rewrite/rewrite_guide.xml @@ -21,7 +21,7 @@ --> - + Rewrite URL Rewriting Guide @@ -413,7 +413,7 @@ RewriteRule ^(/~.+) http://www.somewhere.com/$1 [R,L] -
+
Time-Dependent Rewriting @@ -454,7 +454,7 @@ RewriteRule ^foo\.html$ foo.night.html
-
+
Backward Compatibility for YYYY to XXXX migration @@ -497,11 +497,7 @@ RewriteRule ^(.*)$ $1.html
-
- - Content Handling - -
+
From Old to New (intern) @@ -532,7 +528,7 @@ RewriteRule ^foo\.html$ bar.html
-
+
From Old to New (extern) @@ -564,7 +560,7 @@ RewriteRule ^foo\.html$ bar.html [ -
+
From Static to Dynamic @@ -596,13 +592,8 @@ RewriteRule ^foo\.html$ foo.cgi [T=
-
- -
- - Access Restriction -
+
Blocking of Robots @@ -640,7 +631,7 @@ RewriteRule ^/~quux/foo/arc/.+ - [F]
-
+
Blocked Inline-Images @@ -678,7 +669,7 @@ RewriteRule ^inlined-in-foo\.gif$ - [F
-
+
Proxy Deny @@ -715,13 +706,7 @@ RewriteRule !^http://[^/.]\.mydomain.com.* - [F]
-
- -
- - Other - -
+
External Rewriting Engine @@ -777,7 +762,5 @@ while (<>) {
-
- diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html.en b/docs/manual/rewrite/rewrite_guide_advanced.html.en index 9715ea21526..db08ab99fe9 100644 --- a/docs/manual/rewrite/rewrite_guide_advanced.html.en +++ b/docs/manual/rewrite/rewrite_guide_advanced.html.en @@ -14,9 +14,9 @@

Modules | Directives | FAQ | Glossary | Sitemap

Apache HTTP Server Version 2.2

-
<-
+
<-

URL Rewriting Guide - Advanced topics

+Apache > HTTP Server > Documentation > Version 2.2 > Rewrite
top
-

Archive Access Multiplexer

+

Archive Access Multiplexer

@@ -414,11 +425,7 @@ com ftp://ftp.cxan.com/CxAN/
top
-

Content Handling

- - - -

Browser Dependent Content

+

Browser Dependent Content

@@ -460,9 +467,9 @@ RewriteRule ^foo\.html$ foo.32.html [L - - -

Dynamic Mirror

+
top
+
+

Dynamic Mirror

@@ -506,9 +513,9 @@ RewriteRule ^usa-news\.html$ http://www.quux-corp. - - -

Reverse Dynamic Mirror

+
top
+
+

Reverse Dynamic Mirror

@@ -528,9 +535,9 @@ RewriteRule ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1 - - -

Retrieve Missing Data from Intranet

+
top
+
+

Retrieve Missing Data from Intranet

@@ -576,9 +583,9 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom - - -

Load Balancing

+
top
+
+

Load Balancing

@@ -727,9 +734,9 @@ while (<STDIN>) { - - -

New MIME-type, New Service

+
top
+
+

New MIME-type, New Service

@@ -811,9 +818,9 @@ HREF="*" - - -

On-the-fly Content-Regeneration

+
top
+
+

On-the-fly Content-Regeneration

@@ -854,9 +861,9 @@ RewriteRule ^page\.html$ page.cgi [ - - -

Document With Autorefresh

+
top
+
+

Document With Autorefresh

@@ -1006,9 +1013,9 @@ exit(0); - - -

Mass Virtual Hosting

+
top
+
+

Mass Virtual Hosting

@@ -1092,15 +1099,9 @@ RewriteRule ^/(.*)$ %1/$1 [E=VHOST:${lowercase:%{HTTP_HOST}}] - - -
top
+
top
-

Access Restriction

- - - -

Host Deny

+

Host Deny

@@ -1153,9 +1154,9 @@ bsdti1.sdm.de - - - -

Proxy Deny

+
top
+
+

Proxy Deny

@@ -1190,9 +1191,9 @@ RewriteRule !^http://[^/.]\.mydomain.com.* - [F] - - -

Special Authentication Variant

+
top
+
+

Special Authentication Variant

@@ -1222,9 +1223,9 @@ RewriteRule ^/~quux/only-for-friends/ - [F] - - -

Referer-based Deflector

+
top
+
+

Referer-based Deflector

@@ -1274,9 +1275,7 @@ http://www.badguys.com/bad/index3.html http://somewhere.com/ - - -
+

Available Languages:  en 

-
+
Archive Access Multiplexer @@ -418,11 +418,7 @@ com ftp://ftp.cxan.com/CxAN/
-
- - Content Handling - -
+
Browser Dependent Content @@ -466,7 +462,7 @@ RewriteRule ^foo\.html$ foo.32.html [L
-
+
Dynamic Mirror @@ -512,7 +508,7 @@ RewriteRule ^usa-news\.html$ http://www.quux-corp.
-
+
Reverse Dynamic Mirror @@ -534,7 +530,7 @@ RewriteRule ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1
-
+
Retrieve Missing Data from Intranet @@ -582,7 +578,7 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://www2.quux-corp.dom
-
+
Load Balancing @@ -734,7 +730,7 @@ while (<STDIN>) {
-
+
New MIME-type, New Service @@ -818,7 +814,7 @@ HREF="*"
-
+
On-the-fly Content-Regeneration @@ -861,7 +857,7 @@ RewriteRule ^page\.html$ page.cgi [
-
+
Document With Autorefresh @@ -1013,7 +1009,7 @@ exit(0);
-
+
Mass Virtual Hosting @@ -1100,13 +1096,7 @@ RewriteRule ^/(.*)$ %1/$1 [E=VHOST:${lowercase:%{HTTP_HOST}}]
-
- -
- - Access Restriction - -
+
Host Deny @@ -1161,7 +1151,7 @@ bsdti1.sdm.de -
-
+
Proxy Deny @@ -1198,7 +1188,7 @@ RewriteRule !^http://[^/.]\.mydomain.com.* - [F]
-
+
Special Authentication Variant @@ -1230,7 +1220,7 @@ RewriteRule ^/~quux/only-for-friends/ - [F]
-
+
Referer-based Deflector @@ -1282,7 +1272,5 @@ http://www.badguys.com/bad/index3.html http://somewhere.com/
-
- diff --git a/docs/manual/rewrite/rewrite_intro.html.en b/docs/manual/rewrite/rewrite_intro.html.en index 1568429e13b..a48da82ab31 100644 --- a/docs/manual/rewrite/rewrite_intro.html.en +++ b/docs/manual/rewrite/rewrite_intro.html.en @@ -14,9 +14,9 @@

Modules | Directives | FAQ | Glossary | Sitemap

Apache HTTP Server Version 2.2

-
<-
+
<-

Apache mod_rewrite Introduction

+Apache > HTTP Server > Documentation > Version 2.2 > Rewrite

Apache mod_rewrite Introduction

Available Languages:  en 

diff --git a/docs/manual/rewrite/rewrite_intro.xml b/docs/manual/rewrite/rewrite_intro.xml index 0ba25cfeef0..c8883c2ac10 100644 --- a/docs/manual/rewrite/rewrite_intro.xml +++ b/docs/manual/rewrite/rewrite_intro.xml @@ -21,7 +21,7 @@ --> - +Rewrite Apache mod_rewrite Introduction diff --git a/docs/manual/rewrite/rewrite_tech.html.en b/docs/manual/rewrite/rewrite_tech.html.en index f5d32f1fa8c..9f37f1d8e80 100644 --- a/docs/manual/rewrite/rewrite_tech.html.en +++ b/docs/manual/rewrite/rewrite_tech.html.en @@ -14,9 +14,9 @@

Modules | Directives | FAQ | Glossary | Sitemap

Apache HTTP Server Version 2.2

-
<-
+
<-

Apache mod_rewrite Technical Details

+Apache > HTTP Server > Documentation > Version 2.2 > Rewrite

Apache mod_rewrite Technical Details

Available Languages:  en 

diff --git a/docs/manual/rewrite/rewrite_tech.xml b/docs/manual/rewrite/rewrite_tech.xml index f750609482a..04447ed1430 100644 --- a/docs/manual/rewrite/rewrite_tech.xml +++ b/docs/manual/rewrite/rewrite_tech.xml @@ -21,7 +21,7 @@ --> - +Rewrite Apache mod_rewrite Technical Details