From 5553ba652b4f950face7d8a923df3439af5c2cd7 Mon Sep 17 00:00:00 2001
From: Rich Bowen
Date: Tue, 2 Feb 2016 09:51:49 +0000
Subject: [PATCH] Rebuild All The Things.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1728061 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/core.html.en | 21 +-
docs/manual/mod/mod_cgi.html.fr | 2 +
docs/manual/mod/mod_cgi.html.ja.utf8 | 4 +
docs/manual/mod/mod_cgi.xml.fr | 2 +-
docs/manual/mod/mod_cgi.xml.ja | 2 +-
docs/manual/mod/mod_cgi.xml.ko | 2 +-
docs/manual/mod/mod_cgi.xml.meta | 4 +-
docs/manual/mod/mod_deflate.html.fr | 2 +
docs/manual/mod/mod_deflate.xml.fr | 2 +-
docs/manual/mod/mod_deflate.xml.ja | 2 +-
docs/manual/mod/mod_deflate.xml.ko | 2 +-
docs/manual/mod/mod_deflate.xml.meta | 2 +-
docs/manual/mod/mod_http2.html.en | 162 ++++++++++++-
docs/manual/mod/mod_rewrite.html.en | 218 ++++++++++--------
docs/manual/mod/mod_rewrite.html.fr | 2 +
docs/manual/mod/mod_rewrite.xml.fr | 2 +-
docs/manual/mod/mod_rewrite.xml.meta | 2 +-
docs/manual/mod/mod_setenvif.html.tr.utf8 | 1 +
docs/manual/mod/mod_so.html.ja.utf8 | 4 +
docs/manual/mod/mod_so.html.tr.utf8 | 1 +
docs/manual/mod/quickreference.html.de | 1 +
docs/manual/mod/quickreference.html.en | 1 +
docs/manual/mod/quickreference.html.es | 1 +
docs/manual/mod/quickreference.html.ja.utf8 | 1 +
docs/manual/mod/quickreference.html.ko.euc-kr | 1 +
docs/manual/mod/quickreference.html.tr.utf8 | 1 +
.../manual/mod/quickreference.html.zh-cn.utf8 | 1 +
27 files changed, 329 insertions(+), 117 deletions(-)
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index c137c654d0..9d2c90c507 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3973,20 +3973,24 @@ to name-virtual hosts
Description: | Hostname and port that the server uses to identify
itself |
-Syntax: | ServerName [scheme://]fully-qualified-domain-name[:port] |
+Syntax: | ServerName [scheme://]domain-name|ip-address[:port] |
Context: | server config, virtual host |
Status: | Core |
Module: | core |
The ServerName
directive sets the
- request scheme, hostname and
- port that the server uses to identify itself. This is used when
- creating redirection URLs.
+ request scheme, hostname and port that the server uses to identify itself.
+
- Additionally, ServerName
is used (possibly
+
ServerName
is used (possibly
in conjunction with ServerAlias
) to uniquely
identify a virtual host, when using name-based virtual hosts.
+ Additionally, this is used when
+ creating self-referential redirection URLs when
+ UseCanonicalName
is set to a non-default
+ value.
+
For example, if the name of the
machine hosting the web server is simple.example.com
,
but the machine also has the DNS alias www.example.com
@@ -4001,9 +4005,10 @@ itself
each appearance overrides the previous appearance (within that
server).
- If no ServerName
is specified, then the
- server attempts to deduce the client visible hostname by performing a
- reverse lookup on an IP address of the systems hostname.
+ If no ServerName
is specified, the
+ server attempts to deduce the client visible hostname by first asking
+ the operating system for the system hostname, and if that fails,
+ performing a reverse lookup on an IP address present on the system.
If no port is specified in the
ServerName
, then the server will use the
diff --git a/docs/manual/mod/mod_cgi.html.fr b/docs/manual/mod/mod_cgi.html.fr
index 6a0fdeae6d..fe3d2b9abe 100644
--- a/docs/manual/mod/mod_cgi.html.fr
+++ b/docs/manual/mod/mod_cgi.html.fr
@@ -31,6 +31,8 @@
ja |
ko
+Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.
Description: | Exécution des scripts CGI |
Statut: | Base |
Identificateur de Module: | cgi_module |
diff --git a/docs/manual/mod/mod_cgi.html.ja.utf8 b/docs/manual/mod/mod_cgi.html.ja.utf8
index 6dcf9cb494..cfdc514fea 100644
--- a/docs/manual/mod/mod_cgi.html.ja.utf8
+++ b/docs/manual/mod/mod_cgi.html.ja.utf8
@@ -31,6 +31,10 @@
ja |
ko
+ãã®æ¥æ¬èªè¨³ã¯ãã§ã«å¤ããªã£ã¦ãã
+ å¯è½æ§ãããã¾ãã
+ æè¿æ´æ°ãããå
容ãè¦ãã«ã¯è±èªçãã覧ä¸ããã
+
説æ: | CGI ã¹ã¯ãªããã®å®è¡ |
ã¹ãã¼ã¿ã¹: | Base |
ã¢ã¸ã¥ã¼ã«èå¥å: | cgi_module |
diff --git a/docs/manual/mod/mod_cgi.xml.fr b/docs/manual/mod/mod_cgi.xml.fr
index 3fcb1e2f40..10d2e45aa2 100644
--- a/docs/manual/mod/mod_cgi.xml.fr
+++ b/docs/manual/mod/mod_cgi.xml.fr
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/manual/mod/mod_cgi.xml.ja b/docs/manual/mod/mod_cgi.xml.ja
index d844ba9843..7be1ae63e8 100644
--- a/docs/manual/mod/mod_cgi.xml.ja
+++ b/docs/manual/mod/mod_cgi.xml.ja
@@ -1,7 +1,7 @@
-
+
+
+
diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja
index f257f2d31d..2c49161b65 100644
--- a/docs/manual/mod/mod_deflate.xml.ja
+++ b/docs/manual/mod/mod_deflate.xml.ja
@@ -1,7 +1,7 @@
-
+
+
+
diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta
index decc0a7b1e..0be21e86f4 100644
--- a/docs/manual/mod/mod_rewrite.xml.meta
+++ b/docs/manual/mod/mod_rewrite.xml.meta
@@ -8,6 +8,6 @@
en
- fr
+ fr
diff --git a/docs/manual/mod/mod_setenvif.html.tr.utf8 b/docs/manual/mod/mod_setenvif.html.tr.utf8
index 81936ca068..54617919ec 100644
--- a/docs/manual/mod/mod_setenvif.html.tr.utf8
+++ b/docs/manual/mod/mod_setenvif.html.tr.utf8
@@ -32,6 +32,7 @@
ko |
tr
+Bu çeviri güncel olmayabilir. Son deÄiÅiklikler için Ä°ngilizce sürüm geçerlidir.
Açıklama: | Ortam deÄiÅkenlerinin isteÄin özelliklerine uygun olarak atanmasını saÄlar |
Durum: | Temel |
Modül Betimleyici: | setenvif_module |
diff --git a/docs/manual/mod/mod_so.html.ja.utf8 b/docs/manual/mod/mod_so.html.ja.utf8
index 090f4257c3..5eb52ed069 100644
--- a/docs/manual/mod/mod_so.html.ja.utf8
+++ b/docs/manual/mod/mod_so.html.ja.utf8
@@ -32,6 +32,10 @@
ko |
tr
+ãã®æ¥æ¬èªè¨³ã¯ãã§ã«å¤ããªã£ã¦ãã
+ å¯è½æ§ãããã¾ãã
+ æè¿æ´æ°ãããå
容ãè¦ãã«ã¯è±èªçãã覧ä¸ããã
+
説æ: | èµ·åæãåèµ·åæã«å®è¡ã³ã¼ãã¨ã¢ã¸ã¥ã¼ã«ããµã¼ãã«ãã¼ããã
|
ã¹ãã¼ã¿ã¹: | Extension |
diff --git a/docs/manual/mod/mod_so.html.tr.utf8 b/docs/manual/mod/mod_so.html.tr.utf8
index db48cd5151..aa134c3b7d 100644
--- a/docs/manual/mod/mod_so.html.tr.utf8
+++ b/docs/manual/mod/mod_so.html.tr.utf8
@@ -32,6 +32,7 @@
ko |
tr
+Bu çeviri güncel olmayabilir. Son deÄiÅiklikler için Ä°ngilizce sürüm geçerlidir.
Açıklama: | Modüllerin ve çalıÅtırılabilir kodun sunucunun baÅlatılması veya
yeniden baÅlatılması sırasında yüklenmesini saÄlar. |
Durum: | Eklenti |
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 2eaf5fc1cc..7b51cc7d8b 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -854,6 +854,7 @@ must succeed for the enclosing directive to not fail.
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index a72035694b..b16dc7c11e 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -846,6 +846,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index 8bcb5cd2e9..d7409d9125 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -853,6 +853,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
index b5adfc12fc..9a215a4f63 100644
--- a/docs/manual/mod/quickreference.html.ja.utf8
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -790,6 +790,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 20c96cb363..459610163f 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -810,6 +810,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index 2d94478746..b37940fcaa 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -844,6 +844,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | skdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sk | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | skdh | E |
Sets some special options for the rewrite engine |
RewriteRule
diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8
index 7f6856e33f..fc9ae90eb9 100644
--- a/docs/manual/mod/quickreference.html.zh-cn.utf8
+++ b/docs/manual/mod/quickreference.html.zh-cn.utf8
@@ -841,6 +841,7 @@ must succeed for the enclosing directive to not fail. |
RewriteEngine on|off | off | svdh | E |
Enables or disables runtime rewriting engine |
RewriteMap MapName MapType:MapSource
+ MapTypeOptions
| | sv | E |
Defines a mapping function for key-lookup |
RewriteOptions Options | | svdh | E |
Sets some special options for the rewrite engine |
RewriteRule
--
2.40.0
|