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.en496
-rw-r--r--docs/manual/vhosts/examples.html.fr2
-rw-r--r--docs/manual/vhosts/examples.html.tr.utf81
-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.meta4
-rw-r--r--docs/manual/vhosts/examples.xml.tr2
-rw-r--r--docs/manual/vhosts/fd-limits.html.en7
-rw-r--r--docs/manual/vhosts/fd-limits.html.fr2
-rw-r--r--docs/manual/vhosts/fd-limits.html.tr.utf81
-rw-r--r--docs/manual/vhosts/fd-limits.xml.fr2
-rw-r--r--docs/manual/vhosts/fd-limits.xml.ja2
-rw-r--r--docs/manual/vhosts/fd-limits.xml.ko2
-rw-r--r--docs/manual/vhosts/fd-limits.xml.meta4
-rw-r--r--docs/manual/vhosts/fd-limits.xml.tr2
-rw-r--r--docs/manual/vhosts/ip-based.html.en40
-rw-r--r--docs/manual/vhosts/ip-based.html.fr2
-rw-r--r--docs/manual/vhosts/ip-based.html.tr.utf81
-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.meta4
-rw-r--r--docs/manual/vhosts/ip-based.xml.tr2
-rw-r--r--docs/manual/vhosts/mass.html.en153
-rw-r--r--docs/manual/vhosts/mass.html.tr.utf81
-rw-r--r--docs/manual/vhosts/mass.xml.fr2
-rw-r--r--docs/manual/vhosts/mass.xml.ko2
-rw-r--r--docs/manual/vhosts/mass.xml.meta2
-rw-r--r--docs/manual/vhosts/mass.xml.tr2
-rw-r--r--docs/manual/vhosts/name-based.html.en35
-rw-r--r--docs/manual/vhosts/name-based.html.fr2
-rw-r--r--docs/manual/vhosts/name-based.html.tr.utf81
-rw-r--r--docs/manual/vhosts/name-based.xml.de2
-rw-r--r--docs/manual/vhosts/name-based.xml.fr2
-rw-r--r--docs/manual/vhosts/name-based.xml.ja2
-rw-r--r--docs/manual/vhosts/name-based.xml.ko2
-rw-r--r--docs/manual/vhosts/name-based.xml.meta4
-rw-r--r--docs/manual/vhosts/name-based.xml.tr2
39 files changed, 370 insertions, 432 deletions
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 59861dde7e..07e29922ed 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -78,33 +78,24 @@
<code>hosts</code> entries.</p>
</div>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+# Ensure that Apache listens on port 80
+Listen 80
+&lt;VirtualHost *:80&gt;
+ DocumentRoot /www/example1
+ ServerName www.example.com
+
+ # Other directives here
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost *:80&gt;
+ DocumentRoot /www/example2
+ ServerName www.example.org
+
+ # Other directives here
+&lt;/VirtualHost&gt;
+ </pre>
- # Ensure that Apache listens on port 80<br />
- Listen 80<br />
- <br />
- <br />
- &lt;VirtualHost *:80&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1<br />
- ServerName www.example.com<br />
- <br />
- # Other directives here<br />
- <br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost *:80&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2<br />
- ServerName www.example.org<br />
- <br />
- # Other directives here<br />
- <br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>The asterisks match all addresses, so the main server serves no
requests. Due to the fact that the virtual host with
@@ -151,35 +142,28 @@
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>
+ <pre class="prettyprint lang-config">
+Listen 80
+
+# This is the "main" server running on 172.20.30.40
+ServerName server.example.com
+DocumentRoot /www/mainserver
+
+&lt;VirtualHost 172.20.30.50&gt;
+ DocumentRoot /www/example1
+ ServerName www.example.com
+ # Other directives here ...
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.50&gt;
+ DocumentRoot /www/example2
+ ServerName www.example.org
+
+ # Other directives here ...
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 80<br />
- <br />
- # This is the "main" server running on 172.20.30.40<br />
- ServerName server.example.com<br />
- DocumentRoot /www/mainserver<br />
- <br />
- &lt;VirtualHost 172.20.30.50&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1<br />
- ServerName www.example.com<br />
- <br />
- # Other directives here ...<br />
- <br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.50&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2<br />
- ServerName www.example.org<br />
- <br />
- # Other directives here ...<br />
- <br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>Any request to an address other than <code>172.20.30.50</code> will be
served from the main server. A request to <code>172.20.30.50</code> with an
@@ -204,18 +188,14 @@
with the same content, with just one <code>VirtualHost</code>
section.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost 192.168.1.1 172.20.30.40&gt;
+ DocumentRoot /www/server1
+ ServerName server.example.com
+ ServerAlias server
+&lt;/VirtualHost&gt;
+ </pre>
- <br />
- &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/server1<br />
- ServerName server.example.com<br />
- ServerAlias server<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>Now requests from both networks will be served from the same
<code>VirtualHost</code>.</p>
@@ -241,40 +221,31 @@
takes place after the best matching IP address and port combination
is determined.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+Listen 80
+Listen 8080
+
+&lt;VirtualHost 172.20.30.40:80&gt;
+ ServerName www.example.com
+ DocumentRoot /www/domain-80
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40:8080&gt;
+ ServerName www.example.com
+ DocumentRoot /www/domain-8080
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40:80&gt;
+ ServerName www.example.org
+ DocumentRoot /www/otherdomain-80
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40:8080&gt;
+ ServerName www.example.org
+ DocumentRoot /www/otherdomain-8080
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 80<br />
- Listen 8080<br />
- <br />
- &lt;VirtualHost 172.20.30.40:80&gt;<br />
- <span class="indent">
- ServerName www.example.com<br />
- DocumentRoot /www/domain-80<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40:8080&gt;<br />
- <span class="indent">
- ServerName www.example.com<br />
- DocumentRoot /www/domain-8080<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40:80&gt;<br />
- <span class="indent">
- ServerName www.example.org<br />
- DocumentRoot /www/otherdomain-80<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40:8080&gt;<br />
- <span class="indent">
- ServerName www.example.org<br />
- DocumentRoot /www/otherdomain-8080<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -285,25 +256,20 @@
<code>www.example.com</code> and <code>www.example.org</code>
respectively.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+Listen 80
+
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/example1
+ ServerName www.example.com
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.50&gt;
+ DocumentRoot /www/example2
+ ServerName www.example.org
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 80<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1<br />
- ServerName www.example.com<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.50&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2<br />
- ServerName www.example.org<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>Requests for any address not specified in one of the
<code>&lt;VirtualHost&gt;</code> directives (such as
@@ -321,42 +287,33 @@
respectively. In each case, we want to run hosts on ports 80 and
8080.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+Listen 172.20.30.40:80
+Listen 172.20.30.40:8080
+Listen 172.20.30.50:80
+Listen 172.20.30.50:8080
+
+&lt;VirtualHost 172.20.30.40:80&gt;
+ DocumentRoot /www/example1-80
+ ServerName www.example.com
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40:8080&gt;
+ DocumentRoot /www/example1-8080
+ ServerName www.example.com
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.50:80&gt;
+ DocumentRoot /www/example2-80
+ ServerName www.example.org
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.50:8080&gt;
+ DocumentRoot /www/example2-8080
+ ServerName www.example.org
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 172.20.30.40:80<br />
- Listen 172.20.30.40:8080<br />
- Listen 172.20.30.50:80<br />
- Listen 172.20.30.50:8080<br />
- <br />
- &lt;VirtualHost 172.20.30.40:80&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1-80<br />
- ServerName www.example.com<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40:8080&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1-8080<br />
- ServerName www.example.com<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.50:80&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2-80<br />
- ServerName www.example.org<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.50:8080&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2-8080<br />
- ServerName www.example.org<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -366,46 +323,35 @@
<p>Any address mentioned in the argument to a virtualhost that never
appears in another virtual host is a strictly IP-based virtual host.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+Listen 80
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/example1
+ ServerName www.example.com
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/example2
+ ServerName www.example.org
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/example3
+ ServerName www.example.net
+&lt;/VirtualHost&gt;
+
+# IP-based
+&lt;VirtualHost 172.20.30.50&gt;
+ DocumentRoot /www/example4
+ ServerName www.example.edu
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.60&gt;
+ DocumentRoot /www/example5
+ ServerName www.example.gov
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 80<br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/example1<br />
- ServerName www.example.com<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2<br />
- ServerName www.example.org<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/example3<br />
- ServerName www.example.net<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- # IP-based<br />
- &lt;VirtualHost 172.20.30.50&gt;<br />
- <span class="indent">
- DocumentRoot /www/example4<br />
- ServerName www.example.edu<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.60&gt;<br />
- <span class="indent">
- DocumentRoot /www/example5<br />
- ServerName www.example.gov<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -419,14 +365,15 @@
used so that the desired hostname is passed through, in case we are
proxying multiple hostnames to a single machine.</p>
- <div class="example"><p><code>
- &lt;VirtualHost *:*&gt;<br />
- ProxyPreserveHost On<br />
- ProxyPass / http://192.168.111.2/<br />
- ProxyPassReverse / http://192.168.111.2/<br />
- ServerName hostname.example.com<br />
- &lt;/VirtualHost&gt;
- </code></p></div>
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost *:*&gt;
+ ProxyPreserveHost On
+ ProxyPass / http://192.168.111.2/
+ ProxyPassReverse / http://192.168.111.2/
+ ServerName hostname.example.com
+&lt;/VirtualHost&gt;
+ </pre>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
@@ -440,15 +387,12 @@
port, <em>i.e.</em>, an address/port combination that is not used for
any other virtual host.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost _default_:*&gt;
+ DocumentRoot /www/default
+&lt;/VirtualHost&gt;
+ </pre>
- &lt;VirtualHost _default_:*&gt;<br />
- <span class="indent">
- DocumentRoot /www/default<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>Using such a default vhost with a wildcard port effectively prevents
any request going to the main server.</p>
@@ -470,23 +414,18 @@
<p>Same as setup 1, but the server listens on several ports and we want
to use a second <code>_default_</code> vhost for port 80.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost _default_:80&gt;
+ DocumentRoot /www/default80
+ # ...
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost _default_:*&gt;
+ DocumentRoot /www/default
+ # ...
+&lt;/VirtualHost&gt;
+ </pre>
- &lt;VirtualHost _default_:80&gt;<br />
- <span class="indent">
- DocumentRoot /www/default80<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost _default_:*&gt;<br />
- <span class="indent">
- DocumentRoot /www/default<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>The default vhost for port 80 (which <em>must</em> appear before any
default vhost with a wildcard port) catches all requests that were sent
@@ -500,14 +439,13 @@
<p>We want to have a default vhost for port 80, but no other default
vhosts.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost _default_:80&gt;
+DocumentRoot /www/default
+...
+&lt;/VirtualHost&gt;
+ </pre>
- &lt;VirtualHost _default_:80&gt;<br />
- DocumentRoot /www/default<br />
- ...<br />
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>A request to an unspecified address on port 80 is served from the
default vhost. Any other request to an unspecified address and port is
@@ -534,30 +472,25 @@
(<code>172.20.30.50</code>) to the <code>VirtualHost</code>
directive.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+Listen 80
+ServerName www.example.com
+DocumentRoot /www/example1
+
+&lt;VirtualHost 172.20.30.40 172.20.30.50&gt;
+ DocumentRoot /www/example2
+ ServerName www.example.org
+ # ...
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/example3
+ ServerName www.example.net
+ ServerAlias *.example.net
+ # ...
+&lt;/VirtualHost&gt;
+ </pre>
- Listen 80<br />
- ServerName www.example.com<br />
- DocumentRoot /www/example1<br />
- <br />
- &lt;VirtualHost 172.20.30.40 172.20.30.50&gt;<br />
- <span class="indent">
- DocumentRoot /www/example2<br />
- ServerName www.example.org<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/example3<br />
- ServerName www.example.net<br />
- ServerAlias *.example.net<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>The vhost can now be accessed through the new address (as an
IP-based vhost) and through the old address (as a name-based
@@ -577,41 +510,34 @@
containing links with an URL prefix to the name-based virtual
hosts.</p>
- <div class="example"><h3>Server configuration</h3><p><code>
-
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost 172.20.30.40&gt;
+ # primary vhost
+ DocumentRoot /www/subdomain
+ RewriteEngine On
+ RewriteRule . /www/subdomain/index.html
+ # ...
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40&gt;
+DocumentRoot /www/subdomain/sub1
+ ServerName www.sub1.domain.tld
+ ServerPath /sub1/
+ RewriteEngine On
+ RewriteRule ^(/sub1/.*) /www/subdomain$1
+ # ...
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.40&gt;
+ DocumentRoot /www/subdomain/sub2
+ ServerName www.sub2.domain.tld
+ ServerPath /sub2/
+ RewriteEngine On
+ RewriteRule ^(/sub2/.*) /www/subdomain$1
+ # ...
+&lt;/VirtualHost&gt;
+ </pre>
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- # primary vhost<br />
- DocumentRoot /www/subdomain<br />
- RewriteEngine On<br />
- RewriteRule . /www/subdomain/index.html<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- DocumentRoot /www/subdomain/sub1<br />
- <span class="indent">
- ServerName www.sub1.domain.tld<br />
- ServerPath /sub1/<br />
- RewriteEngine On<br />
- RewriteRule ^(/sub1/.*) /www/subdomain$1<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.40&gt;<br />
- <span class="indent">
- DocumentRoot /www/subdomain/sub2<br />
- ServerName www.sub2.domain.tld<br />
- ServerPath /sub2/<br />
- RewriteEngine On<br />
- RewriteRule ^(/sub2/.*) /www/subdomain$1<br />
- # ...<br />
- </span>
- &lt;/VirtualHost&gt;
- </code></p></div>
<p>Due to the <code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code>
directive a request to the URL
diff --git a/docs/manual/vhosts/examples.html.fr b/docs/manual/vhosts/examples.html.fr
index c1ca6b4a25..8c5175d8be 100644
--- a/docs/manual/vhosts/examples.html.fr
+++ b/docs/manual/vhosts/examples.html.fr
@@ -27,6 +27,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.html.tr.utf8 b/docs/manual/vhosts/examples.html.tr.utf8
index 0e195fb95d..cd9807720a 100644
--- a/docs/manual/vhosts/examples.html.tr.utf8
+++ b/docs/manual/vhosts/examples.html.tr.utf8
@@ -27,6 +27,7 @@
<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/examples.html" title="Türkçe">&nbsp;tr&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>Bu belgede <a href="index.html">sanal konaklarla</a> ile ilgili olarak
diff --git a/docs/manual/vhosts/examples.xml.fr b/docs/manual/vhosts/examples.xml.fr
index 487101e0a3..3ff7ba2610 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: 1132802 -->
+<!-- English Revision: 1132802:1330878 (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 0da43c657e..ed7237d7f2 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:1132802 (outdated) -->
+<!-- English Revision: 659902:1330878 (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 5cf77df66d..088a6787f1 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:1132802 (outdated) -->
+<!-- English Revision: 105989:1330878 (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 4bd55405bf..9222c81673 100644
--- a/docs/manual/vhosts/examples.xml.meta
+++ b/docs/manual/vhosts/examples.xml.meta
@@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/examples.xml.tr b/docs/manual/vhosts/examples.xml.tr
index 699bc99f95..f517c8b52c 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: 1132802 -->
+<!-- English Revision: 1132802:1330878 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en
index beb23cb0b7..6c2b1a7c5c 100644
--- a/docs/manual/vhosts/fd-limits.html.en
+++ b/docs/manual/vhosts/fd-limits.html.en
@@ -94,10 +94,11 @@ LogFormat</a></code>
directive, and the <code>%v</code> variable. Add this to the beginning
of your log format string:</p>
-<div class="example"><p><code>
-LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost<br />
+<pre class="prettyprint lang-config">
+LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost
CustomLog logs/multiple_vhost_log vhost
-</code></p></div>
+</pre>
+
<p>This will create a log file in the common log format, but with the
canonical virtual host (whatever appears in the
diff --git a/docs/manual/vhosts/fd-limits.html.fr b/docs/manual/vhosts/fd-limits.html.fr
index 2090144be5..4c29ab43cb 100644
--- a/docs/manual/vhosts/fd-limits.html.fr
+++ b/docs/manual/vhosts/fd-limits.html.fr
@@ -27,6 +27,8 @@
<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/fd-limits.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>Quand de nombreux serveurs virtuels sont créés, Apache peut
diff --git a/docs/manual/vhosts/fd-limits.html.tr.utf8 b/docs/manual/vhosts/fd-limits.html.tr.utf8
index 34a7af70e7..ff6446c3ef 100644
--- a/docs/manual/vhosts/fd-limits.html.tr.utf8
+++ b/docs/manual/vhosts/fd-limits.html.tr.utf8
@@ -27,6 +27,7 @@
<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/fd-limits.html" title="Türkçe">&nbsp;tr&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>Çok büyük sayıda sanal konak kullanıyorsanız ve bunların her biri için
diff --git a/docs/manual/vhosts/fd-limits.xml.fr b/docs/manual/vhosts/fd-limits.xml.fr
index 963cd6f53f..ac0814df9e 100644
--- a/docs/manual/vhosts/fd-limits.xml.fr
+++ b/docs/manual/vhosts/fd-limits.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 : 1174747 -->
+<!-- English Revision: 1174747:1330878 (outdated) -->
<!-- French translation by Vincent Deffontaines, review by alain B -->
<!--
diff --git a/docs/manual/vhosts/fd-limits.xml.ja b/docs/manual/vhosts/fd-limits.xml.ja
index 1e5c2a013d..7b6620319a 100644
--- a/docs/manual/vhosts/fd-limits.xml.ja
+++ b/docs/manual/vhosts/fd-limits.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:1174747 (outdated) -->
+<!-- English Revision: 659902:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/fd-limits.xml.ko b/docs/manual/vhosts/fd-limits.xml.ko
index d3eca37f64..b5f61ef235 100644
--- a/docs/manual/vhosts/fd-limits.xml.ko
+++ b/docs/manual/vhosts/fd-limits.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: 659902:1174747 (outdated) -->
+<!-- English Revision: 659902:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/fd-limits.xml.meta b/docs/manual/vhosts/fd-limits.xml.meta
index 2993e90a58..356b8dc8f9 100644
--- a/docs/manual/vhosts/fd-limits.xml.meta
+++ b/docs/manual/vhosts/fd-limits.xml.meta
@@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/fd-limits.xml.tr b/docs/manual/vhosts/fd-limits.xml.tr
index 0cf1b4389c..5cf1136217 100644
--- a/docs/manual/vhosts/fd-limits.xml.tr
+++ b/docs/manual/vhosts/fd-limits.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: 1174747 -->
+<!-- English Revision: 1174747:1330878 (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 6df363cf64..2aa4ea70be 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -113,9 +113,10 @@ Virtual Hosts</a> to help you decide. </p>
configuration file to select which IP address (or virtual host)
that daemon services. e.g.</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
Listen 192.0.2.100:80
- </code></p></div>
+ </pre>
+
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
@@ -132,23 +133,24 @@ Virtual Hosts</a> to help you decide. </p>
configuration directives to different values for each virtual
host. e.g.</p>
- <div class="example"><p><code>
- &lt;VirtualHost 172.20.30.40:80&gt;<br />
- ServerAdmin webmaster@www1.example.com<br />
- DocumentRoot /www/vhosts/www1<br />
- ServerName www1.example.com<br />
- ErrorLog /www/logs/www1/error_log<br />
- CustomLog /www/logs/www1/access_log combined<br />
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost 172.20.30.50:80&gt;<br />
- ServerAdmin webmaster@www2.example.org<br />
- DocumentRoot /www/vhosts/www2<br />
- ServerName www2.example.org<br />
- ErrorLog /www/logs/www2/error_log<br />
- CustomLog /www/logs/www2/access_log combined<br />
- &lt;/VirtualHost&gt;
- </code></p></div>
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost 172.20.30.40:80&gt;
+ ServerAdmin webmaster@www1.example.com
+ DocumentRoot /www/vhosts/www1
+ ServerName www1.example.com
+ ErrorLog /www/logs/www1/error_log
+ CustomLog /www/logs/www1/access_log combined
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 172.20.30.50:80&gt;
+ ServerAdmin webmaster@www2.example.org
+ DocumentRoot /www/vhosts/www2
+ ServerName www2.example.org
+ ErrorLog /www/logs/www2/error_log
+ CustomLog /www/logs/www2/access_log combined
+&lt;/VirtualHost&gt;
+ </pre>
+
<p>It is recommended that you use an IP address instead of a
hostname in the &lt;VirtualHost&gt; directive
diff --git a/docs/manual/vhosts/ip-based.html.fr b/docs/manual/vhosts/ip-based.html.fr
index cd1fa18ec2..7f849f4447 100644
--- a/docs/manual/vhosts/ip-based.html.fr
+++ b/docs/manual/vhosts/ip-based.html.fr
@@ -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>
diff --git a/docs/manual/vhosts/ip-based.html.tr.utf8 b/docs/manual/vhosts/ip-based.html.tr.utf8
index cd0d65496a..dc23091c12 100644
--- a/docs/manual/vhosts/ip-based.html.tr.utf8
+++ b/docs/manual/vhosts/ip-based.html.tr.utf8
@@ -27,6 +27,7 @@
<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/ip-based.html" title="Türkçe">&nbsp;tr&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>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#explanation">IP'ye dayalı sanal konak desteği nedir</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#requirements">Sistem gereksinimleri</a></li>
diff --git a/docs/manual/vhosts/ip-based.xml.fr b/docs/manual/vhosts/ip-based.xml.fr
index 126709c346..b0fecf2ce7 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 : 1300910 -->
+<!-- English Revision: 1300910:1330878 (outdated) -->
<!-- French translation by alain B, review by Vincent Deffontaines -->
<!-- Updated by Lucien Gentis -->
diff --git a/docs/manual/vhosts/ip-based.xml.ja b/docs/manual/vhosts/ip-based.xml.ja
index 2acee10af0..7bb1e28ad8 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:1300910 (outdated) -->
+<!-- English Revision: 659902:1330878 (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 bf75a27c79..691304c628 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:1300910 (outdated) -->
+<!-- English Revision: 105989:1330878 (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 bcb6ed04a0..af2f9cae53 100644
--- a/docs/manual/vhosts/ip-based.xml.meta
+++ b/docs/manual/vhosts/ip-based.xml.meta
@@ -8,9 +8,9 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/ip-based.xml.tr b/docs/manual/vhosts/ip-based.xml.tr
index e687ea7800..ae1802e19b 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: 1300910 -->
+<!-- English Revision: 1300910:1330878 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 451d8b4996..08b2cc057b 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -55,7 +55,7 @@ mod_rewrite</a></li>
<code>&lt;VirtualHost&gt;</code> sections that are
substantially the same, for example:</p>
-<div class="example"><pre>
+<pre class="prettyprint lang-config">
&lt;VirtualHost 111.22.33.44&gt;
ServerName customer-1.example.com
DocumentRoot /www/hosts/customer-1.example.com/docs
@@ -73,7 +73,8 @@ mod_rewrite</a></li>
DocumentRoot /www/hosts/customer-N.example.com/docs
ScriptAlias /cgi-bin/ /www/hosts/customer-N.example.com/cgi-bin
&lt;/VirtualHost&gt;
-</pre></div>
+</pre>
+
<p>We wish to replace these multiple
<code>&lt;VirtualHost&gt;</code> blocks with a mechanism
@@ -157,19 +158,20 @@ mod_vhost_alias</a></h2>
virtual host arrangement outlined in the <a href="#motivation">Motivation</a> section above
using <code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code>.</p>
-<div class="example"><p><code>
-# get the server name from the Host: header<br />
-UseCanonicalName Off<br />
-<br />
-# this log format can be split per-virtual-host based on the first field<br />
-# using the split-logfile utility.<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include the server name in the filenames used to satisfy requests<br />
-VirtualDocumentRoot /www/hosts/%0/docs<br />
+<pre class="prettyprint lang-config">
+# get the server name from the Host: header
+UseCanonicalName Off
+
+# this log format can be split per-virtual-host based on the first field
+# using the split-logfile utility.
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include the server name in the filenames used to satisfy requests
+VirtualDocumentRoot /www/hosts/%0/docs
VirtualScriptAlias /www/hosts/%0/cgi-bin
-</code></p></div>
+</pre>
+
<p>This configuration can be changed into an IP-based virtual
hosting solution by just turning <code>UseCanonicalName
@@ -194,18 +196,19 @@ examples.</p>
<code>/home/user/www</code>. It uses a single <code>cgi-bin</code>
directory instead of one per virtual host.</p>
-<div class="example"><p><code>
-UseCanonicalName Off<br />
-<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include part of the server name in the filenames<br />
-VirtualDocumentRoot /home/%2/www<br />
-<br />
-# single cgi-bin directory<br />
-ScriptAlias /cgi-bin/ /www/std-cgi/<br />
-</code></p></div>
+<pre class="prettyprint lang-config">
+UseCanonicalName Off
+
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include part of the server name in the filenames
+VirtualDocumentRoot /home/%2/www
+
+# single cgi-bin directory
+ScriptAlias /cgi-bin/ /www/std-cgi/
+</pre>
+
<p>There are examples of more complicated
<code>VirtualDocumentRoot</code> settings in the
@@ -225,47 +228,40 @@ ScriptAlias /cgi-bin/ /www/std-cgi/<br />
<code>&lt;VirtualHost&gt;</code> configuration sections, as shown
below.</p>
-<div class="example"><p><code>
-UseCanonicalName Off<br />
-<br />
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
-<br />
-&lt;Directory /www/commercial&gt;<br />
-<span class="indent">
- Options FollowSymLinks<br />
- AllowOverride All<br />
-</span>
-&lt;/Directory&gt;<br />
-<br />
-&lt;Directory /www/homepages&gt;<br />
-<span class="indent">
- Options FollowSymLinks<br />
- AllowOverride None<br />
-</span>
-&lt;/Directory&gt;<br />
-<br />
-&lt;VirtualHost 111.22.33.44&gt;<br />
-<span class="indent">
- ServerName www.commercial.example.com<br />
- <br />
- CustomLog logs/access_log.commercial vcommon<br />
- <br />
- VirtualDocumentRoot /www/commercial/%0/docs<br />
- VirtualScriptAlias /www/commercial/%0/cgi-bin<br />
-</span>
-&lt;/VirtualHost&gt;<br />
-<br />
-&lt;VirtualHost 111.22.33.45&gt;<br />
-<span class="indent">
- ServerName www.homepages.example.com<br />
- <br />
- CustomLog logs/access_log.homepages vcommon<br />
- <br />
- VirtualDocumentRoot /www/homepages/%0/docs<br />
- ScriptAlias /cgi-bin/ /www/std-cgi/<br />
-</span>
+<pre class="prettyprint lang-config">
+UseCanonicalName Off
+
+LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
+
+&lt;Directory /www/commercial&gt;
+ Options FollowSymLinks
+ AllowOverride All
+&lt;/Directory&gt;
+
+&lt;Directory /www/homepages&gt;
+ Options FollowSymLinks
+ AllowOverride None
+&lt;/Directory&gt;
+
+&lt;VirtualHost 111.22.33.44&gt;
+ ServerName www.commercial.example.com
+
+ CustomLog logs/access_log.commercial vcommon
+
+ VirtualDocumentRoot /www/commercial/%0/docs
+ VirtualScriptAlias /www/commercial/%0/cgi-bin
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost 111.22.33.45&gt;
+ ServerName www.homepages.example.com
+
+ CustomLog logs/access_log.homepages vcommon
+
+ VirtualDocumentRoot /www/homepages/%0/docs
+ ScriptAlias /cgi-bin/ /www/std-cgi/
&lt;/VirtualHost&gt;
-</code></p></div>
+</pre>
+
<div class="note">
<h3>Note</h3>
@@ -290,18 +286,19 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon<br />
negating the need for a DNS lookup. Logging will also have to be adjusted
to fit this system.</p>
-<div class="example"><p><code>
-# get the server name from the reverse DNS of the IP address<br />
-UseCanonicalName DNS<br />
-<br />
-# include the IP address in the logs so they may be split<br />
-LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon<br />
-CustomLog logs/access_log vcommon<br />
-<br />
-# include the IP address in the filenames<br />
-VirtualDocumentRootIP /www/hosts/%0/docs<br />
-VirtualScriptAliasIP /www/hosts/%0/cgi-bin<br />
-</code></p></div>
+<pre class="prettyprint lang-config">
+# get the server name from the reverse DNS of the IP address
+UseCanonicalName DNS
+
+# include the IP address in the logs so they may be split
+LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon
+CustomLog logs/access_log vcommon
+
+# include the IP address in the filenames
+VirtualDocumentRootIP /www/hosts/%0/docs
+VirtualScriptAliasIP /www/hosts/%0/cgi-bin
+</pre>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
diff --git a/docs/manual/vhosts/mass.html.tr.utf8 b/docs/manual/vhosts/mass.html.tr.utf8
index 79a7f90f84..f762509636 100644
--- a/docs/manual/vhosts/mass.html.tr.utf8
+++ b/docs/manual/vhosts/mass.html.tr.utf8
@@ -26,6 +26,7 @@
<a href="../ko/vhosts/mass.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/mass.html" title="Türkçe">&nbsp;tr&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>Bu belgede sanal konakların sonu belirsiz bir şekilde artışı karşısında
diff --git a/docs/manual/vhosts/mass.xml.fr b/docs/manual/vhosts/mass.xml.fr
index 5ba5028f3b..bf39f9d4db 100644
--- a/docs/manual/vhosts/mass.xml.fr
+++ b/docs/manual/vhosts/mass.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: 1138405:1174747 (outdated) -->
+<!-- English Revision: 1138405:1330878 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!--
diff --git a/docs/manual/vhosts/mass.xml.ko b/docs/manual/vhosts/mass.xml.ko
index 293eb40d19..98a3983b42 100644
--- a/docs/manual/vhosts/mass.xml.ko
+++ b/docs/manual/vhosts/mass.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: 151408:1174747 (outdated) -->
+<!-- English Revision: 151408:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/mass.xml.meta b/docs/manual/vhosts/mass.xml.meta
index 9a4b57f4d0..846b02d78a 100644
--- a/docs/manual/vhosts/mass.xml.meta
+++ b/docs/manual/vhosts/mass.xml.meta
@@ -10,6 +10,6 @@
<variant>en</variant>
<variant outdated="yes">fr</variant>
<variant outdated="yes">ko</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/mass.xml.tr b/docs/manual/vhosts/mass.xml.tr
index ccac65010c..a7a37c2d0c 100644
--- a/docs/manual/vhosts/mass.xml.tr
+++ b/docs/manual/vhosts/mass.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: 1174747 -->
+<!-- English Revision: 1174747:1330878 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index a3001fcbfb..d1d59cf27c 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -116,22 +116,20 @@
<code>other.example.com</code>, which points at the same IP address.
Then you simply add the following to <code>httpd.conf</code>:</p>
- <div class="example"><p><code>
- &lt;VirtualHost *:80&gt;<br />
- <span class="indent">
- # This first-listed virtual host is also the default for *:80
- ServerName www.example.com<br />
- ServerAlias example.com <br />
- DocumentRoot /www/domain<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- <br />
- &lt;VirtualHost *:80&gt;<br />
- <span class="indent">ServerName other.example.com<br />
- DocumentRoot /www/otherdomain<br />
- </span>
- &lt;/VirtualHost&gt;<br />
- </code></p></div>
+ <pre class="prettyprint lang-config">
+&lt;VirtualHost *:80&gt;
+ # This first-listed virtual host is also the default for *:80
+ ServerName www.example.com
+ ServerAlias example.com
+ DocumentRoot /www/domain
+&lt;/VirtualHost&gt;
+
+&lt;VirtualHost *:80&gt;
+ServerName other.example.com
+ DocumentRoot /www/otherdomain
+&lt;/VirtualHost&gt;
+ </pre>
+
<p>You can alternatively specify an explicit IP address in place of the
<code>*</code> in <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> directives. For example, you might want to do this
@@ -145,9 +143,10 @@
the listed names are other names which people can use to see that same
web site:</p>
- <div class="example"><p><code>
+ <pre class="prettyprint lang-config">
ServerAlias example.com *.example.com
- </code></p></div>
+ </pre>
+
<p>then requests for all hosts in the <code>example.com</code> domain will
be served by the <code>www.example.com</code> virtual host. The wildcard
diff --git a/docs/manual/vhosts/name-based.html.fr b/docs/manual/vhosts/name-based.html.fr
index 449783ede4..ea9c0ece82 100644
--- a/docs/manual/vhosts/name-based.html.fr
+++ b/docs/manual/vhosts/name-based.html.fr
@@ -28,6 +28,8 @@
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/name-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>
<p>Ce document décrit quand et comment utiliser des serveurs
virtuels par nom.</p>
diff --git a/docs/manual/vhosts/name-based.html.tr.utf8 b/docs/manual/vhosts/name-based.html.tr.utf8
index 9739bb67e4..3e3df76d36 100644
--- a/docs/manual/vhosts/name-based.html.tr.utf8
+++ b/docs/manual/vhosts/name-based.html.tr.utf8
@@ -28,6 +28,7 @@
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
<a href="../tr/vhosts/name-based.html" title="Türkçe">&nbsp;tr&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>Bu belgede isme dayalı sanal konakların ne zaman, nasıl kullanılacakları
açıklanmıştır.</p>
diff --git a/docs/manual/vhosts/name-based.xml.de b/docs/manual/vhosts/name-based.xml.de
index 010dadddf8..3743ccb2f5 100644
--- a/docs/manual/vhosts/name-based.xml.de
+++ b/docs/manual/vhosts/name-based.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:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.fr b/docs/manual/vhosts/name-based.xml.fr
index 1d7140ce22..4aa62160b3 100644
--- a/docs/manual/vhosts/name-based.xml.fr
+++ b/docs/manual/vhosts/name-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.fr.xsl"?>
-<!-- English Revision: 1301398 -->
+<!-- English Revision: 1301398:1330878 (outdated) -->
<!-- French translation by alain B, review by Vincent Deffontaines
updated by Lucien GENTIS -->
diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja
index f9d8bd8e77..e9167b986a 100644
--- a/docs/manual/vhosts/name-based.xml.ja
+++ b/docs/manual/vhosts/name-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: 420990:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.ko b/docs/manual/vhosts/name-based.xml.ko
index a1b775f1b2..fa4da2690f 100644
--- a/docs/manual/vhosts/name-based.xml.ko
+++ b/docs/manual/vhosts/name-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: 420990:1301398 (outdated) -->
+<!-- English Revision: 420990:1330878 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/vhosts/name-based.xml.meta b/docs/manual/vhosts/name-based.xml.meta
index 02dd49e4b0..fdb7b6bac8 100644
--- a/docs/manual/vhosts/name-based.xml.meta
+++ b/docs/manual/vhosts/name-based.xml.meta
@@ -9,9 +9,9 @@
<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>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
diff --git a/docs/manual/vhosts/name-based.xml.tr b/docs/manual/vhosts/name-based.xml.tr
index 0c3cc3840a..62c3bc3c3b 100644
--- a/docs/manual/vhosts/name-based.xml.tr
+++ b/docs/manual/vhosts/name-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: 1301398 -->
+<!-- English Revision: 1301398:1330878 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>