You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/07/20 15:22:06 UTC

svn commit: r1363768 - /httpd/httpd/branches/2.2.x/docs/manual/vhosts/

Author: humbedooh
Date: Fri Jul 20 13:22:05 2012
New Revision: 1363768

URL: http://svn.apache.org/viewvc?rev=1363768&view=rev
Log:
xforms

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.de
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.en
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.fr
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ja.utf8
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ru.koi8-r
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.tr.utf8
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.zh-cn
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.de
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.fr
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ja
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ko
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ru
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.tr
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.zh-cn
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.en
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.fr
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.fr
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ja
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ko
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta
    httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.tr

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.de?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.de Fri Jul 20 13:22:05 2012
@@ -30,6 +30,9 @@
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
     <p>Der Begriff <cite>virtueller Host</cite> <span class="transnote">(<em>Anm.d.Ü.:</em> engl. 'virtual
     host')</span> bezieht sich auf die Praxis, mehr als ein Webangebot

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.en?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.en Fri Jul 20 13:22:05 2012
@@ -34,7 +34,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 href="name-based.html">name-based</a>", meaning that you have
     multiple names running on each IP address. The fact that they
@@ -48,8 +48,7 @@
     called <em>host-based</em> or <em>non-IP virtual hosts</em>.</p>
 
     <p>Below is a list of documentation pages which explain all
-    details of virtual host support in Apache version 1.3 and
-    later.</p>
+    details of virtual host support in Apache HTTP Server:</p>
 
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">Virtual Host Support</a></li>
@@ -80,8 +79,8 @@ hosts</a></li><li><a href="ip-based.html
 <h2><a name="directives" id="directives">Configuration directives</a></h2>
 
     <ul>
-      <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li>
       <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.fr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.fr Fri Jul 20 13:22:05 2012
@@ -30,6 +30,8 @@
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 
     <p>Le principe des <cite>Serveurs Virtuels</cite> consiste à 

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ja.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ja.utf8?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ja.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ja.utf8 [utf-8] Fri Jul 20 13:22:05 2012
@@ -30,6 +30,10 @@
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">この日本語訳はすでに古くなっている
+            可能性があります。
+            最近更新された内容を見るには英語版をご覧下さい。
+        </div>
 
 
     <p><cite>バーチャルホスト</cite>という用語は、1 台のマシン上で

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ru.koi8-r
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ru.koi8-r?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ru.koi8-r [koi8-r] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.ru.koi8-r [koi8-r] Fri Jul 20 13:22:05 2012
@@ -30,6 +30,9 @@
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Этот перевод может быть устаревшим. Смотрите
+            английскую версию для ознакомления со всеми последними изменениями
+            в документе.</div>
 
 
     <p>Термин <cite>виртуальный хост</cite> относится к практике

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.tr.utf8?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.tr.utf8 [utf-8] Fri Jul 20 13:22:05 2012
@@ -30,6 +30,7 @@
 <a href="../tr/vhosts/" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
 
 
     <p><cite>Sanal Konak</cite> (Virtual Host) terimi tek bir makine üzerinde

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.zh-cn?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.zh-cn (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.html.zh-cn Fri Jul 20 13:22:05 2012
@@ -30,6 +30,7 @@
 <a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="../zh-cn/vhosts/" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">此翻译可能过期。要了解最近的更改,请阅读英文版。</div>
 
 
     <p>术语<cite>虚拟主机</cite>指的是在单一机器上运行多个网站

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.de?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.de Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.fr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.fr Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 <!-- french translation by alain B, review by Vincent Deffontaines -->
 
 <!--

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ja?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ja [utf-8] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ko?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ko [euc-kr] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:421100 (outdated) -->
+<!-- English Revision: 105989:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta Fri Jul 20 13:22:05 2012
@@ -7,13 +7,13 @@
   <relpath>..</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>fr</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">fr</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>ru</variant>
-    <variant>tr</variant>
-    <variant>zh-cn</variant>
+    <variant outdated="yes">ru</variant>
+    <variant outdated="yes">tr</variant>
+    <variant outdated="yes">zh-cn</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ru
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ru?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ru [koi8-r] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.ru [koi8-r] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='KOI8-R' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ru.xsl"?>
-<!-- English Revision: 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.tr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.tr [utf-8] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.zh-cn?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.zh-cn (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.zh-cn Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.zh-cn.xsl"?>
-<!-- English revision : 421100 -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.en?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.en Fri Jul 20 13:22:05 2012
@@ -28,26 +28,43 @@
 <a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#explanation">What is IP-based virtual hosting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#howto">How to set up Apache</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#multiple">Setting up multiple daemons</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#single">Setting up a single daemon
-	with virtual hosts</a></li>
+  with virtual hosts</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li>
 <a href="name-based.html">Name-based Virtual Hosts Support</a>
 </li></ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="explanation" id="explanation">What is IP-based virtual hosting</a></h2>
+<p>IP-based virtual hosting is a method to apply different directives
+based on the IP address and port a request is received on.  Most commonly,
+this is used to serve different websites on different ports or interfaces.</p>
+
+<p>In many cases, <a href="name-based.html">name-based
+virtual hosts</a> are more convenient, because they allow
+many virtual hosts to share a single address/port.
+See <a href="name-based.html#namevip">Name-based vs. IP-based
+Virtual Hosts</a> to help you decide.  </p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="requirements" id="requirements">System requirements</a></h2>
 
     <p>As the term <cite>IP-based</cite> indicates, the server
-    <strong>must have a different IP address for each IP-based
+    <strong>must have a different IP address/port combination for each IP-based
     virtual host</strong>. This can be achieved by the machine
     having several physical network connections, or by use of
     virtual interfaces which are supported by most modern operating
     systems (see system documentation for details, these are
     frequently called "ip aliases", and the "ifconfig" command is
-    most commonly used to set them up).</p>
+    most commonly used to set them up), and/or using multiple
+    port numbers.</p>
+
+    <p> In the terminology of Apache HTTP Server, using a single IP address
+    but multiple TCP ports, is also IP-based virtual hosting.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -106,7 +123,7 @@
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="single" id="single">Setting up a single daemon
-	with virtual hosts</a></h2>
+  with virtual hosts</a></h2>
 
     <p>For this case, a single <code class="program"><a href="../programs/httpd.html">httpd</a></code> will service
     requests for the main server and all the virtual hosts. The <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> directive
@@ -123,18 +140,23 @@
     ErrorLog /groups/smallco/logs/error_log<br />
     TransferLog /groups/smallco/logs/access_log<br />
     &lt;/VirtualHost&gt;<br />
-		<br />
+                <br />
     &lt;VirtualHost 192.168.0.2:80&gt;<br />
     ServerAdmin webmaster@baygroup.example.org<br />
     DocumentRoot /groups/baygroup/www<br />
     ServerName baygroup.example.com<br />
     ErrorLog /groups/baygroup/logs/error_log<br />
     TransferLog /groups/baygroup/logs/access_log<br />
-    &lt;/VirtualHost&gt;
-		</code></p></div>
+&lt;/VirtualHost&gt;
+                </code></p></div>
 
     <p>It is recommended that you use an IP address instead of a
-    hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
+    hostname in the &lt;VirtualHost&gt; directive
+    (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
+
+    <p> Specific IP addresses or ports have precedence over their wildcard
+    equivalents, and any virtual host that matches has precedence over
+    the servers base configuration.</p>
 
     <p>Almost <strong>any</strong> configuration directive can be
     put in the VirtualHost directive, with the exception of

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.fr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.html.fr Fri Jul 20 13:22:05 2012
@@ -27,6 +27,8 @@
 <a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Système requis</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#howto">Comment configurer Apache</a></li>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.fr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.fr (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.fr Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1309686 -->
+<!-- English Revision: 1309686:1363767 (outdated) -->
 <!-- French translation by alain B, review by Vincent Deffontaines -->
 <!-- Maintained by Lucien Gentis -->
 

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ja?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ja [utf-8] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 421100:1309686 (outdated) -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ko?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.ko [euc-kr] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1309686 (outdated) -->
+<!-- English Revision: 105989:1363767 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta Fri Jul 20 13:22:05 2012
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.tr?rev=1363768&r1=1363767&r2=1363768&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.tr [utf-8] Fri Jul 20 13:22:05 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 421100:1309686 (outdated) -->
+<!-- English Revision: 421100:1363767 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>