From 2ce0fcf630e631655870cf3a2efce2ebe3fadb94 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Tue, 7 Dec 2010 16:53:01 +0000 Subject: [PATCH] follow up r1042758 and r1043011 with more fixes to use proper example domains (and show some respect in our mangled version of prep.ai.mit.edu by using .edu instead of .com) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1043126 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_access_compat.xml | 26 +++++++++++++------------- docs/manual/mod/mod_authz_host.xml | 6 +++--- docs/manual/mod/mod_cache.xml | 12 ++++++------ docs/manual/mod/mod_proxy.xml | 6 +++--- docs/manual/mod/mod_setenvif.xml | 6 +++--- docs/manual/platform/windows.xml | 6 +++--- docs/manual/rewrite/flags.xml | 4 ++-- docs/manual/upgrading.xml | 6 +++--- docs/manual/vhosts/examples.xml | 6 +++--- docs/manual/vhosts/ip-based.xml | 20 ++++++++++---------- docs/manual/vhosts/mass.xml | 24 ++++++++++++------------ 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/docs/manual/mod/mod_access_compat.xml b/docs/manual/mod/mod_access_compat.xml index e17c825f79..58fefc99b7 100644 --- a/docs/manual/mod/mod_access_compat.xml +++ b/docs/manual/mod/mod_access_compat.xml @@ -107,13 +107,13 @@ server
Example: - Allow from apache.org
+ Allow from example.org
Allow from .net example.edu

Hosts whose names match, or end in, this string are allowed access. Only complete components are matched, so the above - example will match foo.apache.org but it will not - match fooapache.org. This configuration will cause + example will match foo.example.org but it will not + match fooexample.org. This configuration will cause Apache httpd to perform a double DNS lookup on the client IP address, regardless of the setting of the HostnameLookups directive. It will do @@ -324,35 +324,35 @@ evaluated. -

In the following example, all hosts in the apache.org domain +

In the following example, all hosts in the example.org domain are allowed access; all other hosts are denied access.

Order Deny,Allow
Deny from all
- Allow from apache.org + Allow from example.org -

In the next example, all hosts in the apache.org domain are +

In the next example, all hosts in the example.org domain are allowed access, except for the hosts which are in the - foo.apache.org subdomain, who are denied access. All hosts not - in the apache.org domain are denied access because the default + foo.example.org subdomain, who are denied access. All hosts not + in the example.org domain are denied access because the default state is to Deny access to the server.

Order Allow,Deny
- Allow from apache.org
- Deny from foo.apache.org + Allow from example.org
+ Deny from foo.example.org

On the other hand, if the Order in the last example is changed to Deny,Allow, all hosts will be allowed access. This happens because, regardless of the actual ordering of the directives in the configuration file, the - Allow from apache.org will be evaluated last and will - override the Deny from foo.apache.org. All hosts not in - the apache.org domain will also be allowed access + Allow from example.org will be evaluated last and will + override the Deny from foo.example.org. All hosts not in + the example.org domain will also be allowed access because the default state is Allow.

diff --git a/docs/manual/mod/mod_authz_host.xml b/docs/manual/mod/mod_authz_host.xml index 6c599aad93..2c543f7cc3 100644 --- a/docs/manual/mod/mod_authz_host.xml +++ b/docs/manual/mod/mod_authz_host.xml @@ -131,14 +131,14 @@ address)

A (partial) domain-name

- Require host apache.org
+ Require host example.org
Require host .net example.edu

Hosts whose names match, or end in, this string are allowed access. Only complete components are matched, so the above - example will match foo.apache.org but it will not - match fooapache.org. This configuration will cause + example will match foo.example.org but it will not + match fooexample.org. This configuration will cause Apache to perform a double reverse DNS lookup on the client IP address, regardless of the setting of the HostnameLookups directive. It will do diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index 21280a253b..e73e2d93ee 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -356,8 +356,8 @@ manager CacheEnable disk /

# Cache FTP-proxied url's
CacheEnable disk ftp://

- # Cache content from www.apache.org
- CacheEnable disk http://www.apache.org/
+ # Cache content from www.example.org
+ CacheEnable disk http://www.example.org/

A hostname starting with a "*" matches all hostnames with @@ -365,10 +365,10 @@ manager hostnames containing the domain components that follow.

- # Match www.apache.org, and fooapache.org
- CacheEnable disk http://*apache.org/
- # Match www.apache.org, but not fooapache.org
- CacheEnable disk http://.apache.org/
+ # Match www.example.org, and fooexample.org
+ CacheEnable disk http://*example.org/
+ # Match www.example.org, but not fooexample.org
+ CacheEnable disk http://.example.org/

The no-cache environment variable can be set to diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 85e7776d9a..b8f127f5d5 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1442,7 +1442,7 @@ directly all ending in Domain).

Examples - .com .apache.org. + .com .example.org.

To distinguish Domains from of hosts with different IPAddrs).

Examples - prep.ai.example.com
- www.apache.org + prep.ai.example.edu
+ www.example.org Note diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml index d1a101b4a9..adeb7173b6 100644 --- a/docs/manual/mod/mod_setenvif.xml +++ b/docs/manual/mod/mod_setenvif.xml @@ -316,13 +316,13 @@ without respect to case and differs only in that the regular expression matching is performed in a case-insensitive manner. For example:

- SetEnvIfNoCase Host Apache\.Org site=apache + SetEnvIfNoCase Host Example\.Org site=example

This will cause the site environment variable - to be set to "apache" if the HTTP request header + to be set to "example" if the HTTP request header field Host: was included and contained - Apache.Org, apache.org, or any other + Example.Org, example.org, or any other combination.

diff --git a/docs/manual/platform/windows.xml b/docs/manual/platform/windows.xml index 73760e22bd..15a44c61dd 100644 --- a/docs/manual/platform/windows.xml +++ b/docs/manual/platform/windows.xml @@ -102,11 +102,11 @@

  1. Network Domain. Enter the DNS domain in which your server is or will be registered in. For example, if your - server's full DNS name is server.mydomain.net, you would - type mydomain.net here.

    2. + server's full DNS name is server.example.net, you would + type example.net here.

  2. Server Name. Your server's full DNS name. - From the example above, you would type server.mydomain.net + From the example above, you would type server.example.net here.

  3. Administrator's Email Address. Enter the diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml index 482b8e90ae..c36978ebda 100644 --- a/docs/manual/rewrite/flags.xml +++ b/docs/manual/rewrite/flags.xml @@ -159,14 +159,14 @@ browsers that support this feature.

RewriteEngine On
-RewriteRule ^/index\.html - [CO=frontdoor:yes:.apache.org:1440:/] +RewriteRule ^/index\.html - [CO=frontdoor:yes:.example.com:1440:/]

In the example give, the rule doesn't rewrite the request. The "-" rewrite target tells mod_rewrite to pass the request through unchanged. Instead, it sets a cookie called 'frontdoor' to a value of 'yes'. The cookie is valid for any host -in the .apache.org domain. It will be set to expire in 1440 +in the .example.com domain. It will be set to expire in 1440 minutes (24 hours) and will be returned for all URIs.

diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index 3a4ac4c752..dd31588bb5 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -142,18 +142,18 @@ Require all granted -

In the following example, all hosts in the apache.org domain +

In the following example, all hosts in the example.org domain are allowed access; all other hosts are denied access.

2.2 configuration: Order Deny,Allow
Deny from all
- Allow from apache.org + Allow from example.org 2.4 configuration: - Require host apache.org + Require host example.org diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index a7c25e8d99..ef6ec3010f 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -384,7 +384,7 @@ <VirtualHost 172.20.30.40>
DocumentRoot /www/example3
- ServerName www.example3.net
+ ServerName www.example.net
 </VirtualHost>

@@ -392,14 +392,14 @@ <VirtualHost 172.20.30.50>
DocumentRoot /www/example4
- ServerName www.example4.edu
+ ServerName www.example.edu
 </VirtualHost>

<VirtualHost 172.20.30.60>
DocumentRoot /www/example5
- ServerName www.example5.gov
+ ServerName www.example.gov
 </VirtualHost> diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml index 2efd92a096..24196c0e4d 100644 --- a/docs/manual/vhosts/ip-based.xml +++ b/docs/manual/vhosts/ip-based.xml @@ -127,19 +127,19 @@ <VirtualHost 172.20.30.40:80>
- ServerAdmin webmaster@example1.com
- DocumentRoot /www/vhosts/example1
- ServerName www.example1.com
- ErrorLog /www/logs/example1/error_log
- CustomLog /www/logs/example1/access_log combined
+ ServerAdmin webmaster@www1.example.com
+ DocumentRoot /www/vhosts/www1
+ ServerName www1.example.com
+ ErrorLog /www/logs/www1/error_log
+ CustomLog /www/logs/www1/access_log combined
</VirtualHost>

<VirtualHost 172.20.30.50:80>
- ServerAdmin webmaster@example2.org
- DocumentRoot /www/vhosts/example2
- ServerName www.example2.org
- ErrorLog /www/logs/example2/error_log
- CustomLog /www/logs/example2/access_log combined
+ ServerAdmin webmaster@www2.example.org
+ DocumentRoot /www/vhosts/www2
+ ServerName www2.example.org
+ ErrorLog /www/logs/www2/error_log
+ CustomLog /www/logs/www2/access_log combined
</VirtualHost> diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml index d86071a127..4755130667 100644 --- a/docs/manual/vhosts/mass.xml +++ b/docs/manual/vhosts/mass.xml @@ -45,21 +45,21 @@ 
 NameVirtualHost 111.22.33.44
 <VirtualHost 111.22.33.44>
-    ServerName                 www.customer-1.com
-    DocumentRoot        /www/hosts/www.customer-1.com/docs
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-1.com/cgi-bin
+    ServerName                 customer-1.example.com
+    DocumentRoot        /www/hosts/customer-1.example.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/customer-1.example.com/cgi-bin
 </VirtualHost>
 
 <VirtualHost 111.22.33.44>
-    ServerName                 www.customer-2.com
-    DocumentRoot        /www/hosts/www.customer-2.com/docs
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-2.com/cgi-bin
+    ServerName                 customer-2.example.com
+    DocumentRoot        /www/hosts/customer-2.example.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/customer-2.example.com/cgi-bin
 </VirtualHost>
 
 <VirtualHost 111.22.33.44>
-    ServerName                 www.customer-N.com
-    DocumentRoot        /www/hosts/www.customer-N.com/docs
-    ScriptAlias  /cgi-bin/  /www/hosts/www.customer-N.com/cgi-bin
+    ServerName                 customer-N.example.com
+    DocumentRoot        /www/hosts/customer-N.example.com/docs
+    ScriptAlias  /cgi-bin/  /www/hosts/customer-N.example.com/cgi-bin
 </VirtualHost>
@@ -183,7 +183,7 @@ examples.

ISP's web hosting server. Using %2, we can select substrings of the server name to use in the filename so that, for example, the documents for - www.user.isp.com are found in + www.user.example.com are found in /home/user/www. It uses a single cgi-bin directory instead of one per virtual host.

@@ -239,7 +239,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon

<VirtualHost 111.22.33.44>
- ServerName www.commercial.isp.com
+ ServerName www.commercial.example.com

CustomLog logs/access_log.commercial vcommon

@@ -250,7 +250,7 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon

<VirtualHost 111.22.33.45>
- ServerName www.homepages.isp.com
+ ServerName www.homepages.example.com

CustomLog logs/access_log.homepages vcommon

-- 2.40.0