From 7dffa590d42ada078b23bc7b2a32caa06d88f44e Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 9 Apr 2015 20:51:11 +0000 Subject: [PATCH] make docs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1672485 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/expr.html.en | 2 +- docs/manual/expr.html.fr | 2 ++ docs/manual/expr.xml.fr | 2 +- docs/manual/expr.xml.meta | 2 +- docs/manual/mod/core.html.en | 15 +++++++++++---- docs/manual/mod/core.html.fr | 2 ++ docs/manual/mod/core.html.tr.utf8 | 1 + docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 4 ++-- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_proxy_scgi.html.en | 10 +++++++--- docs/manual/mod/mod_proxy_scgi.html.fr | 2 ++ docs/manual/mod/mod_proxy_scgi.xml.fr | 2 +- docs/manual/mod/mod_proxy_scgi.xml.meta | 2 +- docs/manual/rewrite/advanced.html.fr | 2 ++ docs/manual/rewrite/advanced.xml.fr | 2 +- docs/manual/rewrite/advanced.xml.meta | 2 +- 20 files changed, 41 insertions(+), 21 deletions(-) diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index cfc7af43fc..f419abc67f 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -44,7 +44,7 @@
  • Other
  • Comparison with SSLRequire
  • Version History
    • -

    See also

    +

    See also

    top

    Grammar in Backus-Naur Form notation

    diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr index 34f4f4de52..e8ad5abbab 100644 --- a/docs/manual/expr.html.fr +++ b/docs/manual/expr.html.fr @@ -24,6 +24,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Historiquement, il existe de nombreuses variantes dans la syntaxe des expressions permettant d'exprimer une condition dans les diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index db743f2d4d..d2c1795311 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a5..ea324a8bb2 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 0f8158c958..73497ecdc3 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -1257,16 +1257,22 @@ in case of an error or a message. Apache httpd will sometimes offer additional information regarding the problem/error.

    +

    From 2.4.13, expression syntax can be + used inside the directive to produce dynamic strings and URLs.

    +

    URLs can begin with a slash (/) for local web-paths (relative to the DocumentRoot), or be a full URL which the client can resolve. Alternatively, a message - can be provided to be displayed by the browser. Examples:

    + can be provided to be displayed by the browser. Note that deciding + whether the parameter is an URL, a path or a message is performed + before any expression is parsed. Examples:

    ErrorDocument 500 http://foo.example.com/cgi-bin/tester
 ErrorDocument 404 /cgi-bin/bad_urls.pl
 ErrorDocument 401 /subscription_info.html
 ErrorDocument 403 "Sorry can't allow you access today"
-ErrorDocument 403 Forbidden!
    +ErrorDocument 403 Forbidden! +ErrorDocument 403 /cgi-bin/forbidden.pl?referrer=%{escape:%{HTTP_REFERER}}

    Additionally, the special value default can be used @@ -2192,8 +2198,9 @@ requests on a persistent connection higher the timeout, the more server processes will be kept occupied waiting on connections with idle clients.

    -

    In a name-based virtual host context, the value of the first - defined virtual host best matching the local IP and port will be used.

    +

    If KeepAliveTimeout is not + set for a name-based virtual host, the value of the first defined + virtual host best matching the local IP and port will be used.

    top
    diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 00ad4eb22d..63eaf1a90b 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -31,6 +31,8 @@  ja  |  tr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
    Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
    Statut:Core
    diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index f37cd0b66a..9a2765d7dd 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -31,6 +31,7 @@  ja  |  tr 

    +
    Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.
    Açıklama:Apache HTTP Sunucusunda daima mevcut olan çekirdek özellikler
    Durum:Çekirdek
    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index f41212928c..e57e2680bf 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index b5025b3013..842f168de8 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_proxy_scgi.xml.meta b/docs/manual/mod/mod_proxy_scgi.xml.meta index a125bc5ade..2f16230aa2 100644 --- a/docs/manual/mod/mod_proxy_scgi.xml.meta +++ b/docs/manual/mod/mod_proxy_scgi.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/rewrite/advanced.html.fr b/docs/manual/rewrite/advanced.html.fr index e32144df92..22ec9bf456 100644 --- a/docs/manual/rewrite/advanced.html.fr +++ b/docs/manual/rewrite/advanced.html.fr @@ -24,6 +24,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Ce document complète la documentation de référence du diff --git a/docs/manual/rewrite/advanced.xml.fr b/docs/manual/rewrite/advanced.xml.fr index f23f38bf03..caf498abb7 100644 --- a/docs/manual/rewrite/advanced.xml.fr +++ b/docs/manual/rewrite/advanced.xml.fr @@ -3,7 +3,7 @@ - +