From 74e65412ced206d79d7a99e08f5bb871f894b92d Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 30 Dec 2015 14:52:50 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1722341 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/developer/index.xml.zh-cn | 2 +- docs/manual/expr.html.en | 5 +- docs/manual/expr.html.fr | 2 + docs/manual/expr.xml.fr | 2 +- docs/manual/expr.xml.meta | 2 +- docs/manual/misc/password_encryptions.html.en | 6 + docs/manual/misc/password_encryptions.html.fr | 8 + docs/manual/misc/password_encryptions.xml.fr | 2 +- .../manual/misc/password_encryptions.xml.meta | 2 +- docs/manual/mod/directives.html.de | 3 +- docs/manual/mod/directives.html.en | 3 +- docs/manual/mod/directives.html.es | 3 +- docs/manual/mod/directives.html.fr | 3 +- docs/manual/mod/directives.html.ja.utf8 | 3 +- docs/manual/mod/directives.html.ko.euc-kr | 3 +- docs/manual/mod/directives.html.tr.utf8 | 3 +- docs/manual/mod/directives.html.zh-cn.utf8 | 3 +- docs/manual/mod/mod_headers.html.en | 7 +- docs/manual/mod/mod_headers.html.fr | 2 + docs/manual/mod/mod_headers.xml.fr | 2 +- docs/manual/mod/mod_headers.xml.ja | 2 +- docs/manual/mod/mod_headers.xml.ko | 2 +- docs/manual/mod/mod_headers.xml.meta | 2 +- docs/manual/mod/mod_log_config.html.en | 29 + docs/manual/mod/mod_log_config.html.fr | 17 + docs/manual/mod/mod_log_config.html.ja.utf8 | 15 + docs/manual/mod/mod_log_config.html.ko.euc-kr | 15 + docs/manual/mod/mod_log_config.html.tr.utf8 | 15 + docs/manual/mod/mod_log_config.xml.fr | 2 +- docs/manual/mod/mod_log_config.xml.ja | 2 +- docs/manual/mod/mod_log_config.xml.ko | 2 +- docs/manual/mod/mod_log_config.xml.meta | 4 +- docs/manual/mod/mod_log_config.xml.tr | 2 +- docs/manual/mod/quickreference.html.de | 896 ++++++++--------- docs/manual/mod/quickreference.html.en | 896 ++++++++--------- docs/manual/mod/quickreference.html.es | 896 ++++++++--------- docs/manual/mod/quickreference.html.fr | 920 +++++++++--------- docs/manual/mod/quickreference.html.ja.utf8 | 878 ++++++++--------- docs/manual/mod/quickreference.html.ko.euc-kr | 892 ++++++++--------- docs/manual/mod/quickreference.html.tr.utf8 | 908 ++++++++--------- .../manual/mod/quickreference.html.zh-cn.utf8 | 896 ++++++++--------- 41 files changed, 3757 insertions(+), 3600 deletions(-) diff --git a/docs/manual/developer/index.xml.zh-cn b/docs/manual/developer/index.xml.zh-cn index 8270e13531..3af05e7899 100644 --- a/docs/manual/developer/index.xml.zh-cn +++ b/docs/manual/developer/index.xml.zh-cn @@ -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/misc/password_encryptions.html.en b/docs/manual/misc/password_encryptions.html.en index c6f63f994a..1aec003208 100644 --- a/docs/manual/misc/password_encryptions.html.en +++ b/docs/manual/misc/password_encryptions.html.en @@ -166,6 +166,12 @@ Use the APR function: apr_sha1_base64

+

Python

+ import base64
+ import hashlib
+ "{SHA}" + format(base64.b64encode(hashlib.sha1(password).digest())) +

+

PostgreSQL (with the contrib/pgcrypto functions installed)

diff --git a/docs/manual/misc/password_encryptions.html.fr b/docs/manual/misc/password_encryptions.html.fr index 6c6fabe36b..724b197a99 100644 --- a/docs/manual/misc/password_encryptions.html.fr +++ b/docs/manual/misc/password_encryptions.html.fr @@ -26,6 +26,8 @@

Langues Disponibles:  en  |  fr 

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

Notes à propos des formats de chiffrement des mots de passe générés et compris par Apache.

@@ -175,6 +177,12 @@ Utilisez la fonction APR : apr_sha1_base64

+

Python

+ import base64
+ import hashlib
+ "{SHA}" + format(base64.b64encode(hashlib.sha1(password).digest())) +

+

PostgreSQL (avec les fonctions contrib/pgcrypto installées)

diff --git a/docs/manual/misc/password_encryptions.xml.fr b/docs/manual/misc/password_encryptions.xml.fr index 7667ecb057..f4538030a0 100644 --- a/docs/manual/misc/password_encryptions.xml.fr +++ b/docs/manual/misc/password_encryptions.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/misc/password_encryptions.xml.meta b/docs/manual/misc/password_encryptions.xml.meta index 5226d4016d..40f30d4ec3 100644 --- a/docs/manual/misc/password_encryptions.xml.meta +++ b/docs/manual/misc/password_encryptions.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 8b9f60e079..5337241842 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -279,7 +279,8 @@

  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index ebe6fa21c0..dc8c81f8d7 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -280,7 +280,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 06f11c3e20..dac6f22594 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -282,7 +282,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.fr b/docs/manual/mod/directives.html.fr index 7c7ec74d3c..1d853cfd76 100644 --- a/docs/manual/mod/directives.html.fr +++ b/docs/manual/mod/directives.html.fr @@ -280,7 +280,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8 index dc7e82168e..398b5fb005 100644 --- a/docs/manual/mod/directives.html.ja.utf8 +++ b/docs/manual/mod/directives.html.ja.utf8 @@ -277,7 +277,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index 63ac3033a8..bf0ea5dff5 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -277,7 +277,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 3f3ec118fd..9d613aa2f0 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -276,7 +276,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8 index 1b05f39622..9bfa0dfba0 100644 --- a/docs/manual/mod/directives.html.zh-cn.utf8 +++ b/docs/manual/mod/directives.html.zh-cn.utf8 @@ -275,7 +275,8 @@
  • ForceLanguagePriority
  • ForceType
  • ForensicLog
    • -
  • GprofDir
    • +
  • GlobalLog
    • +
  • GprofDir
  • GracefulShutdownTimeout
  • Group
  • H2Direct
    • diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en index a1aa8f5ed6..401a8cc732 100644 --- a/docs/manual/mod/mod_headers.html.en +++ b/docs/manual/mod/mod_headers.html.en @@ -425,7 +425,12 @@ available in 2.4.10 and later
    expr=expression
    The directive is applied if and only if expression evaluates to true. Details of expression syntax and evaluation are - documented in the ap_expr documentation.
    + documented in the ap_expr documentation. +

    + # This delays the evaluation of the condition clause compared to <If> + Header always set CustomHeader my-value "expr=%{REQUEST_URI} =~ m#^/special_path.php$#" +

    +

    Except in early mode, the diff --git a/docs/manual/mod/mod_headers.html.fr b/docs/manual/mod/mod_headers.html.fr index 1ae42af3e9..a3fadfc922 100644 --- a/docs/manual/mod/mod_headers.html.fr +++ b/docs/manual/mod/mod_headers.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.
    diff --git a/docs/manual/mod/mod_headers.xml.fr b/docs/manual/mod/mod_headers.xml.fr index e9572d9da0..f51965b651 100644 --- a/docs/manual/mod/mod_headers.xml.fr +++ b/docs/manual/mod/mod_headers.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index e19b809967..97ca64cb1d 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 0b9f428452..ca156f8e80 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + +
    Description:Personnalisation des en-têtes de requêtes et de réponses HTTP
    Statut:Extension