From: Jeff Trawick Date: Mon, 6 Dec 2010 18:48:30 +0000 (+0000) Subject: use example.com instead of other non-standard examples X-Git-Tag: 2.3.10~71 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13038e4e92c09cbc6d9d063a8551e057b7261d87;p=thirdparty%2Fapache%2Fhttpd.git use example.com instead of other non-standard examples git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042758 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index dceab4a235e..2a7e82f72ad 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -761,7 +761,7 @@ from the web

then an access to - http://www.my.host.com/index.html refers to + http://my.example.com/index.html refers to /usr/web/index.html. If the directory-path is not absolute then it is assumed to be relative to the ServerRoot.

@@ -3427,8 +3427,8 @@ to name-virtual hosts <VirtualHost *:80>
- ServerName server.domain.com
- ServerAlias server server2.domain.com server2
+ ServerName server.example.com
+ ServerAlias server server2.example.com server2
ServerAlias *.example.com
UseCanonicalName Off
# ...
@@ -3896,10 +3896,10 @@ port type a shortname, and a URL which is a directory, such as http://www/splat, without the trailing slash then Apache httpd will redirect them to - http://www.domain.com/splat/. If you have + http://www.example.com/splat/. If you have authentication enabled, this will cause the user to have to authenticate twice (once for www and once again - for www.domain.com -- see www.example.com -- see the FAQ on this subject for more information). But if UseCanonicalName is set Off, then diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 513367504bf..af2f00e8e41 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -361,7 +361,7 @@ of the current URL another server, one might use:

- RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg + RedirectMatch (.*)\.gif$ http://other.example.com$1.jpg

The considerations related to the difference between diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index f503a7d62ea..0cfe0a3250d 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -337,7 +337,7 @@ for HTTP Basic authentication. granted access by using multiple Require ldap-user directives, with one user per line. For example, with a AuthLDAPURL of - ldap://ldap/o=Airius?cn (i.e., cn is + ldap://ldap/o=Example?cn (i.e., cn is used for searches), the following Require directives could be used to restrict access:

@@ -367,47 +367,47 @@ Require ldap-user "Joe Manager"
For example, assume that the following entry existed in the LDAP directory:

-dn: cn=Administrators, o=Airius
+dn: cn=Administrators, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Barbara Jenson, o=Airius
-uniqueMember: cn=Fred User, o=Airius
+uniqueMember: cn=Barbara Jenson, o=Example
+uniqueMember: cn=Fred User, o=Example

The following directive would grant access to both Fred and Barbara:

-Require ldap-group cn=Administrators, o=Airius +Require ldap-group cn=Administrators, o=Example

Members can also be found within sub-groups of a specified LDAP group if AuthLDAPMaxSubGroupDepth is set to a value greater than 0. For example, assume the following entries exist in the LDAP directory:

-dn: cn=Employees, o=Airius
+dn: cn=Employees, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Managers, o=Airius
-uniqueMember: cn=Administrators, o=Airius
-uniqueMember: cn=Users, o=Airius
+uniqueMember: cn=Managers, o=Example
+uniqueMember: cn=Administrators, o=Example
+uniqueMember: cn=Users, o=Example

-dn: cn=Managers, o=Airius
+dn: cn=Managers, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Bob Ellis, o=Airius
-uniqueMember: cn=Tom Jackson, o=Airius
+uniqueMember: cn=Bob Ellis, o=Example
+uniqueMember: cn=Tom Jackson, o=Example

-dn: cn=Administrators, o=Airius
+dn: cn=Administrators, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Barbara Jenson, o=Airius
-uniqueMember: cn=Fred User, o=Airius
+uniqueMember: cn=Barbara Jenson, o=Example
+uniqueMember: cn=Fred User, o=Example

-dn: cn=Users, o=Airius
+dn: cn=Users, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Allan Jefferson, o=Airius
-uniqueMember: cn=Paul Tilley, o=Airius
-uniqueMember: cn=Temporary Employees, o=Airius
+uniqueMember: cn=Allan Jefferson, o=Example
+uniqueMember: cn=Paul Tilley, o=Example
+uniqueMember: cn=Temporary Employees, o=Example

-dn: cn=Temporary Employees, o=Airius
+dn: cn=Temporary Employees, o=Example
objectClass: groupOfUniqueNames
-uniqueMember: cn=Jim Swenson, o=Airius
-uniqueMember: cn=Elliot Rhodes, o=Airius
+uniqueMember: cn=Jim Swenson, o=Example
+uniqueMember: cn=Elliot Rhodes, o=Example

The following directives would allow access for Bob Ellis, Tom Jackson, @@ -415,7 +415,7 @@ uniqueMember: cn=Elliot Rhodes, o=Airius
allow access for Jim Swenson, or Elliot Rhodes (since they are at a sub-group depth of 2):

-Require ldap-group cn=Employees, o-Airius
+Require ldap-group cn=Employees, o-Example
AuthLDAPSubGroupDepth 1
 @@ -440,7 +440,7 @@ AuthLDAPSubGroupDepth 1

The following directive would grant access to a specific DN:

-Require ldap-dn cn=Barbara Jenson, o=Airius +Require ldap-dn cn=Barbara Jenson, o=Example

Behavior of this directive is modified by the AuthLDAPCompareDNOnServer @@ -505,7 +505,7 @@ AuthLDAPSubGroupDepth 1
Grant access to anyone who exists in the LDAP directory, using their UID for searches. -AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"
+AuthLDAPURL "ldap://ldap1.example.com:389/ou=People, o=Example?uid?sub?(objectClass=*)"
Require valid-user @@ -514,7 +514,7 @@ Require valid-user The next example is the same as above; but with the fields that have useful defaults omitted. Also, note the use of a redundant LDAP server. -AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"
+AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/ou=People, o=Example"
Require valid-user @@ -529,7 +529,7 @@ Require valid-user choose an attribute that is guaranteed unique in your directory, such as uid. -AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"
+AuthLDAPURL "ldap://ldap.example.com/ou=People, o=Example?cn"
Require valid-user @@ -538,19 +538,19 @@ Require valid-user Grant access to anybody in the Administrators group. The users must authenticate using their UID. -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid
-Require ldap-group cn=Administrators, o=Airius +AuthLDAPURL ldap://ldap.example.com/o=Example?uid
+Require ldap-group cn=Administrators, o=Example

  • - The next example assumes that everyone at Airius who + The next example assumes that everyone at Example who carries an alphanumeric pager will have an LDAP attribute of qpagePagerID. The example will grant access only to people (authenticated via their UID) who have alphanumeric pagers: -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)
    +AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(qpagePagerID=*)
    Require valid-user
    • @@ -566,7 +566,7 @@ Require valid-user have a pager, but does need to access the same resource:

    -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))
    +AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(|(qpagePagerID=*)(uid=jmanager))
    Require valid-user     @@ -1047,9 +1047,9 @@ group membership membership. Otherwise, the username will be used. For example, assume that the client sent the username bjenson, which corresponds to the LDAP DN cn=Babs Jenson, - o=Airius. If this directive is set, + o=Example. If this directive is set, mod_authnz_ldap will check if the group has - cn=Babs Jenson, o=Airius as a member. If this + cn=Babs Jenson, o=Example as a member. If this directive is not set, then mod_authnz_ldap will check if the group has bjenson as a member.

    @@ -1293,7 +1293,7 @@ You can of course use search parameters on each of these.

    (&(filter)(attribute=username)).

    For example, consider an URL of - ldap://ldap.airius.com/o=Airius?cn?sub?(posixid=*). When + ldap://ldap.example.com/o=Example?cn?sub?(posixid=*). When a client attempts to connect using a username of Babs Jenson, the resulting search filter will be (&(posixid=*)(cn=Babs Jenson)).

    diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index fea553bac70..6151a6c3a30 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -50,7 +50,7 @@ configuration <Location /server-info>
    SetHandler server-info
    - Require host yourcompany.com
    + Require host example.com
     </Location>     diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index e0b01784080..85e7776d9ab 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1311,14 +1311,13 @@ proxied well. That may slow down the startup time of the server.

    Example - ProxyBlock joes-garage.com some-host.co.uk rocky.wotsamattau.edu + ProxyBlock news.example.com auctions.example.com friends.example.com -

    rocky.wotsamattau.edu would also be matched if referenced by - IP address.

    +

    Note that example would also be sufficient to match any + of these sites.

    -

    Note that wotsamattau would also be sufficient to match - wotsamattau.edu.

    +

    Hosts would also be matched if referenced by IP address.

    Note also that

    diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml index 60e3c5fcfa1..f51b155ad55 100644 --- a/docs/manual/rewrite/access.xml +++ b/docs/manual/rewrite/access.xml @@ -97,12 +97,12 @@ RewriteRule \.(gif|jpg|png)$ /images/go-away.png [R,NC]

    In the third example, we redirect the request to an image on some - third-party site.

    + other site.

     RewriteCond %{HTTP_REFERER} !^$
 RewriteCond %{HTTP_REFERER} !www.example.com [NC]
-RewriteRule \.(gif|jpg|png)$ http://other.site.com/image.gif   [R,NC]
+RewriteRule \.(gif|jpg|png)$ http://other.example.com/image.gif   [R,NC]

    Of these techniques, the last two tend to be the most effective @@ -294,9 +294,9 @@ RewriteRule ^.* ${deflector:%{HTTP_REFERER}} [R,L] ## deflector.map ## -http://www.badguys.com/bad/index.html - -http://www.badguys.com/bad/index2.html - -http://www.badguys.com/bad/index3.html http://somewhere.com/ +http://badguys.example.com/bad/index.html - +http://badguys.example.com/bad/index2.html - +http://badguys.example.com/bad/index3.html http://somewhere.example.com/ diff --git a/docs/manual/rewrite/vhosts.xml b/docs/manual/rewrite/vhosts.xml index 0276323dfa8..48adf03b172 100644 --- a/docs/manual/rewrite/vhosts.xml +++ b/docs/manual/rewrite/vhosts.xml @@ -176,10 +176,10 @@ RewriteRule ^/(.*)$ /www/hosts/${lowercase:%{SERVER_NAME}}/cgi-bin/$1 [H=cgi- this:

    -www.customer-1.com /www/customers/1
    -www.customer-2.com /www/customers/2
    +customer-1.example.com /www/customers/1
    +customer-2.example.com /www/customers/2
    # ...
    -www.customer-N.com /www/customers/N
    +customer-N.example.com /www/customers/N

    The httpd.conf should contain the following:

    diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 9af3f3a5f85..344b55821c0 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -373,10 +373,10 @@ containers apply enclosed configuration directives only to sites accessed through mod_proxy's proxy server that match the specified URL. For example, the following configuration will prevent the proxy server from being used to access the -cnn.com website.

    +www.example.com website.

    -<Proxy http://cnn.com/*>
    +<Proxy http://www.example.com/*>
    Order allow,deny
    Deny from all
    </Proxy> diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml index 845aaf1ef26..c8129e324df 100644 --- a/docs/manual/ssl/ssl_howto.xml +++ b/docs/manual/ssl/ssl_howto.xml @@ -52,10 +52,10 @@ following directives.

    Listen 443
    <VirtualHost _default_:443>
    - ServerName www.domain.com
    + ServerName www.example.com
    SSLEngine on
    - SSLCertificateFile /path/to/www.comain.com.cert
    - SSLCertificateKeyFile /path/to/www.domain.com.key
    + SSLCertificateFile /path/to/www.example.com.cert
    + SSLCertificateKeyFile /path/to/www.example.com.key
     </VirtualHost>     diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index ebfa97d9bcc..a7c25e8d994 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -133,7 +133,7 @@

    The server has two IP addresses. On one (172.20.30.40), we - will serve the "main" server, server.domain.com and on the + will serve the "main" server, server.example.com and on the other (172.20.30.50), we will serve two or more virtual hosts.

    @@ -142,7 +142,7 @@ Listen 80

    # This is the "main" server running on 172.20.30.40
    - ServerName server.domain.com
    + ServerName server.example.com
    DocumentRoot /www/mainserver

    # This is the other address
    diff --git a/docs/manual/vhosts/index.xml b/docs/manual/vhosts/index.xml index 90607a1254c..fbb2c247fe1 100644 --- a/docs/manual/vhosts/index.xml +++ b/docs/manual/vhosts/index.xml @@ -29,7 +29,7 @@

    The term Virtual Host refers to the practice of running more than one web site (such as - www.company1.com and www.company2.com) + company1.example.com and company2.example.com) on a single machine. Virtual hosts can be "IP-based", meaning that you have a different IP address for every web site, or " - Listen www.smallco.com:80 + Listen www.example.com:80

    It is recommended that you use an IP address instead of a @@ -127,11 +127,11 @@ <VirtualHost 172.20.30.40:80>
    - ServerAdmin webmaster@mail.smallco.com
    - DocumentRoot /groups/smallco/www
    - ServerName www.smallco.com
    - ErrorLog /groups/smallco/logs/error_log
    - TransferLog /groups/smallco/logs/access_log
    + ServerAdmin webmaster@mail.example.com
    + DocumentRoot /groups/example/www
    + ServerName www.example.com
    + ErrorLog /groups/example/logs/error_log
    + TransferLog /groups/example/logs/access_log
    </VirtualHost>

    <VirtualHost 172.20.30.50:80>