httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r658547 - in /httpd/httpd/branches/2.2.x/docs/manual: howto/ misc/ mod/ rewrite/
Date Wed, 21 May 2008 03:43:05 GMT
Author: takashi
Date: Tue May 20 20:43:04 2008
New Revision: 658547

URL: http://svn.apache.org/viewvc?rev=658547&view=rev
Log:
Merge r657842 and r658546 from trunk:

We should not use someone's domains for examples.

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/howto/public_html.xml
    httpd/httpd/branches/2.2.x/docs/manual/misc/security_tips.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml
    httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/howto/public_html.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/howto/public_html.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/howto/public_html.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/howto/public_html.xml Tue May 20 20:43:04 2008
@@ -114,12 +114,12 @@
       used to redirect user directory requests to external URLs.</p>
       
     <example>
-      UserDir http://www.foo.com/users/*/
+      UserDir http://example.org/users/*/
     </example>
     
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
-    <code>http://www.foo.com/users/bob/abc.html</code>.</p>
+    <code>http://example.org/users/bob/abc.html</code>.</p>
   </section>
 
   <section id="enable">

Modified: httpd/httpd/branches/2.2.x/docs/manual/misc/security_tips.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/misc/security_tips.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/misc/security_tips.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/misc/security_tips.xml Tue May 20 20:43:04 2008
@@ -317,7 +317,7 @@
     the second example will list the ten last denied clients, for example:</p>
     
     <example>
-      [Thu Jul 11 17:18:39 2002] [error] [client foo.bar.com] client denied 
+      [Thu Jul 11 17:18:39 2002] [error] [client foo.example.com] client denied 
       by server configuration: /usr/local/apache/htdocs/.htpasswd
     </example>
     
@@ -326,7 +326,7 @@
     would have seen something similar to:</p>
     
     <example>
-      foo.bar.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"
+      foo.example.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"
     </example>
     
     <p>in your <a href="../logs.html#accesslog">Access Log</a>. This means


Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Tue May 20 20:43:04 2008
@@ -1963,7 +1963,7 @@
     functionality is especially useful when combined with the
     <directive module="core">SetHandler</directive>
     directive. For example, to enable status requests, but allow them
-    only from browsers at <code>foo.com</code>, you might use:</p>
+    only from browsers at <code>example.com</code>, you might use:</p>
 
     <example>
       &lt;Location /status&gt;<br />
@@ -1971,7 +1971,7 @@
         SetHandler server-status<br />
         Order Deny,Allow<br />
         Deny from all<br />
-        Allow from .foo.com<br />
+        Allow from .example.com<br />
       </indent>
       &lt;/Location&gt;
     </example>
@@ -3313,11 +3313,11 @@
     <example><title>Example</title>
       &lt;VirtualHost 10.1.2.3&gt;<br />
       <indent>
-        ServerAdmin webmaster@host.foo.com<br />
-        DocumentRoot /www/docs/host.foo.com<br />
-        ServerName host.foo.com<br />
-        ErrorLog logs/host.foo.com-error_log<br />
-        TransferLog logs/host.foo.com-access_log<br />
+        ServerAdmin webmaster@host.example.com<br />
+        DocumentRoot /www/docs/host.example.com<br />
+        ServerName host.example.com<br />
+        ErrorLog logs/host.example.com-error_log<br />
+        TransferLog logs/host.example.com-access_log<br />
       </indent>
       &lt;/VirtualHost&gt;
     </example>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml Tue May 20 20:43:04 2008
@@ -218,14 +218,14 @@
       generated:</p>
 
       <example>
-        &lt;a href="http://foo.com/"&gt;<var>Menu text</var>&lt;/a&gt;
+        &lt;a href="http://example.com/"&gt;<var>Menu text</var>&lt;/a&gt;
       </example>
 
       <p>If no quoted text is present, the name of the link will be
       used as the text:</p>
 
       <example>
-        &lt;a href="http://foo.com/"&gt;http://foo.com&lt;/a&gt;
+        &lt;a href="http://example.com/"&gt;http://example.com&lt;/a&gt;
       </example>
 
       <p>If you want to use double quotes within this text, you have to
@@ -243,11 +243,11 @@
       base referer<br />
       poly map "Could I have a menu, please?" 0,0 0,10 10,10 10,0<br />
       rect .. 0,0 77,27 "the directory of the referer"<br />
-      circle http://www.inetnebr.com/lincoln/feedback/ 195,0 305,27<br />
+      circle http://www.inetnebr.example.com/lincoln/feedback/ 195,0 305,27<br />
       rect another_file "in same directory as referer" 306,0 419,27<br />
-      point http://www.zyzzyva.com/ 100,100<br />
-      point http://www.tripod.com/ 200,200<br />
-      rect mailto:nate@tripod.com 100,150 200,0 "Bugs?"<br />
+      point http://www.zyzzyva.example.com/ 100,100<br />
+      point http://www.tripod.example.com/ 200,200<br />
+      rect mailto:nate@tripod.example.com 100,150 200,0 "Bugs?"<br />
     </example>
 
 </section>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml Tue May 20 20:43:04 2008
@@ -479,9 +479,9 @@
     this module.</p>
 
     <example><title>Example</title>
-      ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000<br />
-      ProxyRemote * http://cleversite.com<br />
-      ProxyRemote ftp http://ftpproxy.mydomain.com:8080
+      ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000<br />
+      ProxyRemote * http://cleverproxy.localdomain<br />
+      ProxyRemote ftp http://ftpproxy.mydomain:8080
     </example>
 
     <p>In the last example, the proxy will forward FTP requests, encapsulated
@@ -1162,8 +1162,8 @@
     <directive module="mod_proxy">ProxyRemote</directive> proxy server(s).</p>
 
     <example><title>Example</title>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21
+      ProxyRemote  *  http://firewall.example.com:81<br />
+      NoProxy         .example.com 192.168.112.0/21
     </example>
 
     <p>The <var>host</var> arguments to the <directive>NoProxy</directive>
@@ -1190,8 +1190,8 @@
     <note><title>Note</title>
       <p>Domain name comparisons are done without regard to the case, and
       <var>Domain</var>s are always assumed to be anchored in the root of the
-      DNS tree, therefore two domains <code>.MyDomain.com</code> and
-      <code>.mydomain.com.</code> (note the trailing period) are considered
+      DNS tree, therefore two domains <code>.ExAmple.com</code> and
+      <code>.example.com.</code> (note the trailing period) are considered
       equal. Since a domain comparison does not involve a DNS lookup, it is much
       more efficient than subnet comparison.</p>
     </note></dd>
@@ -1248,7 +1248,7 @@
     of hosts with different <var><a href="#ipaddr">IPAddr</a></var>s).</p>
 
     <example><title>Examples</title>
-      prep.ai.mit.edu<br />
+      prep.ai.example.com<br />
       www.apache.org
     </example>
 
@@ -1260,8 +1260,8 @@
       link.</p>
       <p><var>Hostname</var> comparisons are done without regard to the
case,
       and <var>Hostname</var>s are always assumed to be anchored in the root
-      of the DNS tree, therefore two hosts <code>WWW.MyDomain.com</code>
-      and <code>www.mydomain.com.</code> (note the trailing period) are
+      of the DNS tree, therefore two hosts <code>WWW.ExAmple.com</code>
+      and <code>www.example.com.</code> (note the trailing period) are
       considered equal.</p>
      </note></dd>
     </dl>
@@ -1302,9 +1302,9 @@
     will be generated.</p>
 
     <example><title>Example</title>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21<br />
-      ProxyDomain     .mycompany.com
+      ProxyRemote  *  http://firewall.example.com:81<br />
+      NoProxy         .example.com 192.168.112.0/21<br />
+      ProxyDomain     .example.com
     </example>
 </usage>
 </directivesynopsis>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml Tue May 20 20:43:04
2008
@@ -338,7 +338,7 @@
     <module>mod_status</module> and <module>mod_proxy_balancer</module>
     have to be present in the server.</p>
 
-    <p>To enable load balancer management for browsers from the foo.com
+    <p>To enable load balancer management for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
 <example>
@@ -347,7 +347,7 @@
 <br />
     Order Deny,Allow<br />
     Deny from all<br />
-    Allow from .foo.com<br />
+    Allow from .example.com<br />
     &lt;/Location&gt;
 </example>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml Tue May 20 20:43:04 2008
@@ -218,7 +218,7 @@
    SetEnvIf Request_URI "\.jpg$" object_is_image=jpg<br />
    SetEnvIf Request_URI "\.xbm$" object_is_image=xbm<br />
         :<br />
-   SetEnvIf Referer www\.mydomain\.com intra_site_referral<br />
+   SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral<br />
         :<br />
    SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
         :<br />
@@ -229,7 +229,7 @@
     <code>object_is_image</code> if the request was for an image
     file, and the fourth sets <code>intra_site_referral</code> if
     the referring page was somewhere on the
-    <code>www.mydomain.com</code> Web site.</p>
+    <code>www.mydomain.example.com</code> Web site.</p>
 
     <p>The last example will set environment variable
     <code>HAVE_TS</code> if the request contains any headers that

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml Tue May 20 20:43:04 2008
@@ -72,7 +72,7 @@
 <section id="enable">
     <title>Enabling Status Support</title>
 
-    <p>To enable status reports only for browsers from the foo.com
+    <p>To enable status reports only for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
 <example>
@@ -81,7 +81,7 @@
 <br />
     Order Deny,Allow<br />
     Deny from all<br />
-    Allow from .foo.com<br />
+    Allow from .example.com<br />
     &lt;/Location&gt;
 </example>
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml Tue May 20 20:43:04 2008
@@ -81,7 +81,7 @@
     <code>Userdir</code> directive, the argument is treated as a
     filename pattern, and is used to turn the name into a directory
     specification. A request for
-    <code>http://www.foo.com/~bob/one/two.html</code> will be
+    <code>http://www.example.com/~bob/one/two.html</code> will be
     translated to:</p>
 
 <table>
@@ -97,11 +97,11 @@
 <table>
 <tr><th>UserDir directive used</th>
 <th>Translated path</th></tr>
-<tr><td>UserDir http://www.foo.com/users</td><td>http://www.foo.com/users/bob/one/two.html</td></tr>
+<tr><td>UserDir http://www.example.com/users</td><td>http://www.example.com/users/bob/one/two.html</td></tr>
 <tr><td>UserDir
-http://www.foo.com/*/usr</td><td>http://www.foo.com/bob/usr/one/two.html</td></tr>
+http://www.example.com/*/usr</td><td>http://www.example.com/bob/usr/one/two.html</td></tr>
 <tr><td>UserDir
-http://www.foo.com/~*/</td><td>http://www.foo.com/~bob/one/two.html</td></tr>
+http://www.example.com/~*/</td><td>http://www.example.com/~bob/one/two.html</td></tr>
 </table> 
 
 <note>
@@ -136,12 +136,12 @@
 <p>It is also possible to specify alternative user directories.
 If you use a command like:</p>
 <example>
-Userdir public_html /usr/web http://www.foo.com/
+Userdir public_html /usr/web http://www.example.com/
 </example>
-<p>With a request for http://www.foo.com/~bob/one/two.html, will try to 
+<p>With a request for http://www.example.com/~bob/one/two.html, will try to 
 find the page at ~bob/public_html/one/two.html first, then
 /usr/web/bob/one/two.html, and finally it will send a redirect
-to http://www.foo.com/bob/one/two.html.</p>
+to http://www.example.com/bob/one/two.html.</p>
 <p>If you add a redirect, it must be the last alternative in the list.
 Apache cannot determine if the redirect succeeded or not, so if you have
 the redirect earlier in the list, that will always be the alternative

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml Tue May 20 20:43:04 2008
@@ -122,7 +122,7 @@
 
     <p>The domain string <strong>must</strong> begin with a dot, and
     <strong>must</strong> include at least one embedded dot. That is,
-    <code>.foo.com</code> is legal, but <code>foo.bar.com</code>
and
+    <code>.example.com</code> is legal, but <code>foo.example.com</code>
and 
     <code>.com</code> are not.</p>
 
     <note>Most browsers in use today will not allow cookies to be set

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml?rev=658547&r1=658546&r2=658547&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml Tue May 20 20:43:04
2008
@@ -587,7 +587,7 @@
 
         <dd>
           <p>Suppose we want to load balance the traffic to
-          <code>www.foo.com</code> over <code>www[0-5].foo.com</code>
+          <code>www.example.com</code> over <code>www[0-5].example.com</code>
           (a total of 6 servers). How can this be done?</p>
         </dd>
 
@@ -604,7 +604,7 @@
 
               <p>The simplest method for load-balancing is to use
               DNS round-robin.
-              Here you just configure <code>www[0-9].foo.com</code>
+              Here you just configure <code>www[0-9].example.com</code>
               as usual in your DNS with A (address) records, e.g.,</p>
 
 <example><pre>
@@ -626,15 +626,15 @@
 www   IN  A       1.2.3.5
 </pre></example>
 
-              <p>Now when <code>www.foo.com</code> gets
+              <p>Now when <code>www.example.com</code> gets
               resolved, <code>BIND</code> gives out <code>www0-www5</code>
               - but in a permutated (rotated) order every time.
               This way the clients are spread over the various
               servers. But notice that this is not a perfect load
               balancing scheme, because DNS resolutions are
               cached by clients and other nameservers, so
-              once a client has resolved <code>www.foo.com</code>
-              to a particular <code>wwwN.foo.com</code>, all its
+              once a client has resolved <code>www.example.com</code>
+              to a particular <code>wwwN.example.com</code>, all its
               subsequent requests will continue to go to the same
               IP (and thus a single server), rather than being
               distributed across the other available servers. But the
@@ -661,15 +661,15 @@
 
               <p>In this variant we use <module>mod_rewrite</module>
               and its proxy throughput feature. First we dedicate
-              <code>www0.foo.com</code> to be actually
-              <code>www.foo.com</code> by using a single</p>
+              <code>www0.example.com</code> to be actually
+              <code>www.example.com</code> by using a single</p>
 
 <example><pre>
-www    IN  CNAME   www0.foo.com.
+www    IN  CNAME   www0.example.com.
 </pre></example>
 
               <p>entry in the DNS. Then we convert
-              <code>www0.foo.com</code> to a proxy-only server,
+              <code>www0.example.com</code> to a proxy-only server,
               i.e., we configure this machine so all arriving URLs
               are simply passed through its internal proxy to one of
               the 5 other servers (<code>www1-www5</code>). To
@@ -709,7 +709,7 @@
 </pre></example>
 
               <note>A last notice: Why is this useful? Seems like
-              <code>www0.foo.com</code> still is overloaded? The
+              <code>www0.example.com</code> still is overloaded? The
               answer is yes, it is overloaded, but with plain proxy
               throughput requests, only! All SSI, CGI, ePerl, etc.
               processing is handled done on the other machines.



Mime
View raw message