diff options
author | Jeff Trawick <trawick@apache.org> | 2010-12-06 19:48:30 +0100 |
---|---|---|
committer | Jeff Trawick <trawick@apache.org> | 2010-12-06 19:48:30 +0100 |
commit | 13038e4e92c09cbc6d9d063a8551e057b7261d87 (patch) | |
tree | cebdb1f1049e551c6381903b2a2f84607801bd0d | |
parent | update transformation (diff) | |
download | apache2-13038e4e92c09cbc6d9d063a8551e057b7261d87.tar.xz apache2-13038e4e92c09cbc6d9d063a8551e057b7261d87.zip |
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
-rw-r--r-- | docs/manual/mod/core.xml | 10 | ||||
-rw-r--r-- | docs/manual/mod/mod_alias.xml | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_authnz_ldap.xml | 70 | ||||
-rw-r--r-- | docs/manual/mod/mod_info.xml | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml | 9 | ||||
-rw-r--r-- | docs/manual/rewrite/access.xml | 10 | ||||
-rw-r--r-- | docs/manual/rewrite/vhosts.xml | 6 | ||||
-rw-r--r-- | docs/manual/sections.xml | 4 | ||||
-rw-r--r-- | docs/manual/ssl/ssl_howto.xml | 6 | ||||
-rw-r--r-- | docs/manual/vhosts/examples.xml | 4 | ||||
-rw-r--r-- | docs/manual/vhosts/index.xml | 2 | ||||
-rw-r--r-- | docs/manual/vhosts/ip-based.xml | 12 |
12 files changed, 68 insertions, 69 deletions
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index dceab4a235..2a7e82f72a 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -761,7 +761,7 @@ from the web</description> </example> <p>then an access to - <code>http://www.my.host.com/index.html</code> refers to + <code>http://my.example.com/index.html</code> refers to <code>/usr/web/index.html</code>. If the <var>directory-path</var> is not absolute then it is assumed to be relative to the <directive module="core">ServerRoot</directive>.</p> @@ -3427,8 +3427,8 @@ to name-virtual hosts</description> <example> <VirtualHost *:80><br /> - ServerName server.domain.com<br /> - ServerAlias server server2.domain.com server2<br /> + ServerName server.example.com<br /> + ServerAlias server server2.example.com server2<br /> ServerAlias *.example.com<br /> UseCanonicalName Off<br /> # ...<br /> @@ -3896,10 +3896,10 @@ port</description> type a shortname, and a URL which is a directory, such as <code>http://www/splat</code>, <em>without the trailing slash</em> then Apache httpd will redirect them to - <code>http://www.domain.com/splat/</code>. If you have + <code>http://www.example.com/splat/</code>. If you have authentication enabled, this will cause the user to have to authenticate twice (once for <code>www</code> and once again - for <code>www.domain.com</code> -- see <a + for <code>www.example.com</code> -- see <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the FAQ on this subject for more information</a>). But if <directive>UseCanonicalName</directive> is set <code>Off</code>, then diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 513367504b..af2f00e8e4 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -361,7 +361,7 @@ of the current URL</description> another server, one might use:</p> <example> - RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg + RedirectMatch (.*)\.gif$ http://other.example.com$1.jpg </example> <p>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 f503a7d62e..0cfe0a3250 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.</description> granted access by using multiple <code>Require ldap-user</code> directives, with one user per line. For example, with a <directive module="mod_authnz_ldap">AuthLDAPURL</directive> of - <code>ldap://ldap/o=Airius?cn</code> (i.e., <code>cn</code> is + <code>ldap://ldap/o=Example?cn</code> (i.e., <code>cn</code> is used for searches), the following Require directives could be used to restrict access:</p> <example> @@ -367,47 +367,47 @@ Require ldap-user "Joe Manager"<br /> For example, assume that the following entry existed in the LDAP directory:</p> <example> -dn: cn=Administrators, o=Airius<br /> +dn: cn=Administrators, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Barbara Jenson, o=Airius<br /> -uniqueMember: cn=Fred User, o=Airius<br /> +uniqueMember: cn=Barbara Jenson, o=Example<br /> +uniqueMember: cn=Fred User, o=Example<br /> </example> <p>The following directive would grant access to both Fred and Barbara:</p> -<example>Require ldap-group cn=Administrators, o=Airius</example> +<example>Require ldap-group cn=Administrators, o=Example</example> <p>Members can also be found within sub-groups of a specified LDAP group if <directive module="mod_authnz_ldap">AuthLDAPMaxSubGroupDepth</directive> is set to a value greater than 0. For example, assume the following entries exist in the LDAP directory:</p> <example> -dn: cn=Employees, o=Airius<br /> +dn: cn=Employees, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Managers, o=Airius<br /> -uniqueMember: cn=Administrators, o=Airius<br /> -uniqueMember: cn=Users, o=Airius<br /> +uniqueMember: cn=Managers, o=Example<br /> +uniqueMember: cn=Administrators, o=Example<br /> +uniqueMember: cn=Users, o=Example<br /> <br /> -dn: cn=Managers, o=Airius<br /> +dn: cn=Managers, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Bob Ellis, o=Airius<br /> -uniqueMember: cn=Tom Jackson, o=Airius<br /> +uniqueMember: cn=Bob Ellis, o=Example<br /> +uniqueMember: cn=Tom Jackson, o=Example<br /> <br /> -dn: cn=Administrators, o=Airius<br /> +dn: cn=Administrators, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Barbara Jenson, o=Airius<br /> -uniqueMember: cn=Fred User, o=Airius<br /> +uniqueMember: cn=Barbara Jenson, o=Example<br /> +uniqueMember: cn=Fred User, o=Example<br /> <br /> -dn: cn=Users, o=Airius<br /> +dn: cn=Users, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Allan Jefferson, o=Airius<br /> -uniqueMember: cn=Paul Tilley, o=Airius<br /> -uniqueMember: cn=Temporary Employees, o=Airius<br /> +uniqueMember: cn=Allan Jefferson, o=Example<br /> +uniqueMember: cn=Paul Tilley, o=Example<br /> +uniqueMember: cn=Temporary Employees, o=Example<br /> <br /> -dn: cn=Temporary Employees, o=Airius<br /> +dn: cn=Temporary Employees, o=Example<br /> objectClass: groupOfUniqueNames<br /> -uniqueMember: cn=Jim Swenson, o=Airius<br /> -uniqueMember: cn=Elliot Rhodes, o=Airius<br /> +uniqueMember: cn=Jim Swenson, o=Example<br /> +uniqueMember: cn=Elliot Rhodes, o=Example<br /> </example> <p>The following directives would allow access for Bob Ellis, Tom Jackson, @@ -415,7 +415,7 @@ uniqueMember: cn=Elliot Rhodes, o=Airius<br /> allow access for Jim Swenson, or Elliot Rhodes (since they are at a sub-group depth of 2):</p> <example> -Require ldap-group cn=Employees, o-Airius<br /> +Require ldap-group cn=Employees, o-Example<br /> AuthLDAPSubGroupDepth 1<br /> </example> @@ -440,7 +440,7 @@ AuthLDAPSubGroupDepth 1<br /> <p>The following directive would grant access to a specific DN:</p> -<example>Require ldap-dn cn=Barbara Jenson, o=Airius</example> +<example>Require ldap-dn cn=Barbara Jenson, o=Example</example> <p>Behavior of this directive is modified by the <directive module="mod_authnz_ldap">AuthLDAPCompareDNOnServer</directive> @@ -505,7 +505,7 @@ AuthLDAPSubGroupDepth 1<br /> Grant access to anyone who exists in the LDAP directory, using their UID for searches. <example> -AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br /> +AuthLDAPURL "ldap://ldap1.example.com:389/ou=People, o=Example?uid?sub?(objectClass=*)"<br /> Require valid-user </example> </li> @@ -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. -<example>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br /> +<example>AuthLDAPURL "ldap://ldap1.example.com ldap2.example.com/ou=People, o=Example"<br /> Require valid-user </example> </li> @@ -529,7 +529,7 @@ Require valid-user choose an attribute that is guaranteed unique in your directory, such as <code>uid</code>. <example> -AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br /> +AuthLDAPURL "ldap://ldap.example.com/ou=People, o=Example?cn"<br /> Require valid-user </example> </li> @@ -538,19 +538,19 @@ Require valid-user Grant access to anybody in the Administrators group. The users must authenticate using their UID. <example> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid<br /> -Require ldap-group cn=Administrators, o=Airius +AuthLDAPURL ldap://ldap.example.com/o=Example?uid<br /> +Require ldap-group cn=Administrators, o=Example </example> </li> <li> - 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 <code>qpagePagerID</code>. The example will grant access only to people (authenticated via their UID) who have alphanumeric pagers: <example> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)<br /> +AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(qpagePagerID=*)<br /> Require valid-user </example> </li> @@ -566,7 +566,7 @@ Require valid-user have a pager, but does need to access the same resource:</p> <example> -AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))<br /> +AuthLDAPURL ldap://ldap.example.com/o=Example?uid??(|(qpagePagerID=*)(uid=jmanager))<br /> Require valid-user </example> @@ -1047,9 +1047,9 @@ group membership</description> membership. Otherwise, the username will be used. For example, assume that the client sent the username <code>bjenson</code>, which corresponds to the LDAP DN <code>cn=Babs Jenson, - o=Airius</code>. If this directive is set, + o=Example</code>. If this directive is set, <module>mod_authnz_ldap</module> will check if the group has - <code>cn=Babs Jenson, o=Airius</code> as a member. If this + <code>cn=Babs Jenson, o=Example</code> as a member. If this directive is not set, then <module>mod_authnz_ldap</module> will check if the group has <code>bjenson</code> as a member.</p> </usage> @@ -1293,7 +1293,7 @@ You can of course use search parameters on each of these.</p> <code>(&(<em>filter</em>)(<em>attribute</em>=<em>username</em>))</code>.</p> <p>For example, consider an URL of - <code>ldap://ldap.airius.com/o=Airius?cn?sub?(posixid=*)</code>. When + <code>ldap://ldap.example.com/o=Example?cn?sub?(posixid=*)</code>. When a client attempts to connect using a username of <code>Babs Jenson</code>, the resulting search filter will be <code>(&(posixid=*)(cn=Babs Jenson))</code>.</p> diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index fea553bac7..6151a6c3a3 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -50,7 +50,7 @@ configuration</description> <Location /server-info><br /> <indent> SetHandler server-info<br /> - Require host yourcompany.com<br /> + Require host example.com<br /> </indent> </Location> </example> diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index e0b0178408..85e7776d9a 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1311,14 +1311,13 @@ proxied</description> well. That may slow down the startup time of the server.</p> <example><title>Example</title> - ProxyBlock joes-garage.com some-host.co.uk rocky.wotsamattau.edu + ProxyBlock news.example.com auctions.example.com friends.example.com </example> - <p><code>rocky.wotsamattau.edu</code> would also be matched if referenced by - IP address.</p> + <p>Note that <code>example</code> would also be sufficient to match any + of these sites.</p> - <p>Note that <code>wotsamattau</code> would also be sufficient to match - <code>wotsamattau.edu</code>.</p> + <p>Hosts would also be matched if referenced by IP address.</p> <p>Note also that</p> diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml index 60e3c5fcfa..f51b155ad5 100644 --- a/docs/manual/rewrite/access.xml +++ b/docs/manual/rewrite/access.xml @@ -97,12 +97,12 @@ RewriteRule <strong>\.(gif|jpg|png)$</strong> /images/go-away.png [R,NC] </pre></example> <p>In the third example, we redirect the request to an image on some - third-party site.</p> + other site.</p> <example><pre> RewriteCond %{HTTP_REFERER} <strong>!^$</strong> RewriteCond %{HTTP_REFERER} !www.example.com [NC] -RewriteRule <strong>\.(gif|jpg|png)$</strong> http://other.site.com/image.gif [R,NC] +RewriteRule <strong>\.(gif|jpg|png)$</strong> http://other.example.com/image.gif [R,NC] </pre></example> <p>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/ </pre></example> </dd> diff --git a/docs/manual/rewrite/vhosts.xml b/docs/manual/rewrite/vhosts.xml index 0276323dfa..48adf03b17 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:</p> <example> -www.customer-1.com /www/customers/1<br /> -www.customer-2.com /www/customers/2<br /> +customer-1.example.com /www/customers/1<br /> +customer-2.example.com /www/customers/2<br /> # ...<br /> -www.customer-N.com /www/customers/N<br /> +customer-N.example.com /www/customers/N<br /> </example> <p>The <code>httpd.conf</code> should contain the following:</p> diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 9af3f3a5f8..344b55821c 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 <module>mod_proxy</module>'s proxy server that match the specified URL. For example, the following configuration will prevent the proxy server from being used to access the -<code>cnn.com</code> website.</p> +<code>www.example.com</code> website.</p> <example> -<Proxy http://cnn.com/*><br /> +<Proxy http://www.example.com/*><br /> Order allow,deny<br /> Deny from all<br /> </Proxy> diff --git a/docs/manual/ssl/ssl_howto.xml b/docs/manual/ssl/ssl_howto.xml index 845aaf1ef2..c8129e324d 100644 --- a/docs/manual/ssl/ssl_howto.xml +++ b/docs/manual/ssl/ssl_howto.xml @@ -52,10 +52,10 @@ following directives.</p> Listen 443<br /> <VirtualHost _default_:443><br /> <indent> - ServerName www.domain.com<br /> + ServerName www.example.com<br /> SSLEngine on<br /> - SSLCertificateFile /path/to/www.comain.com.cert<br /> - SSLCertificateKeyFile /path/to/www.domain.com.key<br /> + SSLCertificateFile /path/to/www.example.com.cert<br /> + SSLCertificateKeyFile /path/to/www.example.com.key<br /> </indent> </VirtualHost> </example> diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index ebfa97d9bc..a7c25e8d99 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -133,7 +133,7 @@ </note> <p>The server has two IP addresses. On one (<code>172.20.30.40</code>), we - will serve the "main" server, <code>server.domain.com</code> and on the + will serve the "main" server, <code>server.example.com</code> and on the other (<code>172.20.30.50</code>), we will serve two or more virtual hosts.</p> <example> @@ -142,7 +142,7 @@ Listen 80<br /> <br /> # This is the "main" server running on 172.20.30.40<br /> - ServerName server.domain.com<br /> + ServerName server.example.com<br /> DocumentRoot /www/mainserver<br /> <br /> # This is the other address<br /> diff --git a/docs/manual/vhosts/index.xml b/docs/manual/vhosts/index.xml index 90607a1254..fbb2c247fe 100644 --- a/docs/manual/vhosts/index.xml +++ b/docs/manual/vhosts/index.xml @@ -29,7 +29,7 @@ <p>The term <cite>Virtual Host</cite> refers to the practice of running more than one web site (such as - <code>www.company1.com</code> and <code>www.company2.com</code>) + <code>company1.example.com</code> and <code>company2.example.com</code>) on a single machine. Virtual hosts can be "<a href="ip-based.html">IP-based</a>", meaning that you have a different IP address for every web site, or "<a diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml index a526c63250..db6ba5fa5c 100644 --- a/docs/manual/vhosts/ip-based.xml +++ b/docs/manual/vhosts/ip-based.xml @@ -101,7 +101,7 @@ that daemon services. e.g.</p> <example> - Listen www.smallco.com:80 + Listen www.example.com:80 </example> <p>It is recommended that you use an IP address instead of a @@ -127,11 +127,11 @@ <example> <VirtualHost 172.20.30.40:80><br /> - ServerAdmin webmaster@mail.smallco.com<br /> - DocumentRoot /groups/smallco/www<br /> - ServerName www.smallco.com<br /> - ErrorLog /groups/smallco/logs/error_log<br /> - TransferLog /groups/smallco/logs/access_log<br /> + ServerAdmin webmaster@mail.example.com<br /> + DocumentRoot /groups/example/www<br /> + ServerName www.example.com<br /> + ErrorLog /groups/example/logs/error_log<br /> + TransferLog /groups/example/logs/access_log<br /> </VirtualHost><br /> <br /> <VirtualHost 172.20.30.50:80><br /> |