Merge r507346 from trunk:

Use the specified IPv4 prefix for documentation and examples (192.0.2.0/24)
from RFC3330 rather than non-reserved public internet addresses and some
RFC1918 addresses.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@654548 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index 428df9b9f0c6a8889f373d57c362f08ce2c2eec0..b5c72a98c8261b9ad42097f7a0fd7a3d3e7a8432 100644 (file)
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -80,8 +80,8 @@
        and port 8080 on another, use</p>
 
     <example>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </example>
 
     <p>IPv6 addresses must be enclosed in square brackets, as in the
@@ -128,7 +128,7 @@
 
     <example>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </example>
 
     <p>If your platform supports it and you want Apache to handle IPv4 and 

diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de
index 416f53295ca794957ce83986a47268b1d1bcc35e..be22d1c14034f0bc6181603024ffc8c40c30029e 100644 (file)
--- a/docs/manual/bind.xml.de
+++ b/docs/manual/bind.xml.de
@@ -80,8 +80,8 @@
       Netzwerkinterfaces und Ports zu akzeptieren zu lassen, geben Sie an:</p>
       
     <example>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </example>
 
     <p>IPv6-Adressen m&uuml;ssen wie im folgenden Beispiel in eckigen
@@ -134,7 +134,7 @@
 
     <example>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </example>
 
     <p>Wenn Sie m&ouml;chten, dass der Apache IPv4- und IPv6-Verbindungen an

diff --git a/docs/manual/bind.xml.fr b/docs/manual/bind.xml.fr
index d9af4738dfe313d010de115994646a671c79c97d..24e45d38e0e50a1682965b3e613fd97a2f4ca305 100644 (file)
--- a/docs/manual/bind.xml.fr
+++ b/docs/manual/bind.xml.fr
@@ -83,8 +83,8 @@
     de deux couples d'interfaces et ports, utilisez :</p>
 
     <example>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </example>
 
     <p>Les adresses IPv6 doivent &ecirc;tre entre crochets, comme dans
@@ -134,7 +134,7 @@
 
     <example>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </example>
 
     <p>Si votre plateforme le supporte et si vous souhaitez qu'Apache g&egrave;re

diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja
index c64b467d0a520b2d8db2cd08d8b12d867139f22a..95ebbecdd70b2b3504c87cdd97d30de99f8d17b8 100644 (file)
--- a/docs/manual/bind.xml.ja
+++ b/docs/manual/bind.xml.ja
@@ -79,8 +79,8 @@
     </p>
 
     <example>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </example>
 
     <p>\e$B$H$7$^$9!#\e(B
@@ -129,7 +129,7 @@
 
     <example>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </example>
 
     <p>\e$B>r7o$rK~$?$9%W%i%C%H%[!<%`$G!"\e(BApache \e$B$,\e(B

diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko
index 712ddbe22e21e5ef45ca5ad71767b330c7cdcff5..8dc8a00fe38a06b904921248c47d12317a2f0239 100644 (file)
--- a/docs/manual/bind.xml.ko
+++ b/docs/manual/bind.xml.ko
@@ -74,8 +74,8 @@
     ÇÏ·Á¸é,</p>
 
     <example>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </example>
 
     <p>IPv6 ÁÖ¼Ò´Â ´ÙÀ½°ú °°ÀÌ ´ë°ýÈ£·Î ¹­¾î¾ß ÇÑ´Ù:</p>
@@ -118,7 +118,7 @@
 
     <example>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </example>
 
     <p>Ç÷¡Æû¿¡¼­ Áö¿øÇÏ¸ç ¾ÆÆÄÄ¡°¡ ¼­·Î ´Ù¸¥ ¼ÒÄÏÀ¸·Î IPv4

diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml
index 9a40481bd4df3fceebb1666986e6c5c4a0b2d791..ad40a9ce6d3eeb4278774f38da994536b70ccb42 100644 (file)
--- a/docs/manual/dns-caveats.xml
+++ b/docs/manual/dns-caveats.xml
@@ -56,11 +56,11 @@
     to this virtual host (prior to Apache version 1.2 the server
     would not even boot).</p>
 
-    <p>Suppose that <code>www.abc.dom</code> has address 10.0.0.1.
+    <p>Suppose that <code>www.abc.dom</code> has address 192.0.2.1.
     Then consider this configuration snippet:</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
@@ -79,7 +79,7 @@
     <p>Here is a snippet that avoids both of these problems:</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerName www.abc.dom <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
@@ -115,18 +115,18 @@
       &lt;/VirtualHost&gt;
     </example>
 
-    <p>Suppose that you've assigned 10.0.0.1 to
-    <code>www.abc.dom</code> and 10.0.0.2 to
+    <p>Suppose that you've assigned 192.0.2.1 to
+    <code>www.abc.dom</code> and 192.0.2.2 to
     <code>www.def.dom</code>. Furthermore, suppose that
     <code>def.dom</code> has control of their own DNS. With this
     config you have put <code>def.dom</code> into a position where
     they can steal all traffic destined to <code>abc.dom</code>. To
     do so, all they have to do is set <code>www.def.dom</code> to
-    10.0.0.1. Since they control their own DNS you can't stop them
+    192.0.2.1. Since they control their own DNS you can't stop them
     from pointing the <code>www.def.dom</code> record wherever they
     wish.</p>
 
-    <p>Requests coming in to 10.0.0.1 (including all those where
+    <p>Requests coming in to 192.0.2.1 (including all those where
     users typed in URLs of the form
     <code>http://www.abc.dom/whatever</code>) will all be served by
     the <code>def.dom</code> virtual host. To better understand why

diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja
index 3a1abf1637b66f2db4d4ae46f91af5b12ec01bc3..900e3680811a38930d9b2ff9bd2e1f9d8b05dd19 100644 (file)
--- a/docs/manual/dns-caveats.xml.ja
+++ b/docs/manual/dns-caveats.xml.ja
@@ -55,11 +55,11 @@
     \e$B$=$7$F!"$=$N%P!<%A%c%k%[%9%H$KBP$9$k%R%C%H$K$O1~Ez$,$J$5$l$^$;$s\e(B
     (Apache 1.2 \e$B0JA0$G$O5/F0$9$i$7$^$;$s\e(B)\e$B!#\e(B</p>
 
-    <p><code>www.abc.dom</code> \e$B$N%"%I%l%9$,\e(B 10.0.0.1
+    <p><code>www.abc.dom</code> \e$B$N%"%I%l%9$,\e(B 192.0.2.1
     \e$B$@$H$7$^$9!#$G$O!"<!$N@_Dj$K$D$$$F9M$($F$_$^$7$g$&!#\e(B</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
@@ -78,7 +78,7 @@
     <p>\e$B<!$NNc$O>e5-$NLdBj$r2r7h$7$F$$$^$9!#\e(B</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerName www.abc.dom <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
@@ -113,18 +113,18 @@
       &lt;/VirtualHost&gt;
     </example>
 
-    <p>10.0.0.1 \e$B$r\e(B <code>www.abc.dom</code> \e$B$K!"\e(B
-    10.0.0.2 \e$B$r\e(B <code>www.def.dom</code> \e$B$K3d$jEv$F$F$$$k$H$7$^$9!#\e(B
+    <p>192.0.2.1 \e$B$r\e(B <code>www.abc.dom</code> \e$B$K!"\e(B
+    192.0.2.2 \e$B$r\e(B <code>www.def.dom</code> \e$B$K3d$jEv$F$F$$$k$H$7$^$9!#\e(B
     \e$B$^$?!"\e(B<code>def.dom</code> \e$B$O8\5R<+?H$N\e(B DNS
     \e$B$N@)8f2<$K$"$k$H$7$^$9!#$3$N@_Dj$G!"\e(B<code>abc.dom</code>
     \e$B$K8~$1$i$l$?%H%i%U%#%C%/A4$F$rC%$&$3$H$,$G$-$k0LCV$K\e(B
     <code>def.dom</code> \e$B$r@_CV$G$-$F$$$^$9!#8e$OC1$K\e(B 
-    <code>www.def.dom</code> \e$B$,\e(B 10.0.0.1 \e$B$r;2>H$9$k$h$&$K\e(B
+    <code>www.def.dom</code> \e$B$,\e(B 192.0.2.1 \e$B$r;2>H$9$k$h$&$K\e(B
     \e$B@_Dj$9$k$@$1$G$9!#\e(BDNS \e$B$O8\5RB&$N\e(B DNS \e$B$G%3%s%H%m!<%k$5$l$F$$$k$N$G!"\e(B
     <code>www.def.dom</code> \e$B%l%3!<%I$,9%$-$J>l=j$r;X$9$h$&$K\e(B
     \e$B@_Dj$G$-$F$7$^$&$N$r;_$a$5$;$k$3$H$,$G$-$^$;$s!#\e(B</p>
 
-    <p>10.0.0.1 \e$B$KBP$9$k%j%/%(%9%H\e(B
+    <p>192.0.2.1 \e$B$KBP$9$k%j%/%(%9%H\e(B
     (<code>http://www.abc.dom/whatever</code> \e$B7A<0$N\e(B URL 
     \e$B$rF~NO$7$?%f!<%6$+$i$N$b$NA4$F$r4^$_$^$9\e(B) 
     \e$B$O!"\e(B<code>def.dom</code> \e$B%P!<%A%c%k%[%9%H$G1~Ez$5$l$^$9!#\e(B

diff --git a/docs/manual/dns-caveats.xml.ko b/docs/manual/dns-caveats.xml.ko
index d8734ae507fe150b197e69c0d5c940afec0a93e4..e73508917ccde47657587de54bc73f41b5a81962 100644 (file)
--- a/docs/manual/dns-caveats.xml.ko
+++ b/docs/manual/dns-caveats.xml.ko
@@ -53,11 +53,11 @@
     ÀÌ °¡»óÈ£½ºÆ®´Â ¿äû¿¡ ÀÀ´äÇÒ ¼ö ¾ø´Ù. (¾ÆÆÄÄ¡ 1.2 ÀÌÀü
     ¹öÀü¿¡¼­´Â ½ÉÁö¾î ¼­¹ö°¡ ºÎÆõµ ¾ÈÇÑ´Ù.)</p>
 
-    <p><code>www.abc.dom</code>ÀÇ ÁÖ¼Ò°¡ 10.0.0.1À̶ó°í °¡Á¤ÇÏÀÚ.
+    <p><code>www.abc.dom</code>ÀÇ ÁÖ¼Ò°¡ 192.0.2.1À̶ó°í °¡Á¤ÇÏÀÚ.
     ±×¸®°í ´ÙÀ½ ¼³Á¤À» º¸¶ó:</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
@@ -74,7 +74,7 @@
     <p>¾Æ·¡ °æ¿ì ÀÌ µÎ°¡Áö ¹®Á¦°¡ ¾ø´Ù.</p>
 
     <example>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerName www.abc.dom <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
@@ -107,18 +107,18 @@
       &lt;/VirtualHost&gt;
     </example>
 
-    <p>´ç½ÅÀÌ <code>www.abc.dom</code>¿¡ 10.0.0.1,
-    <code>www.def.dom</code>¿¡ 10.0.0.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ.
+    <p>´ç½ÅÀÌ <code>www.abc.dom</code>¿¡ 192.0.2.1,
+    <code>www.def.dom</code>¿¡ 192.0.2.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ.
     ¶Ç, <code>def.dom</code>Àº ÀÚü DNS¸¦ »ç¿ëÇÑ´Ù°í °¡Á¤ÇÏÀÚ.
     ÀÌ ¼³Á¤°ú ÇÔ²² <code>def.dom</code>À» <code>abc.dom</code>À¸·Î
     °¡´Â ¸ðµç Åë½ÅÀ» °¡·Îç ¼ö ÀÖ´Â Àå¼Ò¿¡ µÎ¾ú´Ù. ±×·¸´Ù¸é ±×µéÀº
-    <code>www.def.dom</code>À» 10.0.0.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù.
+    <code>www.def.dom</code>À» 192.0.2.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù.
     ±×µéÀÌ ÀÚü DNS¸¦ »ç¿ëÇϱ⶧¹®¿¡ ´ç½ÅÀº ±×µéÀÌ ¿øÇϴµ¥·Î
     <code>www.def.dom</code> ·¹Äڵ带 ¼³Á¤ÇÏ´Â °ÍÀ» ¸·À» ¼ö
     ¾ø´Ù.</p>
 
     <p>(»ç¿ëÀÚ°¡ <code>http://www.abc.dom/whatever</code> Çü½ÄÀÇ
-    URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 10.0.0.1·Î ¿À´Â ¸ðµç ¿äûÀ»
+    URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 192.0.2.1·Î ¿À´Â ¸ðµç ¿äûÀ»
     <code>def.dom</code> °¡»óÈ£½ºÆ®°¡ ¼­ºñ½ºÇÏ°Ô µÈ´Ù. ¿Ö ÀÌ·±
     ÀÏÀÌ ÀϾ´ÂÁö ÀÌÇØÇÏ·Á¸é ¾ÆÆÄÄ¡°¡ ¾î¶»°Ô °¡»óÈ£½ºÆ®·Î
     ¿À´Â ¿äûÀ» ó¸®ÇÏ´ÂÁö¿¡ ´ëÇÑ ¼³¸íÀÌ ÇÊ¿äÇÏ´Ù.