diff options
| author | Rich Bowen <rbowen@apache.org> | 2012-04-26 16:57:35 +0200 |
|---|---|---|
| committer | Rich Bowen <rbowen@apache.org> | 2012-04-26 16:57:35 +0200 |
| commit | 2e5d9d52e1b8e219329c84eea0313d14b7fd5a5c (patch) | |
| tree | 6b77c732b713094f1d1c3dc7929fcec938777891 /docs/manual | |
| parent | Syntax for files in / (diff) | |
| download | apache2-2e5d9d52e1b8e219329c84eea0313d14b7fd5a5c.tar.xz apache2-2e5d9d52e1b8e219329c84eea0313d14b7fd5a5c.zip | |
Rebuild Humbedooh's changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330892 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
137 files changed, 991 insertions, 931 deletions
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 281f1399da..7999aec41a 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -68,25 +68,28 @@ <p>For example, to make the server accept connections on both port 80 and port 8000, on all interfaces, use:</p> - <div class="example"><p><code> - Listen 80<br /> - Listen 8000 - </code></p></div> + <pre class="prettyprint lang-config"> +Listen 80 +Listen 8000 + </pre> + <p>To make the server accept connections on port 80 for one interface, and port 8000 on another, use</p> - <div class="example"><p><code> - Listen 192.0.2.1:80<br /> - Listen 192.0.2.5:8000 - </code></p></div> + <pre class="prettyprint lang-config"> +Listen 192.0.2.1:80 +Listen 192.0.2.5:8000 + </pre> + <p>IPv6 addresses must be enclosed in square brackets, as in the following example:</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> Listen [2001:db8::a00:20ff:fea7:ccea]:80 - </code></p></div> + </pre> + <div class="warning"><p>Overlapping <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directives will result in a fatal error which will prevent the server from starting up.</p> @@ -131,10 +134,11 @@ <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directives, as in the following examples:</p> - <div class="example"><p><code> - Listen 0.0.0.0:80<br /> - Listen 192.0.2.1:80 - </code></p></div> + <pre class="prettyprint lang-config"> +Listen 0.0.0.0:80 +Listen 192.0.2.1:80 + </pre> + <p>If your platform supports it and you want httpd to handle IPv4 and IPv6 connections on separate sockets (i.e., to disable IPv4-mapped @@ -156,9 +160,10 @@ <p>You only need to set the protocol if you are running on non-standard ports. For example, running an <code>https</code> site on port 8443:</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> Listen 192.170.2.1:8443 https - </code></p></div> + </pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> <h2><a name="virtualhost" id="virtualhost">How This Works With Virtual Hosts</a></h2> diff --git a/docs/manual/bind.html.fr b/docs/manual/bind.html.fr index 86bf0e79d0..b48b646a07 100644 --- a/docs/manual/bind.html.fr +++ b/docs/manual/bind.html.fr @@ -28,6 +28,8 @@ <a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Configuration du serveur HTTP Apache pour l'coute sur un port et une adresse IP spcifiques.</p> diff --git a/docs/manual/bind.html.tr.utf8 b/docs/manual/bind.html.tr.utf8 index 0eb91ac593..961e0b37be 100644 --- a/docs/manual/bind.html.tr.utf8 +++ b/docs/manual/bind.html.tr.utf8 @@ -28,6 +28,7 @@ <a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/bind.html" title="Türkçe"> tr </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>Apache HTTPD sunucusunun belli adresleri ve portları dinlemek üzere yapılandırılması.</p> diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de index 4eef8998d6..f4b34a7faa 100644 --- a/docs/manual/bind.xml.de +++ b/docs/manual/bind.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.en.xsl"?> -<!-- English Revision: 420990:1301743 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/bind.xml.fr b/docs/manual/bind.xml.fr index 8a0c7eb1c5..747e1eb0b5 100644 --- a/docs/manual/bind.xml.fr +++ b/docs/manual/bind.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision : 1301743 --> +<!-- English Revision: 1301743:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja index 915b4b8dd0..2b4ddfa5fe 100644 --- a/docs/manual/bind.xml.ja +++ b/docs/manual/bind.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: 587444:1301743 (outdated) --> +<!-- English Revision: 587444:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko index da79ab1718..c74dc61bb3 100644 --- a/docs/manual/bind.xml.ko +++ b/docs/manual/bind.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:1301743 (outdated) --> +<!-- English Revision: 105989:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/bind.xml.meta b/docs/manual/bind.xml.meta index 5a7606ce3f..0c60df764c 100644 --- a/docs/manual/bind.xml.meta +++ b/docs/manual/bind.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/bind.xml.tr b/docs/manual/bind.xml.tr index a8c3398e60..56892874ae 100644 --- a/docs/manual/bind.xml.tr +++ b/docs/manual/bind.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: 1301743 --> +<!-- English Revision: 1301743:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en index 1902df4483..154912dec2 100644 --- a/docs/manual/caching.html.en +++ b/docs/manual/caching.html.en @@ -421,12 +421,13 @@ Vary: negotiate,accept-language,accept-charset <p>Typically the module will be configured as so;</p> - <div class="example"><p><code> -CacheRoot /var/cache/apache/<br /> -CacheEnable disk /<br /> -CacheDirLevels 2<br /> + <pre class="prettyprint lang-config"> +CacheRoot "/var/cache/apache/" +CacheEnable disk / +CacheDirLevels 2 CacheDirLength 1 - </code></p></div> + </pre> + <p>Importantly, as the cached files are locally stored, operating system in-memory caching will typically be applied to their access also. So diff --git a/docs/manual/caching.html.fr b/docs/manual/caching.html.fr index eb10718103..7a0fd925cb 100644 --- a/docs/manual/caching.html.fr +++ b/docs/manual/caching.html.fr @@ -25,6 +25,8 @@ <a href="./fr/caching.html" title="Franais"> fr </a> | <a href="./tr/caching.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Ce document complte la documentation de rfrence des modules <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, diff --git a/docs/manual/caching.html.tr.utf8 b/docs/manual/caching.html.tr.utf8 index 60941c4b3e..75a7305a4c 100644 --- a/docs/manual/caching.html.tr.utf8 +++ b/docs/manual/caching.html.tr.utf8 @@ -25,6 +25,7 @@ <a href="./fr/caching.html" hreflang="fr" rel="alternate" title="Français"> fr </a> | <a href="./tr/caching.html" title="Türkçe"> tr </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 belge <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>, <code class="module"><a href="./mod/mod_cache_disk.html">mod_cache_disk</a></code>, <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> diff --git a/docs/manual/caching.xml.fr b/docs/manual/caching.xml.fr index 9538063f30..28a7a0b2f1 100644 --- a/docs/manual/caching.xml.fr +++ b/docs/manual/caching.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision : 1291840 --> +<!-- English Revision: 1291840:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/caching.xml.meta b/docs/manual/caching.xml.meta index c6ba0165a9..041ab16f95 100644 --- a/docs/manual/caching.xml.meta +++ b/docs/manual/caching.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> - <variant>tr</variant> + <variant outdated="yes">fr</variant> + <variant outdated="yes">tr</variant> </variants> </metafile> diff --git a/docs/manual/caching.xml.tr b/docs/manual/caching.xml.tr index d7791b484c..ae093fe248 100644 --- a/docs/manual/caching.xml.tr +++ b/docs/manual/caching.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: 1291840 --> +<!-- English Revision: 1291840:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en index e9e2024bed..8e122bbf74 100644 --- a/docs/manual/custom-error.html.en +++ b/docs/manual/custom-error.html.en @@ -64,19 +64,21 @@ if <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> is set to FileInfo.</p> - <div class="example"><p><code> - ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br /> - ErrorDocument 500 /cgi-bin/crash-recover<br /> - ErrorDocument 500 http://error.example.com/server_error.html<br /> - ErrorDocument 404 /errors/not_found.html <br /> - ErrorDocument 401 /subscription/how_to_subscribe.html - </code></p></div> + <pre class="prettyprint lang-config"> +ErrorDocument 500 "Sorry, our script crashed. Oh dear"<br /> +ErrorDocument 500 /cgi-bin/crash-recover<br /> +ErrorDocument 500 http://error.example.com/server_error.html<br /> +ErrorDocument 404 /errors/not_found.html <br /> +ErrorDocument 401 /subscription/how_to_subscribe.html + </pre> + <p>The syntax of the <code>ErrorDocument</code> directive is:</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> ErrorDocument <3-digit-code> <action> - </code></p></div> + </pre> + <p>where the action will be treated as:</p> diff --git a/docs/manual/custom-error.html.fr b/docs/manual/custom-error.html.fr index 3aa011bdfb..837c47edc0 100644 --- a/docs/manual/custom-error.html.fr +++ b/docs/manual/custom-error.html.fr @@ -28,6 +28,8 @@ <a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/custom-error.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Le serveur HTTP Apache fournit des messages d'erreur gnriques pour les codes de statut 4xx ou 5xx ; ces messages sont cependant diff --git a/docs/manual/custom-error.xml.es b/docs/manual/custom-error.xml.es index 4accfe7d59..364ef7a72f 100644 --- a/docs/manual/custom-error.xml.es +++ b/docs/manual/custom-error.xml.es @@ -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.es.xsl"?> -<!-- English Revision: 420990:1328589 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.fr b/docs/manual/custom-error.xml.fr index 2e53a5dcf9..c57f9b9acd 100644 --- a/docs/manual/custom-error.xml.fr +++ b/docs/manual/custom-error.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 : 1328589 --> +<!-- English Revision: 1328589:1330883 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/custom-error.xml.ja b/docs/manual/custom-error.xml.ja index cd28ce8eb6..ffefc68cc4 100644 --- a/docs/manual/custom-error.xml.ja +++ b/docs/manual/custom-error.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: 558686:1328589 (outdated) --> +<!-- English Revision: 558686:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.ko b/docs/manual/custom-error.xml.ko index a5a2b81cea..f7addca030 100644 --- a/docs/manual/custom-error.xml.ko +++ b/docs/manual/custom-error.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:1328589 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/custom-error.xml.meta b/docs/manual/custom-error.xml.meta index 38c922cb47..5900a59241 100644 --- a/docs/manual/custom-error.xml.meta +++ b/docs/manual/custom-error.xml.meta @@ -9,7 +9,7 @@ <variants> <variant>en</variant> <variant outdated="yes">es</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/custom-error.xml.tr b/docs/manual/custom-error.xml.tr index d37bc366b8..43e1dc0e99 100644 --- a/docs/manual/custom-error.xml.tr +++ b/docs/manual/custom-error.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: 1187986:1328589 (outdated) --> +<!-- English Revision: 1187986:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en index 95d0f9b1bf..6317fb0d9f 100644 --- a/docs/manual/env.html.en +++ b/docs/manual/env.html.en @@ -408,14 +408,15 @@ </a></code> and <code class="module"><a href="./mod/mod_header.html">mod_header</a></code> allows you to still accept these headers:</p> -<div class="example"><p><code> -# <br /> -# The following works around a client sending a broken Accept_Encoding<br /> -# header.<br /> -#<br /> -SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1<br /> +<pre class="prettyprint lang-config"> +# +# The following works around a client sending a broken Accept_Encoding +# header. +# +SetEnvIfNoCase ^Accept.Encoding$ ^(.*)$ fix_accept_encoding=$1 RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encoding -</code></p></div> +</pre> + @@ -426,27 +427,28 @@ RequestHeader set Accept-Encoding %{fix_accept_encoding}e env=fix_accept_encodin httpd.conf to deal with known client problems. Since the affected clients are no longer seen in the wild, this configuration is likely no-longer necessary.</p> -<div class="example"><p><code> -#<br /> -# The following directives modify normal HTTP response behavior.<br /> -# The first directive disables keepalive for Netscape 2.x and browsers that<br /> -# spoof it. There are known problems with these browser implementations.<br /> -# The second directive is for Microsoft Internet Explorer 4.0b2<br /> -# which has a broken HTTP/1.1 implementation and does not properly<br /> -# support keepalive when it is used on 301 or 302 (redirect) responses.<br /> -#<br /> -BrowserMatch "Mozilla/2" nokeepalive<br /> -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0<br /> -<br /> -#<br /> -# The following directive disables HTTP/1.1 responses to browsers which<br /> -# are in violation of the HTTP/1.0 spec by not being able to understand a<br /> -# basic 1.1 response.<br /> -#<br /> -BrowserMatch "RealPlayer 4\.0" force-response-1.0<br /> -BrowserMatch "Java/1\.0" force-response-1.0<br /> +<pre class="prettyprint lang-config"> +# +# The following directives modify normal HTTP response behavior. +# The first directive disables keepalive for Netscape 2.x and browsers that +# spoof it. There are known problems with these browser implementations. +# The second directive is for Microsoft Internet Explorer 4.0b2 +# which has a broken HTTP/1.1 implementation and does not properly +# support keepalive when it is used on 301 or 302 (redirect) responses. +# +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 + +# +# The following directive disables HTTP/1.1 responses to browsers which +# are in violation of the HTTP/1.0 spec by not being able to understand a +# basic 1.1 response. +# +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 -</code></p></div> +</pre> + <h3><a name="no-img-log" id="no-img-log">Do not log requests for images in the access log</a></h3> @@ -457,12 +459,13 @@ BrowserMatch "JDK/1\.0" force-response-1.0 particular directories, or to prevent logging of requests coming from particular hosts.</p> - <div class="example"><p><code> - SetEnvIf Request_URI \.gif image-request<br /> - SetEnvIf Request_URI \.jpg image-request<br /> - SetEnvIf Request_URI \.png image-request<br /> - CustomLog logs/access_log common env=!image-request - </code></p></div> + <pre class="prettyprint lang-config"> +SetEnvIf Request_URI \.gif image-request +SetEnvIf Request_URI \.jpg image-request +SetEnvIf Request_URI \.png image-request +CustomLog logs/access_log common env=!image-request + </pre> + <h3><a name="image-theft" id="image-theft">Prevent "Image Theft"</a></h3> @@ -474,18 +477,17 @@ BrowserMatch "JDK/1\.0" force-response-1.0 in limited circumstances. We assume that all your images are in a directory called <code>/web/images</code>.</p> - <div class="example"><p><code> - SetEnvIf Referer "^http://www\.example\.com/" local_referal<br /> - # Allow browsers that do not send Referer info<br /> - SetEnvIf Referer "^$" local_referal<br /> - <Directory /web/images><br /> - <span class="indent"> - Order Deny,Allow<br /> - Deny from all<br /> - Allow from env=local_referal - </span> - </Directory> - </code></p></div> + <pre class="prettyprint lang-config"> +SetEnvIf Referer "^http://www\.example\.com/" local_referal +# Allow browsers that do not send Referer info +SetEnvIf Referer "^$" local_referal +<Directory /web/images> + Order Deny,Allow + Deny from all + Allow from env=local_referal +</Directory> + </pre> + <p>For more information about this technique, see the "<a href="http://www.serverwatch.com/tutorials/article.php/1132731">Keeping Your Images from Adorning Other Sites</a>" diff --git a/docs/manual/env.html.fr b/docs/manual/env.html.fr index 8b498a12b2..dfa4a0b2db 100644 --- a/docs/manual/env.html.fr +++ b/docs/manual/env.html.fr @@ -27,6 +27,8 @@ <a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/env.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Deux types de variables d'environnement affectent le serveur HTTP Apache.</p> diff --git a/docs/manual/env.html.tr.utf8 b/docs/manual/env.html.tr.utf8 index 5955ee89ce..85aebc3d7e 100644 --- a/docs/manual/env.html.tr.utf8 +++ b/docs/manual/env.html.tr.utf8 @@ -27,6 +27,7 @@ <a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/env.html" title="Türkçe"> tr </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>Apache HTTP Sunucusunu etkileyen ortam değişkenleri iki çeşittir.</p> diff --git a/docs/manual/env.xml.fr b/docs/manual/env.xml.fr index 4db34f672a..57a35b86f3 100644 --- a/docs/manual/env.xml.fr +++ b/docs/manual/env.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 : 1300910 --> +<!-- English Revision: 1300910:1330883 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja index 7f055439e6..b47a605432 100644 --- a/docs/manual/env.xml.ja +++ b/docs/manual/env.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:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko index d0c8d1088c..d267178750 100644 --- a/docs/manual/env.xml.ko +++ b/docs/manual/env.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:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/env.xml.meta b/docs/manual/env.xml.meta index e440af2d6c..67070dc314 100644 --- a/docs/manual/env.xml.meta +++ b/docs/manual/env.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/env.xml.tr b/docs/manual/env.xml.tr index 2a1aa93d63..f3b812ad17 100644 --- a/docs/manual/env.xml.tr +++ b/docs/manual/env.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:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en index 117e2f7ab5..916d3fecb4 100644 --- a/docs/manual/handler.html.en +++ b/docs/manual/handler.html.en @@ -97,10 +97,11 @@ the <code>html</code> extension to trigger the launch of the <code>footer.pl</code> CGI script.</p> - <div class="example"><p><code> - Action add-footer /cgi-bin/footer.pl<br /> - AddHandler add-footer .html - </code></p></div> + <pre class="prettyprint lang-config"> +Action add-footer /cgi-bin/footer.pl +AddHandler add-footer .html + </pre> + <p>Then the CGI script is responsible for sending the originally requested document (pointed to by the @@ -118,11 +119,12 @@ the <code>send-as-is</code> handler, regardless of their filename extensions.</p> - <div class="example"><p><code> - <Directory /web/htdocs/asis><br /> - <span class="indent">SetHandler send-as-is<br /></span> - </Directory> - </code></p></div> + <pre class="prettyprint lang-config"> +<Directory /web/htdocs/asis> + SetHandler send-as-is +</Directory> + </pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> @@ -135,9 +137,10 @@ you may wish to make use of. Specifically, a new record has been added to the <code>request_rec</code> structure:</p> - <div class="example"><p><code> + <pre class="prettyprint lang-c"> char *handler - </code></p></div> + </pre> + <p>If you wish to have your module engage a handler, you need only to set <code>r->handler</code> to the name of the diff --git a/docs/manual/handler.html.fr b/docs/manual/handler.html.fr index dd05575698..9a422a1832 100644 --- a/docs/manual/handler.html.fr +++ b/docs/manual/handler.html.fr @@ -29,6 +29,8 @@ <a href="./tr/handler.html" hreflang="tr" rel="alternate" title="Trke"> tr </a> | <a href="./zh-cn/handler.html" hreflang="zh-cn" rel="alternate" title="Simplified Chinese"> zh-cn </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Ce document dcrit l'utilisation des gestionnaires d'Apache (handlers).</p> </div> diff --git a/docs/manual/handler.xml.es b/docs/manual/handler.xml.es index e6b843f5b5..c41459383a 100644 --- a/docs/manual/handler.xml.es +++ b/docs/manual/handler.xml.es @@ -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.es.xsl"?> -<!-- English Revision: 151408:1328350 (outdated) --> +<!-- English Revision: 151408:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/handler.xml.fr b/docs/manual/handler.xml.fr index 2d13ddfb4b..394293d213 100644 --- a/docs/manual/handler.xml.fr +++ b/docs/manual/handler.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1328350 --> +<!-- English Revision: 1328350:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/handler.xml.ja b/docs/manual/handler.xml.ja index 80c0d9958e..876f9e878a 100644 --- a/docs/manual/handler.xml.ja +++ b/docs/manual/handler.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:1328350 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/handler.xml.ko b/docs/manual/handler.xml.ko index d67768d608..e88e126a99 100644 --- a/docs/manual/handler.xml.ko +++ b/docs/manual/handler.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:1328350 (outdated) --> +<!-- English Revision: 151408:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/handler.xml.meta b/docs/manual/handler.xml.meta index 8bb7830e1a..275bdba5dd 100644 --- a/docs/manual/handler.xml.meta +++ b/docs/manual/handler.xml.meta @@ -9,7 +9,7 @@ <variants> <variant>en</variant> <variant outdated="yes">es</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/handler.xml.tr b/docs/manual/handler.xml.tr index 11ca1ca53e..ed8ccfce05 100644 --- a/docs/manual/handler.xml.tr +++ b/docs/manual/handler.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:1328350 (outdated) --> +<!-- English Revision: 1174747:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/handler.xml.zh-cn b/docs/manual/handler.xml.zh-cn index 98b257a074..8c03bc903e 100644 --- a/docs/manual/handler.xml.zh-cn +++ b/docs/manual/handler.xml.zh-cn @@ -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: 420990:1328350 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index 7a805d77ac..509ac716f4 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -164,9 +164,10 @@ <p>Do this by specifying the name of the module in your <code class="directive">LogLevel</code> directive:</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> LogLevel info rewrite:trace5 - </code></p></div> + </pre> + <p>This sets the main <code class="directive">LogLevel</code> to info, but turns it up to <code>trace5</code> for @@ -218,10 +219,11 @@ <p>A typical configuration for the access log might look as follows.</p> - <div class="example"><p><code> - LogFormat "%h %l %u %t \"%r\" %>s %b" common<br /> - CustomLog logs/access_log common - </code></p></div> + <pre class="prettyprint lang-config"> +LogFormat "%h %l %u %t \"%r\" %>s %b" common +CustomLog logs/access_log common + </pre> + <p>This defines the <em>nickname</em> <code>common</code> and associates it with a particular log format string. The format @@ -360,11 +362,11 @@ <p>Another commonly used format string is called the Combined Log Format. It can be used as follows.</p> - <div class="example"><p><code> - LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" - \"%{User-agent}i\"" combined<br /> - CustomLog log/access_log combined - </code></p></div> + <pre class="prettyprint lang-config"> +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined +CustomLog log/access_log combined + </pre> + <p>This format is exactly the same as the Common Log Format, with the addition of two more fields. Each of the additional @@ -412,12 +414,13 @@ information. The last two <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> lines show how to mimic the effects of the <code>ReferLog</code> and <code>AgentLog</code> directives.</p> - <div class="example"><p><code> - LogFormat "%h %l %u %t \"%r\" %>s %b" common<br /> - CustomLog logs/access_log common<br /> - CustomLog logs/referer_log "%{Referer}i -> %U"<br /> - CustomLog logs/agent_log "%{User-agent}i" - </code></p></div> + <pre class="prettyprint lang-config"> +LogFormat "%h %l %u %t \"%r\" %>s %b" common +CustomLog logs/access_log common +CustomLog logs/referer_log "%{Referer}i -> %U" +CustomLog logs/agent_log "%{User-agent}i" + </pre> + <p>This example also shows that it is not necessary to define a nickname with the <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> directive. Instead, @@ -437,34 +440,37 @@ include or exclude requests where the environment variable is set. Some examples:</p> - <div class="example"><p><code> - # Mark requests from the loop-back interface<br /> - SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog<br /> - # Mark requests for the robots.txt file<br /> - SetEnvIf Request_URI "^/robots\.txt$" dontlog<br /> - # Log what remains<br /> - CustomLog logs/access_log common env=!dontlog - </code></p></div> + <pre class="prettyprint lang-config"> +# Mark requests from the loop-back interface +SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog +# Mark requests for the robots.txt file +SetEnvIf Request_URI "^/robots\.txt$" dontlog +# Log what remains +CustomLog logs/access_log common env=!dontlog + </pre> + <p>As another example, consider logging requests from english-speakers to one log file, and non-english speakers to a different log file.</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> SetEnvIf Accept-Language "en" english<br /> CustomLog logs/english_log common env=english<br /> CustomLog logs/non_english_log common env=!english - </code></p></div> + </pre> + <p>In a caching scenario one would want to know about the efficiency of the cache. A very simple method to find this out would be:</p> - <div class="example"><p><code> - SetEnv CACHE_MISS 1<br /> - LogFormat "%h %l %u %t "%r " %>s %b %{CACHE_MISS}e" common-cache<br /> - CustomLog logs/access_log common-cache - </code></p></div> + <pre class="prettyprint lang-config"> +SetEnv CACHE_MISS 1 +LogFormat "%h %l %u %t "%r " %>s %b %{CACHE_MISS}e" common-cache +CustomLog logs/access_log common-cache + </pre> + <p><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> will run before <code class="module"><a href="./mod/mod_env.html">mod_env</a></code> and when successfull will deliver the @@ -474,10 +480,11 @@ <p>In addition to the <code>env=</code> syntax, <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> supports logging values conditional upon the HTTP response code:</p> - <div class="example"><p><code> - LogFormat "%400,501{User-agent}i" browserlog<br /> - LogFormat "%!200,304,302{Referer}i" refererlog - </code></p></div> + <pre class="prettyprint lang-config"> +LogFormat "%400,501{User-agent}i" browserlog +LogFormat "%!200,304,302{Referer}i" refererlog + </pre> + <p>In the first example, the <code>User-agent</code> will be logged if the HTTP status code is 400 or 501. In other cases, a @@ -556,10 +563,10 @@ for this purpose. For example, to rotate the logs every 24 hours, you can use:</p> - <div class="example"><p><code> - CustomLog "|/usr/local/apache/bin/rotatelogs - /var/log/access_log 86400" common - </code></p></div> + <pre class="prettyprint lang-config"> + CustomLog "|/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common + </pre> + <p>Notice that quotes are used to enclose the entire command that will be called for the pipe. Although these examples are @@ -578,11 +585,11 @@ a shell. Use "<code>|$</code>" instead of "<code>|</code>" to spawn using a shell (usually with <code>/bin/sh -c</code>):</p> - <div class="example"><p><code> - # Invoke "rotatelogs" using a shell<br /> - CustomLog "|$/usr/local/apache/bin/rotatelogs - /var/log/access_log 86400" common - </code></p></div> + <pre class="prettyprint lang-config"> +# Invoke "rotatelogs" using a shell +CustomLog "|$/usr/local/apache/bin/rotatelogs /var/log/access_log 86400" common + </pre> + <p>This was the default behaviour for Apache 2.2. Depending on the shell specifics this might lead to @@ -625,11 +632,11 @@ later split the log into individual files. For example, consider the following directives.</p> - <div class="example"><p><code> - LogFormat "%v %l %u %t \"%r\" %>s %b" - comonvhost<br /> - CustomLog logs/access_log comonvhost - </code></p></div> + <pre class="prettyprint lang-config"> +LogFormat "%v %l %u %t \"%r\" %>s %b" comonvhost +CustomLog logs/access_log comonvhost + </pre> + <p>The <code>%v</code> is used to log the name of the virtual host that is serving the request. Then a program like <a href="programs/other.html">split-logfile</a> can be used to diff --git a/docs/manual/logs.html.fr b/docs/manual/logs.html.fr index 59290d12c1..85e3369833 100644 --- a/docs/manual/logs.html.fr +++ b/docs/manual/logs.html.fr @@ -27,6 +27,8 @@ <a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/logs.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Pour vritablement grer un serveur web, il est ncessaire de disposer d'un diff --git a/docs/manual/logs.html.tr.utf8 b/docs/manual/logs.html.tr.utf8 index 636ba2e354..8c7dd7009b 100644 --- a/docs/manual/logs.html.tr.utf8 +++ b/docs/manual/logs.html.tr.utf8 @@ -27,6 +27,7 @@ <a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/logs.html" title="Türkçe"> tr </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>Bir HTTP sunucusunu verimli şekilde yönetebilmek için oluşabilecek sorunlardan başka sunucunun başarımı ve etkinliği hakkında da bazı geri diff --git a/docs/manual/logs.xml.fr b/docs/manual/logs.xml.fr index 72eaad47a9..9ac933fc07 100644 --- a/docs/manual/logs.xml.fr +++ b/docs/manual/logs.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision : 1300924 --> +<!-- English Revision: 1300924:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.ja b/docs/manual/logs.xml.ja index 6533e45f96..1286d85a96 100644 --- a/docs/manual/logs.xml.ja +++ b/docs/manual/logs.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:1300924 (outdated) --> +<!-- English Revision: 659902:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.ko b/docs/manual/logs.xml.ko index 0203a84196..d452e36a56 100644 --- a/docs/manual/logs.xml.ko +++ b/docs/manual/logs.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:1300924 (outdated) --> +<!-- English Revision: 105989:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/logs.xml.meta b/docs/manual/logs.xml.meta index 3cc7f8a546..9005f4528b 100644 --- a/docs/manual/logs.xml.meta +++ b/docs/manual/logs.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/logs.xml.tr b/docs/manual/logs.xml.tr index 8a53447f86..23f45f36e7 100644 --- a/docs/manual/logs.xml.tr +++ b/docs/manual/logs.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: 1300924 --> +<!-- English Revision: 1300924:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en index 1a5ec0a057..d823e2895b 100644 --- a/docs/manual/misc/security_tips.html.en +++ b/docs/manual/misc/security_tips.html.en @@ -335,9 +335,9 @@ <p>In the server configuration file, put</p> <pre class="prettyprint lang-config"> - <Directory /> - AllowOverride None - </Directory> +<Directory /> + AllowOverride None +</Directory> </pre> @@ -367,10 +367,10 @@ configuration:</p> <pre class="prettyprint lang-config"> - <Directory /> - Order Deny,Allow - Deny from all - </Directory> +<Directory /> + Order Deny,Allow + Deny from all +</Directory> </pre> @@ -379,14 +379,14 @@ allow access only in those areas you wish. For example,</p> <pre class="prettyprint lang-config"> - <Directory /usr/users/*/public_html> - Order Deny,Allow - Allow from all - </Directory> - <Directory /usr/local/httpd> - Order Deny,Allow - Allow from all - </Directory> +<Directory /usr/users/*/public_html> + Order Deny,Allow + Allow from all +</Directory> +<Directory /usr/local/httpd> + Order Deny,Allow + Allow from all +</Directory> </pre> @@ -445,10 +445,10 @@ file:</p> <pre class="prettyprint lang-config"> - <Files ".ht*"> - Order allow,deny - Deny from all - </Files> +<Files ".ht*"> + Order allow,deny + Deny from all +</Files> </pre> diff --git a/docs/manual/misc/security_tips.xml.fr b/docs/manual/misc/security_tips.xml.fr index ac514e0161..466340ad9a 100644 --- a/docs/manual/misc/security_tips.xml.fr +++ b/docs/manual/misc/security_tips.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: 1300924:1330291 (outdated) --> +<!-- English Revision: 1300924:1330882 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/misc/security_tips.xml.ko b/docs/manual/misc/security_tips.xml.ko index 94d8c0135f..68b5680216 100644 --- a/docs/manual/misc/security_tips.xml.ko +++ b/docs/manual/misc/security_tips.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:1330291 (outdated) --> +<!-- English Revision: 105989:1330882 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/misc/security_tips.xml.tr b/docs/manual/misc/security_tips.xml.tr index 1c2623f515..97c86fa99a 100644 --- a/docs/manual/misc/security_tips.xml.tr +++ b/docs/manual/misc/security_tips.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: 1300924:1330291 (outdated) --> +<!-- English Revision: 1300924:1330882 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 2ff08c05b6..160f3b697f 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -2689,7 +2689,7 @@ On Windows from Apache 2.3.3 and later.</td></tr> noch nicht bersetzt. Bitte schauen Sie in die englische Version.</p><h3>Siehe auch</h3> <ul> -<li><code class="directive">AcceptFilter</code></li> +<li><code class="directive"><a href="#acceptfilter">AcceptFilter</a></code></li> <li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li> </ul> </div> diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index b307511be2..eb70d5585b 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -207,7 +207,7 @@ AcceptFilter https data <h3>See also</h3> <ul> -<li><code class="directive">Protocol</code></li> +<li><code class="directive"><a href="#protocol">Protocol</a></code></li> </ul> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> @@ -3486,7 +3486,7 @@ On Windows from Apache 2.3.3 and later.</td></tr> <h3>See also</h3> <ul> -<li><code class="directive">AcceptFilter</code></li> +<li><code class="directive"><a href="#acceptfilter">AcceptFilter</a></code></li> <li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li> </ul> </div> @@ -3963,7 +3963,7 @@ header</td></tr> <dl> <dt><code>ServerTokens Full</code> (or not specified)</dt> - <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/2.4.1 + <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/2.4.2 (Unix) PHP/4.2.2 MyMod/1.2</code></dd> <dt><code>ServerTokens Prod[uctOnly]</code></dt> @@ -3984,11 +3984,11 @@ header</td></tr> <dt><code>ServerTokens Min[imal]</code></dt> <dd>Server sends (<em>e.g.</em>): <code>Server: - Apache/2.4.1</code></dd> + Apache/2.4.2</code></dd> <dt><code>ServerTokens OS</code></dt> - <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/2.4.1 + <dd>Server sends (<em>e.g.</em>): <code>Server: Apache/2.4.2 (Unix)</code></dd> </dl> diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index f2f767c5a8..5136f27b9a 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -2631,7 +2631,7 @@ On Windows from Apache 2.3.3 and later.</td></tr> まだ翻訳されていません。英語版をご覧ください。 </p><h3>参照</h3> <ul> -<li><code class="directive">AcceptFilter</code></li> +<li><code class="directive"><a href="#acceptfilter">AcceptFilter</a></code></li> <li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li> </ul> </div> diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 27d86de671..ec33a248ef 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?> -<!-- English Revision: 344972:1330664 (outdated) --> +<!-- English Revision: 344972:1330850 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es index e03f411295..96ff6b7823 100644 --- a/docs/manual/mod/core.xml.es +++ b/docs/manual/mod/core.xml.es @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?> -<!-- English Revision: 1040494:1330664 (outdated) --> +<!-- English Revision: 1040494:1330850 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr index 634bed39ff..b93d781547 100644 --- a/docs/manual/mod/core.xml.fr +++ b/docs/manual/mod/core.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1302855:1330664 (outdated) --> +<!-- English Revision: 1302855:1330850 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index a328999e3d..e3f480f25c 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 669847:1330664 (outdated) --> +<!-- English Revision: 669847:1330850 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr index dfcc33a0b1..fb51eda65a 100644 --- a/docs/manual/mod/core.xml.tr +++ b/docs/manual/mod/core.xml.tr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?> -<!-- English Revision: 1302855:1330664 (outdated) --> +<!-- English Revision: 1302855:1330850 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en index e1f9b21160..9dfd98642c 100644 --- a/docs/manual/platform/windows.html.en +++ b/docs/manual/platform/windows.html.en @@ -293,12 +293,13 @@ how it is accessed. If you wish to assure that only lowercase is used in URLs, you can use something like:</p> - <div class="example"><p><code> - RewriteEngine On<br /> - RewriteMap lowercase int:tolower<br /> - RewriteCond %{REQUEST_URI} [A-Z]<br /> - RewriteRule (.*) ${lowercase:$1} [R,L] - </code></p></div></li> + <pre class="prettyprint lang-config"> +RewriteEngine On +RewriteMap lowercase int:tolower +RewriteCond %{REQUEST_URI} [A-Z] +RewriteRule (.*) ${lowercase:$1} [R,L] + </pre> +</li> <li><p>When running, Apache needs write access only to the logs directory and any configured cache directory tree. Due to the @@ -319,9 +320,10 @@ module, use the following (in addition to the status-activating directives in <code>access.conf</code>):</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> LoadModule status_module modules/mod_status.so - </code></p></div> + </pre> + <p>Information on <a href="../mod/mod_so.html#creating">creating loadable modules</a> is also available.</p></li> @@ -790,19 +792,28 @@ on mapped drive letters, but this is not recommended.)</p> <div class="example"><h3>Example DocumentRoot with UNC path</h3><p><code> + <pre class="prettyprint lang-config"> DocumentRoot //dochost/www/html/ + </pre> + </code></p></div> <div class="example"><h3>Example DocumentRoot with IP address in UNC path</h3><p><code> - DocumentRoot //192.168.1.50/docs/<br /> + <pre class="prettyprint lang-config"> + DocumentRoot //192.168.1.50/docs/ + </pre> + </code></p></div> <div class="example"><h3>Example Alias and corresponding Directory with UNC path</h3><p><code> - Alias /images/ //imagehost/www/images/<br /> - <br /> - <Directory //imagehost/www/images/><br /> - ...<br /> - <Directory><br /> + <pre class="prettyprint lang-config"> +Alias /images/ //imagehost/www/images/ + +<Directory //imagehost/www/images/> +#... +<Directory> + </pre> + </code></p></div> <p>When running Apache httpd as a service, you must create a diff --git a/docs/manual/platform/windows.xml.ko b/docs/manual/platform/windows.xml.ko index 5053c049c6..5dfe1b693a 100644 --- a/docs/manual/platform/windows.xml.ko +++ b/docs/manual/platform/windows.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:1200984 (outdated) --> +<!-- English Revision: 105989:1330882 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en index c32ba0c9d3..5ca3518cca 100644 --- a/docs/manual/rewrite/remapping.html.en +++ b/docs/manual/rewrite/remapping.html.en @@ -148,18 +148,18 @@ RewriteRule ^<strong>/foo</strong>\.html$ <strong>bar</strong>.html [<stron to the new server, but you might also consider using the Redirect or RedirectMatch directive.</p> -<pre class="prettyprint lang-config"><strong>#With mod_rewrite</strong> +<pre class="prettyprint lang-config">#With mod_rewrite RewriteEngine on RewriteRule ^/docs/(.+) http://new.example.com/docs/$1 [R,L] </pre> -<pre class="prettyprint lang-config"><strong>#With RedirectMatch</strong> +<pre class="prettyprint lang-config">#With RedirectMatch RedirectMatch ^/docs/(.*) http://new.example.com/docs/$1 </pre> -<pre class="prettyprint lang-config"><strong>#With Redirect</strong> +<pre class="prettyprint lang-config">#With Redirect Redirect /docs/ http://new.example.com/docs/ </pre> diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index b4060ca05f..b97298e03f 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -62,11 +62,12 @@ with the following configuration, all requests will be redirected to another site only if the server is started using <code>httpd -DClosedForNow</code>:</p> -<div class="example"><p><code> -<IfDefine ClosedForNow><br /> -Redirect / http://otherserver.example.com/<br /> +<pre class="prettyprint lang-config"> +<IfDefine ClosedForNow> + Redirect / http://otherserver.example.com/ </IfDefine> -</code></p></div> +</pre> + <p>The <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code> directive is very similar, except it encloses directives that will @@ -82,11 +83,12 @@ about missing modules.</p> <p>In the following example, the <code class="directive"><a href="./mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code> directive will be applied only if <code class="module"><a href="./mod/mod_mime_magic.html">mod_mime_magic</a></code> is available.</p> -<div class="example"><p><code> -<IfModule mod_mime_magic.c><br /> -MimeMagicFile conf/magic<br /> +<pre class="prettyprint lang-config"> +<IfModule mod_mime_magic.c> + MimeMagicFile conf/magic </IfModule> -</code></p></div> +</pre> + <p>The <code class="directive"><a href="./mod/mod_version.html#ifversion"><IfVersion></a></code> directive is very similar to <code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code> and <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code>, except it encloses directives that will @@ -94,14 +96,13 @@ only be applied if a particular version of the server is executing. This module is designed for the use in test suites and large networks which have to deal with different httpd versions and different configurations.</p> -<div class="example"><p><code> - <IfVersion >= 2.1><br /> - <span class="indent"> - # this happens only in versions greater or<br /> - # equal 2.1.0.<br /> - </span> +<pre class="prettyprint lang-config"> + <IfVersion >= 2.1> + # this happens only in versions greater or + # equal 2.1.0. </IfVersion> -</code></p></div> +</pre> + <p><code class="directive"><a href="./mod/core.html#ifdefine"><IfDefine></a></code>, <code class="directive"><a href="./mod/core.html#ifmodule"><IfModule></a></code>, and the @@ -143,11 +144,12 @@ The same effect can be obtained using <a href="howto/htaccess.html">.htaccess fi following configuration, directory indexes will be enabled for the <code>/var/web/dir1</code> directory and all subdirectories.</p> -<div class="example"><p><code> -<Directory /var/web/dir1><br /> -Options +Indexes<br /> +<pre class="prettyprint lang-config"> +<Directory /var/web/dir1> + Options +Indexes </Directory> -</code></p></div> +</pre> + <p>Directives enclosed in a <code class="directive"><a href="./mod/core.html#files"><Files></a></code> section apply to any file with the specified name, regardless of what directory it lies in. @@ -156,12 +158,13 @@ when placed in the main section of the configuration file, deny access to any file named <code>private.html</code> regardless of where it is found.</p> -<div class="example"><p><code> -<Files private.html><br /> -Order allow,deny<br /> -Deny from all<br /> +<pre class="prettyprint lang-config"> +<Files private.html> + Order allow,deny + Deny from all </Files> -</code></p></div> +</pre> + <p>To address files found in a particular part of the filesystem, the <code class="directive"><a href="./mod/core.html#files"><Files></a></code> and @@ -173,14 +176,15 @@ access to <code>/var/web/dir1/private.html</code>, of <code>private.html</code> found under the <code>/var/web/dir1/</code> directory.</p> -<div class="example"><p><code> -<Directory /var/web/dir1><br /> -<Files private.html><br /> -Order allow,deny<br /> -Deny from all<br /> -</Files><br /> +<pre class="prettyprint lang-config"> +<Directory /var/web/dir1> + <Files private.html> + Order allow,deny + Deny from all + </Files> </Directory> -</code></p></div> +</pre> + <h3><a name="webspace" id="webspace">Webspace Containers</a></h3> @@ -196,12 +200,13 @@ In particular, it will apply to requests for <code>http://yoursite.example.com/private/dir/file.html</code> as well as any other requests starting with the <code>/private</code> string.</p> -<div class="example"><p><code> -<LocationMatch ^/private><br /> -Order Allow,Deny<br /> -Deny from all<br /> +<pre class="prettyprint lang-config"> +<LocationMatch ^/private> + Order Allow,Deny + Deny from all </Location> -</code></p></div> +</pre> + <p>The <code class="directive"><a href="./mod/core.html#location"><Location></a></code> directive need not have anything to do with the filesystem. @@ -210,35 +215,39 @@ URL to an internal Apache HTTP Server handler provided by <code class="module">< No file called <code>server-status</code> needs to exist in the filesystem.</p> -<div class="example"><p><code> -<Location /server-status><br /> -SetHandler server-status<br /> +<pre class="prettyprint lang-config"> +<Location /server-status> + SetHandler server-status </Location> -</code></p></div> +</pre> + <h3><a name="overlapping-webspace" id="overlapping-webspace">Overlapping Webspace</a></h3> <p>In order to have two overlapping URLs one has to consider the order in which certain sections or directives are evaluated. For <code class="directive"><a href="./mod/core.html#location"><Location></a></code> this would be:</p> -<div class="example"><p><code> -<Location /foo><br /> -</Location><br /> -<Location /foo/bar><br /> +<pre class="prettyprint lang-config"> +<Location /foo> </Location> -</code></p></div> +<Location /foo/bar> +</Location> +</pre> + <p><code class="directive"><a href="./mod/mod_alias.html#alias"><Alias></a></code>es on the other hand, are mapped vice-versa:</p> -<div class="example"><p><code> -Alias /foo/bar /srv/www/uncommon/bar<br /> -Alias /foo /srv/www/common/foo<br /> -</code></p></div> +<pre class="prettyprint lang-config"> +Alias /foo/bar /srv/www/uncommon/bar +Alias /foo /srv/www/common/foo +</pre> + <p>The same is true for the <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> directives:</p> -<div class="example"><p><code> -ProxyPass /special-area http://special.example.com smax=5 max=10<br /> +<pre class="prettyprint lang-config"> +ProxyPass /special-area http://special.example.com smax=5 max=10 ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On -</code></p></div> +</pre> + <h3><a name="wildcards" id="wildcards">Wildcards and Regular Expressions</a></h3> @@ -264,20 +273,22 @@ how directives are applied.</p> <p>A non-regex wildcard section that changes the configuration of all user directories could look as follows:</p> -<div class="example"><p><code> -<Directory /home/*/public_html><br /> -Options Indexes<br /> +<pre class="prettyprint lang-config"> +<Directory /home/*/public_html> + Options Indexes </Directory> -</code></p></div> +</pre> + <p>Using regex sections, we can deny access to many types of image files at once:</p> -<div class="example"><p><code> -<FilesMatch \.(?i:gif|jpe?g|png)$><br /> -Order allow,deny<br /> -Deny from all<br /> +<pre class="prettyprint lang-config"> +<FilesMatch \.(?i:gif|jpe?g|png)$> + Order allow,deny + Deny from all </FilesMatch> -</code></p></div> +</pre> + @@ -287,11 +298,12 @@ directive change the configuration depending on a condition which can be expressed by a boolean expression. For example, the following configuration denies access if the HTTP Referer header does not start with "http://www.example.com/".</p> -<div class="example"><p><code> -<If "!(%{HTTP_REFERER} -strmatch 'http://www.example.com/*')"><br /> -Require all denied<br /> +<pre class="prettyprint lang-config"> +<If "!(%{HTTP_REFERER} -strmatch 'http://www.example.com/*')"> + Require all denied </If> -</code></p></div> +</pre> + @@ -309,12 +321,13 @@ different webspace locations (URLs) could map to the same filesystem location, allowing your restrictions to be circumvented. For example, consider the following configuration:</p> -<div class="example"><p><code> -<Location /dir/><br /> -Order allow,deny<br /> -Deny from all<br /> +<pre class="prettyprint lang-config"> +<Location /dir/> + Order allow,deny + Deny from all </Location> -</code></p></div> +</pre> + <p>This works fine if the request is for <code>http://yoursite.example.com/dir/</code>. But what if you are on @@ -374,12 +387,13 @@ that match the specified URL. For example, the following configuration will prevent the proxy server from being used to access the <code>www.example.com</code> website.</p> -<div class="example"><p><code> -<Proxy http://www.example.com/*><br /> -Order allow,deny<br /> -Deny from all<br /> +<pre class="prettyprint lang-config"> +<Proxy http://www.example.com/*> + Order allow,deny + Deny from all </Proxy> -</code></p></div> +</pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> <h2><a name="whatwhere" id="whatwhere">What Directives are Allowed?</a></h2> @@ -487,49 +501,51 @@ merging. Assuming they all apply to the request, the directives in this example will be applied in the order A > B > C > D > E.</p> -<div class="example"><p><code> -<Location /><br /> -E<br /> -</Location><br /> -<br /> -<Files f.html><br /> -D<br /> -</Files><br /> -<br /> -<VirtualHost *><br /> -<Directory /a/b><br /> -B<br /> -</Directory><br /> -</VirtualHost><br /> -<br /> -<DirectoryMatch "^.*b$"><br /> -C<br /> -</DirectoryMatch><br /> -<br /> -<Directory /a/b><br /> -A<br /> -</Directory><br /> -<br /> -</code></p></div> +<pre class="prettyprint lang-config"> +<Location /> + E +</Location> + +<Files f.html> + D +</Files> + +<VirtualHost *> +<Directory /a/b> + B +</Directory> +</VirtualHost> + +<DirectoryMatch "^.*b$"> + C +</DirectoryMatch> + +<Directory /a/b> + A +</Directory> + +</pre> + <p>For a more concrete example, consider the following. Regardless of any access restrictions placed in <code class="directive"><a href="./mod/core.html#directory"><Directory></a></code> sections, the <code class="directive"><a href="./mod/core.html#location"><Location></a></code> section will be evaluated last and will allow unrestricted access to the server. In other words, order of merging is important, so be careful!</p> -<div class="example"><p><code> -<Location /><br /> -Order deny,allow<br /> -Allow from all<br /> -</Location><br /> -<br /> -# Woops! This <Directory> section will have no effect<br /> -<Directory /><br /> -Order allow,deny<br /> -Allow from all<br /> -Deny from badguy.example.com<br /> +<pre class="prettyprint lang-config"> +<Location /> + Order deny,allow + Allow from all +</Location> + +# Woops! This <Directory> section will have no effect +<Directory /> + Order allow,deny + Allow from all + Deny from badguy.example.com </Directory> -</code></p></div> +</pre> + diff --git a/docs/manual/sections.html.fr b/docs/manual/sections.html.fr index 37fddcc902..f3bf568a2b 100644 --- a/docs/manual/sections.html.fr +++ b/docs/manual/sections.html.fr @@ -27,6 +27,8 @@ <a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Les directives des <a href="configuring.html">fichiers de configuration</a> peuvent s'appliquer au serveur dans son ensemble, ou seulement des rpertoires, fichiers, htes, ou URLs particuliers. Ce document dcrit comment utiliser les conteneurs de diff --git a/docs/manual/sections.html.tr.utf8 b/docs/manual/sections.html.tr.utf8 index 7e4fd8343f..e9e17e1975 100644 --- a/docs/manual/sections.html.tr.utf8 +++ b/docs/manual/sections.html.tr.utf8 @@ -27,6 +27,7 @@ <a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/sections.html" title="Türkçe"> tr </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><a href="configuring.html">Yapılandırma dosyaları</a>ndaki yönergeler sunucunun tamamına uygulanacağı gibi sadece belli dizinler, diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr index a5696a4815..b4cbb99048 100644 --- a/docs/manual/sections.xml.fr +++ b/docs/manual/sections.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision : 1300910 --> +<!-- English Revision: 1300910:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja index 75e738aaaa..4f08e9efaa 100644 --- a/docs/manual/sections.xml.ja +++ b/docs/manual/sections.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:1300910 (outdated) --> +<!-- English Revision: 420990:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko index 1125dca008..5963ad1034 100644 --- a/docs/manual/sections.xml.ko +++ b/docs/manual/sections.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:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.meta b/docs/manual/sections.xml.meta index 4e91a361f4..0e839c6dc7 100644 --- a/docs/manual/sections.xml.meta +++ b/docs/manual/sections.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/sections.xml.tr b/docs/manual/sections.xml.tr index 4bc112ebba..00735aa686 100644 --- a/docs/manual/sections.xml.tr +++ b/docs/manual/sections.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:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en index f644af2a3b..dbedce0f10 100644 --- a/docs/manual/ssl/ssl_faq.html.en +++ b/docs/manual/ssl/ssl_faq.html.en @@ -176,11 +176,12 @@ relative hyperlinks?</a></li> fully-qualified hyperlinks (because you have to change the URL scheme). Using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> however, you can manipulate relative hyperlinks, to achieve the same effect.</p> - <div class="example"><p><code> - RewriteEngine on<br /> - RewriteRule ^/(.*)_SSL$ https://%{SERVER_NAME}/$1 [R,L]<br /> - RewriteRule ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1 [R,L] - </code></p></div> + <pre class="prettyprint lang-config"> +RewriteEngine on +RewriteRule ^/(.*)_SSL$ https://%{SERVER_NAME}/$1 [R,L] +RewriteRule ^/(.*)_NOSSL$ http://%{SERVER_NAME}/$1 [R,L] + </pre> + <p>This rewrite ruleset lets you use hyperlinks of the form <code><a href="document.html_SSL"></code>, to switch to HTTPS @@ -256,10 +257,11 @@ Certificate for testing purposes?</a></h3> -keyout server.key</strong></code><br /> These can be used as follows in your <code>httpd.conf</code> file: - <pre> - SSLCertificateFile /path/to/this/server.crt - SSLCertificateKeyFile /path/to/this/server.key + <pre class="prettyprint lang-config"> +SSLCertificateFile /path/to/this/server.crt +SSLCertificateKeyFile /path/to/this/server.key </pre> + </li> <li>It is important that you are aware that this <code>server.key</code> does <em>not</em> have any passphrase. @@ -336,10 +338,11 @@ Certificate for testing purposes?</a></h3> <li>You should now have two files: <code>server.key</code> and <code>server.crt</code>. These can be used as follows in your <code>httpd.conf</code> file: - <pre> - SSLCertificateFile /path/to/this/server.crt - SSLCertificateKeyFile /path/to/this/server.key + <pre class="prettyprint lang-config"> +SSLCertificateFile /path/to/this/server.crt +SSLCertificateKeyFile /path/to/this/server.key </pre> + The <code>server.csr</code> file is no longer needed. </li> @@ -651,9 +654,10 @@ Virtual Hosting to identify different SSL virtual hosts?</a></h3> you must make sure to put the non-SSL port number on the NameVirtualHost directive, e.g.</p> - <div class="example"><p><code> + <pre class="prettyprint lang-config"> NameVirtualHost 192.168.1.1:80 - </code></p></div> + </pre> + <p>Other workaround solutions include: </p> @@ -703,11 +707,12 @@ Explorer (MSIE)?</a></h3> keep-alive connections or send the SSL close notify messages to MSIE clients. This can be done by using the following directive in your SSL-aware virtual host section:</p> - <div class="example"><p><code> - SetEnvIf User-Agent "MSIE [2-5]" \<br /> - nokeepalive ssl-unclean-shutdown \<br /> - downgrade-1.0 force-response-1.0 - </code></p></div> + <pre class="prettyprint lang-config"> +SetEnvIf User-Agent "MSIE [2-5]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + </pre> + <p>Further, some MSIE versions have problems with particular ciphers. Unfortunately, it is not possible to implement a MSIE-specific workaround for this, because the ciphers are needed as early as the diff --git a/docs/manual/ssl/ssl_faq.html.fr b/docs/manual/ssl/ssl_faq.html.fr index c0f40400f3..14d70a3815 100644 --- a/docs/manual/ssl/ssl_faq.html.fr +++ b/docs/manual/ssl/ssl_faq.html.fr @@ -24,6 +24,8 @@ <p><span>Langues Disponibles: </span><a href="../en/ssl/ssl_faq.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="../fr/ssl/ssl_faq.html" title="Franais"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <blockquote> <p>Le sage n'apporte pas de bonnes rponses, il pose les bonnes questions</p> diff --git a/docs/manual/ssl/ssl_faq.xml.fr b/docs/manual/ssl/ssl_faq.xml.fr index 738a321d36..963c62d27b 100644 --- a/docs/manual/ssl/ssl_faq.xml.fr +++ b/docs/manual/ssl/ssl_faq.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 : 1328589 --> +<!-- English Revision: 1328589:1330881 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/ssl/ssl_faq.xml.meta b/docs/manual/ssl/ssl_faq.xml.meta index 61db826966..a5d5a97804 100644 --- a/docs/manual/ssl/ssl_faq.xml.meta +++ b/docs/manual/ssl/ssl_faq.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en index 423813f1a8..7e9d1237ff 100644 --- a/docs/manual/ssl/ssl_howto.html.en +++ b/docs/manual/ssl/ssl_howto.html.en @@ -44,17 +44,16 @@ before progressing to the advanced techniques.</p> <p>Your SSL configuration will need to contain, at minimum, the following directives.</p> -<div class="example"><p><code> - Listen 443<br /> - <VirtualHost *:443><br /> - <span class="indent"> - ServerName www.example.com<br /> - SSLEngine on<br /> - SSLCertificateFile /path/to/www.example.com.cert<br /> - SSLCertificateKeyFile /path/to/www.example.com.key<br /> - </span> - </VirtualHost> -</code></p></div> +<pre class="prettyprint lang-config"> +Listen 443 +<VirtualHost *:443> + ServerName www.example.com + SSLEngine on + SSLCertificateFile /path/to/www.example.com.cert + SSLCertificateKeyFile /path/to/www.example.com.key +</VirtualHost> +</pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> @@ -70,18 +69,20 @@ requires a strong cipher for access to a particular URL?</a></li> only?</a></h3> <p>The following enables only the strongest ciphers:</p> - <div class="example"><h3>httpd.conf</h3><p><code> - SSLCipherSuite HIGH:!aNULL:!MD5<br /> - </code></p></div> + <pre class="prettyprint lang-config"> + SSLCipherSuite HIGH:!aNULL:!MD5 + </pre> + <p>While with the following configuration you specify a preference for specific speed-optimized ciphers (which will be selected by mod_ssl, provided that they are supported by the client):</p> - <div class="example"><h3>httpd.conf</h3><p><code> - SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5<br /> - SSLHonorCipherOrder on - </code></p></div> + <pre class="prettyprint lang-config"> +SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5 +SSLHonorCipherOrder on + </pre> + <h3><a name="strongurl" id="strongurl">How can I create an SSL server which accepts all types of ciphers @@ -94,16 +95,17 @@ URL?</a></h3> blocks, to give a per-directory solution, and can automatically force a renegotiation of the SSL parameters to meet the new configuration. This can be done as follows:</p> - <div class="example"><p><code> - # be liberal in general<br /> - SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL<br /> - <br /> - <Location /strong/area><br /> - # but https://hostname/strong/area/ and below<br /> - # requires strong ciphers<br /> - SSLCipherSuite HIGH:!aNULL:!MD5<br /> - </Location> - </code></p></div> + <pre class="prettyprint lang-config"> +# be liberal in general +SSLCipherSuite ALL:!aNULL:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP:+eNULL + +<Location /strong/area> +# but https://hostname/strong/area/ and below +# requires strong ciphers +SSLCipherSuite HIGH:!aNULL:!MD5 +</Location> + </pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> @@ -128,13 +130,14 @@ Intranet website, for clients coming from the Internet?</a></li> need to do is to create client certificates signed by your own CA certificate (<code>ca.crt</code>) and then verify the clients against this certificate.</p> - <div class="example"><h3>httpd.conf</h3><p><code> - # require a client certificate which has to be directly<br /> - # signed by our CA certificate in ca.crt<br /> - SSLVerifyClient require<br /> - SSLVerifyDepth 1<br /> - SSLCACertificateFile conf/ssl.crt/ca.crt - </code></p></div> + <pre class="prettyprint lang-config"> +# require a client certificate which has to be directly +# signed by our CA certificate in ca.crt +SSLVerifyClient require +SSLVerifyDepth 1 +SSLCACertificateFile conf/ssl.crt/ca.crt + </pre> + <h3><a name="arbitraryclients" id="arbitraryclients">How can I force clients to authenticate using certificates for a @@ -145,15 +148,16 @@ Intranet website, for clients coming from the Internet?</a></li> you can use the per-directory reconfiguration features of <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>:</p> - <div class="example"><h3>httpd.conf</h3><p><code> - SSLVerifyClient none<br /> - SSLCACertificateFile conf/ssl.crt/ca.crt<br /> - <br /> - <Location /secure/area><br /> - SSLVerifyClient require<br /> - SSLVerifyDepth 1<br /> - </Location><br /> - </code></p></div> + <pre class="prettyprint lang-config"> +SSLVerifyClient none +SSLCACertificateFile conf/ssl.crt/ca.crt + +<Location /secure/area> +SSLVerifyClient require +SSLVerifyDepth 1 +</Location> + </pre> + <h3><a name="certauthenticate" id="certauthenticate">How can I allow only clients who have certificates to access a @@ -172,22 +176,23 @@ Intranet website, for clients coming from the Internet?</a></li> you should establish a password database containing <em>all</em> clients allowed, as follows:</p> - <div class="example"><h3>httpd.conf</h3><pre> + <pre class="prettyprint lang-config"> SSLVerifyClient none <Directory /usr/local/apache2/htdocs/secure/area> + SSLVerifyClient require + SSLVerifyDepth 5 + SSLCACertificateFile conf/ssl.crt/ca.crt + SSLCACertificatePath conf/ssl.crt + SSLOptions +FakeBasicAuth + SSLRequireSSL + AuthName "Snake Oil Authentication" + AuthType Basic + AuthBasicProvider file + AuthUserFile /usr/local/apache2/conf/httpd.passwd + Require valid-user +</Directory> + </pre> -SSLVerifyClient require -SSLVerifyDepth 5 -SSLCACertificateFile conf/ssl.crt/ca.crt -SSLCACertificatePath conf/ssl.crt -SSLOptions +FakeBasicAuth -SSLRequireSSL -AuthName "Snake Oil Authentication" -AuthType Basic -AuthBasicProvider file -AuthUserFile /usr/local/apache2/conf/httpd.passwd -Require valid-user -</Directory></pre></div> <p>The password used in this example is the DES encrypted string "password". See the <code class="directive"><a href="../mod/mod_ssl.html#ssloptions">SSLOptions</a></code> docs for more @@ -202,10 +207,9 @@ Require valid-user into the DN, you can match them more easily using <code class="directive"><a href="../mod/mod_ssl.html#sslrequire">SSLRequire</a></code>, as follows:</p> - <div class="example"><h3>httpd.conf</h3><pre> + <pre class="prettyprint lang-config"> SSLVerifyClient none <Directory /usr/local/apache2/htdocs/secure/area> - SSLVerifyClient require SSLVerifyDepth 5 SSLCACertificateFile conf/ssl.crt/ca.crt @@ -214,7 +218,9 @@ SSLVerifyClient none SSLRequireSSL SSLRequire %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} -</Directory></pre></div> +</Directory> + </pre> + <h3><a name="intranet" id="intranet">How can I require HTTPS with strong ciphers, and either basic @@ -229,49 +235,51 @@ plain HTTP access for clients on the Intranet.</a></h3> This configuration should remain outside of your HTTPS virtual host, so that it applies to both HTTPS and HTTP.</p> - <div class="example"><h3>httpd.conf</h3><pre> + <pre class="prettyprint lang-config"> SSLCACertificateFile conf/ssl.crt/company-ca.crt <Directory /usr/local/apache2/htdocs> -# Outside the subarea only Intranet access is granted -Order deny,allow -Deny from all -Allow from 192.168.1.0/24 + # Outside the subarea only Intranet access is granted + Order deny,allow + Deny from all + Allow from 192.168.1.0/24 </Directory> <Directory /usr/local/apache2/htdocs/subarea> -# Inside the subarea any Intranet access is allowed -# but from the Internet only HTTPS + Strong-Cipher + Password -# or the alternative HTTPS + Strong-Cipher + Client-Certificate - -# If HTTPS is used, make sure a strong cipher is used. -# Additionally allow client certs as alternative to basic auth. -SSLVerifyClient optional -SSLVerifyDepth 1 -SSLOptions +FakeBasicAuth +StrictRequire -SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 - -# Force clients from the Internet to use HTTPS -RewriteEngine on -RewriteCond %{REMOTE_ADDR} !^192\.168\.1\.[0-9]+$ -RewriteCond %{HTTPS} !=on -RewriteRule . - [F] - -# Allow Network Access and/or Basic Auth -Satisfy any - -# Network Access Control -Order deny,allow -Deny from all -Allow 192.168.1.0/24 - -# HTTP Basic Authentication -AuthType basic -AuthName "Protected Intranet Area" -AuthBasicProvider file -AuthUserFile conf/protected.passwd -Require valid-user -</Directory></pre></div> + # Inside the subarea any Intranet access is allowed + # but from the Internet only HTTPS + Strong-Cipher + Password + # or the alternative HTTPS + Strong-Cipher + Client-Certificate + + # If HTTPS is used, make sure a strong cipher is used. + # Additionally allow client certs as alternative to basic auth. + SSLVerifyClient optional + SSLVerifyDepth 1 + SSLOptions +FakeBasicAuth +StrictRequire + SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 + + # Force clients from the Internet to use HTTPS + RewriteEngine on + RewriteCond %{REMOTE_ADDR} !^192\.168\.1\.[0-9]+$ + RewriteCond %{HTTPS} !=on + RewriteRule . - [F] + + # Allow Network Access and/or Basic Auth + Satisfy any + + # Network Access Control + Order deny,allow + Deny from all + Allow 192.168.1.0/24 + + # HTTP Basic Authentication + AuthType basic + AuthName "Protected Intranet Area" + AuthBasicProvider file + AuthUserFile conf/protected.passwd + Require valid-user +</Directory> + </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/ssl/ssl_howto.html.fr b/docs/manual/ssl/ssl_howto.html.fr index d698794d3f..0fe1dbf46e 100644 --- a/docs/manual/ssl/ssl_howto.html.fr +++ b/docs/manual/ssl/ssl_howto.html.fr @@ -24,6 +24,8 @@ <p><span>Langues Disponibles: </span><a href="../en/ssl/ssl_howto.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="../fr/ssl/ssl_howto.html" title="Franais"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Ce document doit vous permettre de dmarrer et de faire fonctionner diff --git a/docs/manual/ssl/ssl_howto.xml.fr b/docs/manual/ssl/ssl_howto.xml.fr index 632ea4b289..035106e20d 100644 --- a/docs/manual/ssl/ssl_howto.xml.fr +++ b/docs/manual/ssl/ssl_howto.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 : 1328589 --> +<!-- English Revision: 1328589:1330881 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/ssl/ssl_howto.xml.meta b/docs/manual/ssl/ssl_howto.xml.meta index b7c021fd9a..8d9a5237f4 100644 --- a/docs/manual/ssl/ssl_howto.xml.meta +++ b/docs/manual/ssl/ssl_howto.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en index c990224cd7..6fca13483f 100644 --- a/docs/manual/suexec.html.en +++ b/docs/manual/suexec.html.en @@ -476,10 +476,11 @@ <p>If for example, your web server is configured to run as:</p> - <div class="example"><p><code> - User www<br /> - Group webgroup<br /> - </code></p></div> + <pre class="prettyprint lang-config"> +User www +Group webgroup + </pre> + <p>and <code class="program"><a href="./programs/suexec.html">suexec</a></code> is installed at "/usr/local/apache2/bin/suexec", you should run:</p> diff --git a/docs/manual/suexec.html.fr b/docs/manual/suexec.html.fr index 44bec91846..5eebc32d4e 100644 --- a/docs/manual/suexec.html.fr +++ b/docs/manual/suexec.html.fr @@ -27,6 +27,8 @@ <a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/suexec.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>La fonctionnalit <strong>suEXEC</strong> permet l'excution des programmes <strong>CGI</strong> et diff --git a/docs/manual/suexec.xml.fr b/docs/manual/suexec.xml.fr index 19fbaac9bb..a346dba3bf 100644 --- a/docs/manual/suexec.xml.fr +++ b/docs/manual/suexec.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1328589 --> +<!-- English Revision: 1328589:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja index 593b084b12..48c926a387 100644 --- a/docs/manual/suexec.xml.ja +++ b/docs/manual/suexec.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: 655869:1328589 (outdated) --> +<!-- English Revision: 655869:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/suexec.xml.ko b/docs/manual/suexec.xml.ko index b54facc78e..c2f2d54b4b 100644 --- a/docs/manual/suexec.xml.ko +++ b/docs/manual/suexec.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:1328589 (outdated) --> +<!-- English Revision: 105989:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta index 3b7b1e8915..57a8173940 100644 --- a/docs/manual/suexec.xml.meta +++ b/docs/manual/suexec.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/suexec.xml.tr b/docs/manual/suexec.xml.tr index fa36b6a005..9e0d524b95 100644 --- a/docs/manual/suexec.xml.tr +++ b/docs/manual/suexec.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: 1038591:1328589 (outdated) --> +<!-- English Revision: 1038591:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index bfe72d3b1c..78811ea499 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -129,23 +129,35 @@ <p>In this example, all requests are denied.</p> <div class="example"><h3>2.2 configuration:</h3><p><code> - Order deny,allow<br /> - Deny from all + <pre class="prettyprint lang-config"> +Order deny,allow +Deny from all + </pre> + </code></p></div> <div class="example"><h3>2.4 configuration:</h3><p><code> + <pre class="prettyprint lang-config"> Require all denied + </pre> + </code></p></div> <p>In this example, all requests are allowed.</p> <div class="example"><h3>2.2 configuration:</h3><p><code> - Order allow,deny<br /> - Allow from all + <pre class="prettyprint lang-config"> +Order allow,deny +Allow from all + </pre> + </code></p></div> <div class="example"><h3>2.4 configuration:</h3><p><code> + <pre class="prettyprint lang-config"> Require all granted + </pre> + </code></p></div> <p>In the following example, all hosts in the example.org domain @@ -153,13 +165,19 @@ <div class="example"><h3>2.2 configuration:</h3><p><code> - Order Deny,Allow<br /> - Deny from all<br /> - Allow from example.org + <pre class="prettyprint lang-config"> +Order Deny,Allow +Deny from all +Allow from example.org + </pre> + </code></p></div> <div class="example"><h3>2.4 configuration:</h3><p><code> + <pre class="prettyprint lang-config"> Require host example.org + </pre> + </code></p></div> diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr index 3f748a5eb4..867a5febe4 100644 --- a/docs/manual/upgrading.html.fr +++ b/docs/manual/upgrading.html.fr @@ -24,6 +24,8 @@ <p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="./fr/upgrading.html" title="Franais"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Afin d'assister les utilisateurs lors de leurs oprations de mise jour, nous maintenons un document diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr index 464290c303..34a07d2388 100644 --- a/docs/manual/upgrading.xml.fr +++ b/docs/manual/upgrading.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision : 1304985 --> +<!-- English Revision: 1304985:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta index aba29996bb..1d2a68a225 100644 --- a/docs/manual/upgrading.xml.meta +++ b/docs/manual/upgrading.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en index 569e8e13f0..528e70a442 100644 --- a/docs/manual/urlmapping.html.en +++ b/docs/manual/urlmapping.html.en @@ -94,7 +94,8 @@ <p>Alternatively, the <code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code> directive will map any part of the filesystem into the web space. For example, with</p> -<div class="example"><p><code>Alias /docs /var/web</code></p></div> +<pre class="prettyprint lang-config">Alias /docs /var/web</pre> + <p>the URL <code>http://www.example.com/docs/dir/file.html</code> will be served from <code>/var/web/dir/file.html</code>. The @@ -109,8 +110,10 @@ expression</a> based matching and substitution. For example,</p> -<div class="example"><p><code>ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+) - /home/$1/cgi-bin/$2</code></p></div> + <pre class="prettyprint lang-config"> + ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+) /home/$1/cgi-bin/$2 + </pre> + <p>will map a request to <code>http://example.com/~user/cgi-bin/script.cgi</code> to the @@ -156,8 +159,10 @@ <code>/home/user/public_html/file.html</code>, use the following <code>AliasMatch</code> directive:</p> -<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$ - /home/$1/public_html/$3</code></p></div> + <pre class="prettyprint lang-config"> + AliasMatch ^/upages/([a-zA-Z0-9]+)(/(.*))?$ /home/$1/public_html/$3 + </pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> <h2><a name="redirect" id="redirect">URL Redirection</a></h2> @@ -174,8 +179,10 @@ to the new directory <code>/bar/</code>, you can instruct clients to request the content at the new location as follows:</p> -<div class="example"><p><code>Redirect permanent /foo/ - http://www.example.com/bar/</code></p></div> + <pre class="prettyprint lang-config"> + Redirect permanent /foo/ http://www.example.com/bar/ + </pre> + <p>This will redirect any URL-Path starting in <code>/foo/</code> to the same URL path on the @@ -188,14 +195,18 @@ for the site home page to a different site, but leave all other requests alone, use the following configuration:</p> -<div class="example"><p><code>RedirectMatch permanent ^/$ - http://www.example.com/startpage.html</code></p></div> + <pre class="prettyprint lang-config"> + RedirectMatch permanent ^/$ http://www.example.com/startpage.html + </pre> + <p>Alternatively, to temporarily redirect all pages on one site to a particular page on another site, use the following:</p> -<div class="example"><p><code>RedirectMatch temp .* - http://othersite.example.com/startpage.html</code></p></div> + <pre class="prettyprint lang-config"> + RedirectMatch temp .* http://othersite.example.com/startpage.html + </pre> + </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> <h2><a name="proxy" id="proxy">Reverse Proxy</a></h2> @@ -213,12 +224,13 @@ the <code>/bar/</code> directory on <code>internal.example.com</code> and returns them to the client as if they were from the local server.</p> -<div class="example"><p><code> +<pre class="prettyprint lang-config"> ProxyPass /foo/ http://internal.example.com/bar/<br /> ProxyPassReverse /foo/ http://internal.example.com/bar/<br /> ProxyPassReverseCookieDomain internal.example.com public.example.com<br /> ProxyPassReverseCookiePath /foo/ /bar/ -</code></p></div> +</pre> + <p>The <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> configures the server to fetch the appropriate documents, while the @@ -237,9 +249,10 @@ breaking out of the proxy server and requesting directly from content) in a page as it is being served to the client using <code class="module"><a href="./mod/mod_substitute.html">mod_substitute</a></code>.</p> -<div class="example"><p><code> +<pre class="prettyprint lang-config"> Substitute s/internal\.example\.com/www.example.com/i -</code></p></div> +</pre> + <p>For more sophisticated rewriting of links in HTML and XHTML, the <code class="module"><a href="./mod/mod_proxy_html.html">mod_proxy_html</a></code> module is also available. It allows you diff --git a/docs/manual/urlmapping.html.fr b/docs/manual/urlmapping.html.fr index 561d821493..82a02fd9ed 100644 --- a/docs/manual/urlmapping.html.fr +++ b/docs/manual/urlmapping.html.fr @@ -27,6 +27,8 @@ <a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/urlmapping.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Ce document explique comment le serveur HTTP Apache utilise l'URL contenue dans une requte pour dterminer le noeud du systme de fichier partir duquel le diff --git a/docs/manual/urlmapping.html.tr.utf8 b/docs/manual/urlmapping.html.tr.utf8 index e4307a498e..3453a28822 100644 --- a/docs/manual/urlmapping.html.tr.utf8 +++ b/docs/manual/urlmapping.html.tr.utf8 @@ -27,6 +27,7 @@ <a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/urlmapping.html" title="Türkçe"> tr </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, bir istekte belirtilen URL’nin sunulacak dosyanın dosya sistemindeki yerini bulmak için Apache HTTP Sunucusu tarafından nasıl diff --git a/docs/manual/urlmapping.xml.fr b/docs/manual/urlmapping.xml.fr index cc4b9c561d..fd8563779f 100644 --- a/docs/manual/urlmapping.xml.fr +++ b/docs/manual/urlmapping.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1310494 --> +<!-- English Revision: 1310494:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja index 5543f1ef4b..751ee8c0d3 100644 --- a/docs/manual/urlmapping.xml.ja +++ b/docs/manual/urlmapping.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: 151408:1310494 (outdated) --> +<!-- English Revision: 151408:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ko b/docs/manual/urlmapping.xml.ko index f90453d18f..a3ecf9862a 100644 --- a/docs/manual/urlmapping.xml.ko +++ b/docs/manual/urlmapping.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:1310494 (outdated) --> +<!-- English Revision: 151408:1330883 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.meta b/docs/manual/urlmapping.xml.meta index 35880bdad4..02fc1a16aa 100644 --- a/docs/manual/urlmapping.xml.meta +++ b/docs/manual/urlmapping.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/urlmapping.xml.tr b/docs/manual/urlmapping.xml.tr index 8715e65541..503c8ed63d 100644 --- a/docs/manual/urlmapping.xml.tr +++ b/docs/manual/urlmapping.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: 1310494 --> +<!-- English Revision: 1310494:1330883 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> 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 +<VirtualHost *:80> + DocumentRoot /www/example1 + ServerName www.example.com + + # Other directives here +</VirtualHost> + +<VirtualHost *:80> + DocumentRoot /www/example2 + ServerName www.example.org + + # Other directives here +</VirtualHost> + </pre> - # Ensure that Apache listens on port 80<br /> - Listen 80<br /> - <br /> - <br /> - <VirtualHost *:80><br /> - <span class="indent"> - DocumentRoot /www/example1<br /> - ServerName www.example.com<br /> - <br /> - # Other directives here<br /> - <br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost *:80><br /> - <span class="indent"> - DocumentRoot /www/example2<br /> - ServerName www.example.org<br /> - <br /> - # Other directives here<br /> - <br /> - </span> - </VirtualHost> - </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 + +<VirtualHost 172.20.30.50> + DocumentRoot /www/example1 + ServerName www.example.com + # Other directives here ... +</VirtualHost> + +<VirtualHost 172.20.30.50> + DocumentRoot /www/example2 + ServerName www.example.org + + # Other directives here ... +</VirtualHost> + </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 /> - <VirtualHost 172.20.30.50><br /> - <span class="indent"> - DocumentRoot /www/example1<br /> - ServerName www.example.com<br /> - <br /> - # Other directives here ...<br /> - <br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.50><br /> - <span class="indent"> - DocumentRoot /www/example2<br /> - ServerName www.example.org<br /> - <br /> - # Other directives here ...<br /> - <br /> - </span> - </VirtualHost> - </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"> +<VirtualHost 192.168.1.1 172.20.30.40> + DocumentRoot /www/server1 + ServerName server.example.com + ServerAlias server +</VirtualHost> + </pre> - <br /> - <VirtualHost 192.168.1.1 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/server1<br /> - ServerName server.example.com<br /> - ServerAlias server<br /> - </span> - </VirtualHost> - </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 + +<VirtualHost 172.20.30.40:80> + ServerName www.example.com + DocumentRoot /www/domain-80 +</VirtualHost> + +<VirtualHost 172.20.30.40:8080> + ServerName www.example.com + DocumentRoot /www/domain-8080 +</VirtualHost> + +<VirtualHost 172.20.30.40:80> + ServerName www.example.org + DocumentRoot /www/otherdomain-80 +</VirtualHost> + +<VirtualHost 172.20.30.40:8080> + ServerName www.example.org + DocumentRoot /www/otherdomain-8080 +</VirtualHost> + </pre> - Listen 80<br /> - Listen 8080<br /> - <br /> - <VirtualHost 172.20.30.40:80><br /> - <span class="indent"> - ServerName www.example.com<br /> - DocumentRoot /www/domain-80<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40:8080><br /> - <span class="indent"> - ServerName www.example.com<br /> - DocumentRoot /www/domain-8080<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40:80><br /> - <span class="indent"> - ServerName www.example.org<br /> - DocumentRoot /www/otherdomain-80<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40:8080><br /> - <span class="indent"> - ServerName www.example.org<br /> - DocumentRoot /www/otherdomain-8080<br /> - </span> - </VirtualHost> - </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 + +<VirtualHost 172.20.30.40> + DocumentRoot /www/example1 + ServerName www.example.com +</VirtualHost> + +<VirtualHost 172.20.30.50> + DocumentRoot /www/example2 + ServerName www.example.org +</VirtualHost> + </pre> - Listen 80<br /> - <br /> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/example1<br /> - ServerName www.example.com<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.50><br /> - <span class="indent"> - DocumentRoot /www/example2<br /> - ServerName www.example.org<br /> - </span> - </VirtualHost> - </code></p></div> <p>Requests for any address not specified in one of the <code><VirtualHost></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 + +<VirtualHost 172.20.30.40:80> + DocumentRoot /www/example1-80 + ServerName www.example.com +</VirtualHost> + +<VirtualHost 172.20.30.40:8080> + DocumentRoot /www/example1-8080 + ServerName www.example.com +</VirtualHost> + +<VirtualHost 172.20.30.50:80> + DocumentRoot /www/example2-80 + ServerName www.example.org +</VirtualHost> + +<VirtualHost 172.20.30.50:8080> + DocumentRoot /www/example2-8080 + ServerName www.example.org +</VirtualHost> + </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 /> - <VirtualHost 172.20.30.40:80><br /> - <span class="indent"> - DocumentRoot /www/example1-80<br /> - ServerName www.example.com<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40:8080><br /> - <span class="indent"> - DocumentRoot /www/example1-8080<br /> - ServerName www.example.com<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.50:80><br /> - <span class="indent"> - DocumentRoot /www/example2-80<br /> - ServerName www.example.org<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.50:8080><br /> - <span class="indent"> - DocumentRoot /www/example2-8080<br /> - ServerName www.example.org<br /> - </span> - </VirtualHost> - </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 +<VirtualHost 172.20.30.40> + DocumentRoot /www/example1 + ServerName www.example.com +</VirtualHost> + +<VirtualHost 172.20.30.40> + DocumentRoot /www/example2 + ServerName www.example.org +</VirtualHost> + +<VirtualHost 172.20.30.40> + DocumentRoot /www/example3 + ServerName www.example.net +</VirtualHost> + +# IP-based +<VirtualHost 172.20.30.50> + DocumentRoot /www/example4 + ServerName www.example.edu +</VirtualHost> + +<VirtualHost 172.20.30.60> + DocumentRoot /www/example5 + ServerName www.example.gov +</VirtualHost> + </pre> - Listen 80<br /> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/example1<br /> - ServerName www.example.com<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/example2<br /> - ServerName www.example.org<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/example3<br /> - ServerName www.example.net<br /> - </span> - </VirtualHost><br /> - <br /> - # IP-based<br /> - <VirtualHost 172.20.30.50><br /> - <span class="indent"> - DocumentRoot /www/example4<br /> - ServerName www.example.edu<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.60><br /> - <span class="indent"> - DocumentRoot /www/example5<br /> - ServerName www.example.gov<br /> - </span> - </VirtualHost> - </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> - <VirtualHost *:*><br /> - ProxyPreserveHost On<br /> - ProxyPass / http://192.168.111.2/<br /> - ProxyPassReverse / http://192.168.111.2/<br /> - ServerName hostname.example.com<br /> - </VirtualHost> - </code></p></div> + <pre class="prettyprint lang-config"> +<VirtualHost *:*> + ProxyPreserveHost On + ProxyPass / http://192.168.111.2/ + ProxyPassReverse / http://192.168.111.2/ + ServerName hostname.example.com +</VirtualHost> + </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"> +<VirtualHost _default_:*> + DocumentRoot /www/default +</VirtualHost> + </pre> - <VirtualHost _default_:*><br /> - <span class="indent"> - DocumentRoot /www/default<br /> - </span> - </VirtualHost> - </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"> +<VirtualHost _default_:80> + DocumentRoot /www/default80 + # ... +</VirtualHost> + +<VirtualHost _default_:*> + DocumentRoot /www/default + # ... +</VirtualHost> + </pre> - <VirtualHost _default_:80><br /> - <span class="indent"> - DocumentRoot /www/default80<br /> - # ...<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost _default_:*><br /> - <span class="indent"> - DocumentRoot /www/default<br /> - # ...<br /> - </span> - </VirtualHost> - </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"> +<VirtualHost _default_:80> +DocumentRoot /www/default +... +</VirtualHost> + </pre> - <VirtualHost _default_:80><br /> - DocumentRoot /www/default<br /> - ...<br /> - </VirtualHost> - </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 + +<VirtualHost 172.20.30.40 172.20.30.50> + DocumentRoot /www/example2 + ServerName www.example.org + # ... +</VirtualHost> + +<VirtualHost 172.20.30.40> + DocumentRoot /www/example3 + ServerName www.example.net + ServerAlias *.example.net + # ... +</VirtualHost> + </pre> - Listen 80<br /> - ServerName www.example.com<br /> - DocumentRoot /www/example1<br /> - <br /> - <VirtualHost 172.20.30.40 172.20.30.50><br /> - <span class="indent"> - DocumentRoot /www/example2<br /> - ServerName www.example.org<br /> - # ...<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - DocumentRoot /www/example3<br /> - ServerName www.example.net<br /> - ServerAlias *.example.net<br /> - # ...<br /> - </span> - </VirtualHost> - </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"> +<VirtualHost 172.20.30.40> + # primary vhost + DocumentRoot /www/subdomain + RewriteEngine On + RewriteRule . /www/subdomain/index.html + # ... +</VirtualHost> + +<VirtualHost 172.20.30.40> +DocumentRoot /www/subdomain/sub1 + ServerName www.sub1.domain.tld + ServerPath /sub1/ + RewriteEngine On + RewriteRule ^(/sub1/.*) /www/subdomain$1 + # ... +</VirtualHost> + +<VirtualHost 172.20.30.40> + DocumentRoot /www/subdomain/sub2 + ServerName www.sub2.domain.tld + ServerPath /sub2/ + RewriteEngine On + RewriteRule ^(/sub2/.*) /www/subdomain$1 + # ... +</VirtualHost> + </pre> - <VirtualHost 172.20.30.40><br /> - <span class="indent"> - # primary vhost<br /> - DocumentRoot /www/subdomain<br /> - RewriteEngine On<br /> - RewriteRule . /www/subdomain/index.html<br /> - # ...<br /> - </span> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40><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> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.40><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> - </VirtualHost> - </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"> ko </a> | <a href="../tr/vhosts/examples.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Le but de ce document est d'essayer de rpondre 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"> ko </a> | <a href="../tr/vhosts/examples.html" title="Türkçe"> tr </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\" %>s %b" vhost<br /> +<pre class="prettyprint lang-config"> +LogFormat "%v %h %l %u %t \"%r\" %>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"> ko </a> | <a href="../tr/vhosts/fd-limits.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Quand de nombreux serveurs virtuels sont crs, 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"> ko </a> | <a href="../tr/vhosts/fd-limits.html" title="Türkçe"> tr </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> - <VirtualHost 172.20.30.40:80><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 /> - </VirtualHost><br /> - <br /> - <VirtualHost 172.20.30.50:80><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 /> - </VirtualHost> - </code></p></div> + <pre class="prettyprint lang-config"> +<VirtualHost 172.20.30.40:80> + 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 +</VirtualHost> + +<VirtualHost 172.20.30.50:80> + 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 +</VirtualHost> + </pre> + <p>It is recommended that you use an IP address instead of a hostname in the <VirtualHost> 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"> ko </a> | <a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> </div> <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Systme 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"> ko </a> | <a href="../tr/vhosts/ip-based.html" title="Türkçe"> tr </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><VirtualHost></code> sections that are substantially the same, for example:</p> -<div class="example"><pre> +<pre class="prettyprint lang-config"> <VirtualHost 111.22.33.44> 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 </VirtualHost> -</pre></div> +</pre> + <p>We wish to replace these multiple <code><VirtualHost></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><VirtualHost></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 /> -<Directory /www/commercial><br /> -<span class="indent"> - Options FollowSymLinks<br /> - AllowOverride All<br /> -</span> -</Directory><br /> -<br /> -<Directory /www/homepages><br /> -<span class="indent"> - Options FollowSymLinks<br /> - AllowOverride None<br /> -</span> -</Directory><br /> -<br /> -<VirtualHost 111.22.33.44><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> -</VirtualHost><br /> -<br /> -<VirtualHost 111.22.33.45><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 + +<Directory /www/commercial> + Options FollowSymLinks + AllowOverride All +</Directory> + +<Directory /www/homepages> + Options FollowSymLinks + AllowOverride None +</Directory> + +<VirtualHost 111.22.33.44> + ServerName www.commercial.example.com + + CustomLog logs/access_log.commercial vcommon + + VirtualDocumentRoot /www/commercial/%0/docs + VirtualScriptAlias /www/commercial/%0/cgi-bin +</VirtualHost> + +<VirtualHost 111.22.33.45> + ServerName www.homepages.example.com + + CustomLog logs/access_log.homepages vcommon + + VirtualDocumentRoot /www/homepages/%0/docs + ScriptAlias /cgi-bin/ /www/std-cgi/ </VirtualHost> -</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"> ko </a> | <a href="../tr/vhosts/mass.html" title="Türkçe"> tr </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> - <VirtualHost *:80><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> - </VirtualHost><br /> - <br /> - <VirtualHost *:80><br /> - <span class="indent">ServerName other.example.com<br /> - DocumentRoot /www/otherdomain<br /> - </span> - </VirtualHost><br /> - </code></p></div> + <pre class="prettyprint lang-config"> +<VirtualHost *:80> + # This first-listed virtual host is also the default for *:80 + ServerName www.example.com + ServerAlias example.com + DocumentRoot /www/domain +</VirtualHost> + +<VirtualHost *:80> +ServerName other.example.com + DocumentRoot /www/otherdomain +</VirtualHost> + </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"><VirtualHost></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"> ko </a> | <a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <p>Ce document dcrit 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"> ko </a> | <a href="../tr/vhosts/name-based.html" title="Türkçe"> tr </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> |