summaryrefslogtreecommitdiffstats
path: root/docs/manual/vhosts
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manual/vhosts')
-rw-r--r--docs/manual/vhosts/examples.html.en4
-rw-r--r--docs/manual/vhosts/examples.html.fr2
-rw-r--r--docs/manual/vhosts/examples.xml.fr2
-rw-r--r--docs/manual/vhosts/examples.xml.ja2
-rw-r--r--docs/manual/vhosts/examples.xml.ko2
-rw-r--r--docs/manual/vhosts/examples.xml.meta2
-rw-r--r--docs/manual/vhosts/examples.xml.tr2
-rw-r--r--docs/manual/vhosts/index.html.en2
-rw-r--r--docs/manual/vhosts/index.html.fr2
-rw-r--r--docs/manual/vhosts/index.xml.de2
-rw-r--r--docs/manual/vhosts/index.xml.fr2
-rw-r--r--docs/manual/vhosts/index.xml.ja2
-rw-r--r--docs/manual/vhosts/index.xml.ko2
-rw-r--r--docs/manual/vhosts/index.xml.meta2
-rw-r--r--docs/manual/vhosts/index.xml.tr2
-rw-r--r--docs/manual/vhosts/ip-based.html.en12
-rw-r--r--docs/manual/vhosts/ip-based.html.fr2
-rw-r--r--docs/manual/vhosts/ip-based.xml.fr2
-rw-r--r--docs/manual/vhosts/ip-based.xml.ja2
-rw-r--r--docs/manual/vhosts/ip-based.xml.ko2
-rw-r--r--docs/manual/vhosts/ip-based.xml.meta2
-rw-r--r--docs/manual/vhosts/ip-based.xml.tr2
22 files changed, 31 insertions, 25 deletions
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 5bf0c17ec8..f9cffac803 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -155,7 +155,7 @@
</div>
<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>
<div class="example"><h3>Server configuration</h3><p><code>
@@ -164,7 +164,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/examples.html.fr b/docs/manual/vhosts/examples.html.fr
index 321b61a7bf..839e9b14c6 100644
--- a/docs/manual/vhosts/examples.html.fr
+++ b/docs/manual/vhosts/examples.html.fr
@@ -24,6 +24,8 @@
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/examples.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>
<p>Le but de ce document est d'essayer de répondre aux questions
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index fe70276e2d..2275cefc3a 100644
--- a/docs/manual/vhosts/examples.xml.fr
+++ b/docs/manual/vhosts/examples.xml.fr
@@ -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: 1031197 -->
+<!-- English Revision: 1031197:1042758 (outdated) -->
<!-- French translation by Vincent Deffontaines, Alain B., review by -->
<!-- updated by Lucien Gentis -->
diff --git a/docs/manual/vhosts/examples.xml.ja b/docs/manual/vhosts/examples.xml.ja
index 967e01a93c..e5eacd6a01 100644
--- a/docs/manual/vhosts/examples.xml.ja
+++ b/docs/manual/vhosts/examples.xml.ja
@@ -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: 659902:1031197 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko
index fbfb275b0d..ca612998f2 100644
--- a/docs/manual/vhosts/examples.xml.ko
+++ b/docs/manual/vhosts/examples.xml.ko
@@ -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:1031197 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/examples.xml.meta b/docs/manual/vhosts/examples.xml.meta
index 7776d53b0a..0bc7ae58c2 100644
--- a/docs/manual/vhosts/examples.xml.meta
+++ b/docs/manual/vhosts/examples.xml.meta
@@ -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>
diff --git a/docs/manual/vhosts/examples.xml.tr b/docs/manual/vhosts/examples.xml.tr
index 4c9e0a9a96..60d492e45c 100644
--- a/docs/manual/vhosts/examples.xml.tr
+++ b/docs/manual/vhosts/examples.xml.tr
@@ -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: 659902:1031197 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en
index 1b7e3393ec..531d6302bc 100644
--- a/docs/manual/vhosts/index.html.en
+++ b/docs/manual/vhosts/index.html.en
@@ -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 href="name-based.html">name-based</a>", meaning that you have
multiple names running on each IP address. The fact that they
diff --git a/docs/manual/vhosts/index.html.fr b/docs/manual/vhosts/index.html.fr
index 4b592b28a3..1fc7f5f246 100644
--- a/docs/manual/vhosts/index.html.fr
+++ b/docs/manual/vhosts/index.html.fr
@@ -25,6 +25,8 @@
<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/" 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>
<p>Le principe des <cite>Serveurs Virtuels</cite> consiste à
diff --git a/docs/manual/vhosts/index.xml.de b/docs/manual/vhosts/index.xml.de
index 557e328151..3b4c28cae1 100644
--- a/docs/manual/vhosts/index.xml.de
+++ b/docs/manual/vhosts/index.xml.de
@@ -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: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.fr b/docs/manual/vhosts/index.xml.fr
index eaa9eabf09..445b8742e4 100644
--- a/docs/manual/vhosts/index.xml.fr
+++ b/docs/manual/vhosts/index.xml.fr
@@ -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: 932383 -->
+<!-- English Revision: 932383:1042758 (outdated) -->
<!-- french translation by alain B, review by Vincent Deffontaines -->
<!--
diff --git a/docs/manual/vhosts/index.xml.ja b/docs/manual/vhosts/index.xml.ja
index 1ca5719f35..85673843e8 100644
--- a/docs/manual/vhosts/index.xml.ja
+++ b/docs/manual/vhosts/index.xml.ja
@@ -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: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.ko b/docs/manual/vhosts/index.xml.ko
index 777921b551..bd8a63f761 100644
--- a/docs/manual/vhosts/index.xml.ko
+++ b/docs/manual/vhosts/index.xml.ko
@@ -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:932383 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/index.xml.meta b/docs/manual/vhosts/index.xml.meta
index 265ed0a726..42dbaa47ac 100644
--- a/docs/manual/vhosts/index.xml.meta
+++ b/docs/manual/vhosts/index.xml.meta
@@ -9,7 +9,7 @@
<variants>
<variant outdated="yes">de</variant>
<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>
diff --git a/docs/manual/vhosts/index.xml.tr b/docs/manual/vhosts/index.xml.tr
index bfdc15c366..0cd50746db 100644
--- a/docs/manual/vhosts/index.xml.tr
+++ b/docs/manual/vhosts/index.xml.tr
@@ -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: 420990:932383 (outdated) -->
+<!-- English Revision: 420990:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index 38dcc002be..2c31c612e3 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -102,7 +102,7 @@
that daemon services. e.g.</p>
<div class="example"><p><code>
- Listen www.smallco.com:80
+ Listen www.example.com:80
</code></p></div>
<p>It is recommended that you use an IP address instead of a
@@ -122,11 +122,11 @@
<div class="example"><p><code>
&lt;VirtualHost 172.20.30.40:80&gt;<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 />
&lt;/VirtualHost&gt;<br />
<br />
&lt;VirtualHost 172.20.30.50:80&gt;<br />
diff --git a/docs/manual/vhosts/ip-based.html.fr b/docs/manual/vhosts/ip-based.html.fr
index 19275b0ff7..432fc28df9 100644
--- a/docs/manual/vhosts/ip-based.html.fr
+++ b/docs/manual/vhosts/ip-based.html.fr
@@ -24,6 +24,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>
diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr
index 4832774926..a7fe14d2c0 100644
--- a/docs/manual/vhosts/ip-based.xml.fr
+++ b/docs/manual/vhosts/ip-based.xml.fr
@@ -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.en.xsl"?>
-<!-- English Revision: 987242 -->
+<!-- English Revision: 987242:1042758 (outdated) -->
<!-- French translation by alain B, review by Vincent Deffontaines -->
<!--
diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja
index 3aa705a632..4616345057 100644
--- a/docs/manual/vhosts/ip-based.xml.ja
+++ b/docs/manual/vhosts/ip-based.xml.ja
@@ -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: 659902:987242 (outdated) -->
+<!-- English Revision: 659902:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.ko b/docs/manual/vhosts/ip-based.xml.ko
index 718d0bbc67..7819682513 100644
--- a/docs/manual/vhosts/ip-based.xml.ko
+++ b/docs/manual/vhosts/ip-based.xml.ko
@@ -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:987242 (outdated) -->
+<!-- English Revision: 105989:1042758 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/ip-based.xml.meta b/docs/manual/vhosts/ip-based.xml.meta
index d3c670cc20..03687ce26f 100644
--- a/docs/manual/vhosts/ip-based.xml.meta
+++ b/docs/manual/vhosts/ip-based.xml.meta
@@ -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>
diff --git a/docs/manual/vhosts/ip-based.xml.tr b/docs/manual/vhosts/ip-based.xml.tr
index 11c35725fc..c01e7022b1 100644
--- a/docs/manual/vhosts/ip-based.xml.tr
+++ b/docs/manual/vhosts/ip-based.xml.tr
@@ -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: 752951:987242 (outdated) -->
+<!-- English Revision: 752951:1042758 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>