From: André Malo Date: Thu, 30 Jan 2014 16:22:51 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.2.27~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ccd883bc3ab506dd6156539f3a46586d556857;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1562878 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_alias.html.tr.utf8 b/docs/manual/mod/mod_alias.html.tr.utf8 index 3edc810a1dc..d31e226dd65 100644 --- a/docs/manual/mod/mod_alias.html.tr.utf8 +++ b/docs/manual/mod/mod_alias.html.tr.utf8 @@ -210,7 +210,7 @@ eşler. belirgin tek fark Alias yönergesinin URI'nin bir ek bölümünü, sağda, dosya yolunun sonundaki eşleşen parçayı özdevinimli olarak kopyalayacak olmasıdır. Halbuki - AliasMatch bunu yapmaz. Yani, + AliasMatch bunu yapmaz. Yani, hemen her durumda, istek URI'sinin baştan sona tümünün düzenli ifade ile eşleşmesini ve sağ taraftaki ikamenin kullanılmasını istersiniz.

diff --git a/docs/manual/mod/mod_authn_alias.html.en b/docs/manual/mod/mod_authn_alias.html.en index 0ad0eca854e..2c3c524fb9a 100644 --- a/docs/manual/mod/mod_authn_alias.html.en +++ b/docs/manual/mod/mod_authn_alias.html.en @@ -141,8 +141,8 @@ the specified alias

<AuthnProviderAlias> and </AuthnProviderAlias> are used to enclose a group of authentication directives that can be referenced by the alias name - using one of the directives - AuthBasicProvider or + using one of the directives + AuthBasicProvider or AuthDigestProvider.

diff --git a/docs/manual/mod/mod_authn_alias.html.fr b/docs/manual/mod/mod_authn_alias.html.fr index d536369b8dd..354936d488c 100644 --- a/docs/manual/mod/mod_authn_alias.html.fr +++ b/docs/manual/mod/mod_authn_alias.html.fr @@ -144,8 +144,8 @@ l'alias sp </AuthnProviderAlias> permettent de regrouper des directives qui représentent une extension d'un fournisseur d'authentification de base pouvant être référencée par l'alias - spécifié dans les directives - AuthBasicProvider ou + spécifié dans les directives + AuthBasicProvider ou AuthDigestProvider.

diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index 0d98f1902bf..3eb30c16ed4 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -1001,7 +1001,7 @@ environment variable authentication for the request, the server will try to map the username to a DN during authorization regardless of whether or not LDAP-specific requirements are present. To ignore the failures to map a username to a DN during - authorization, set + authorization, set AuthzLDAPAuthoritative to "off".

diff --git a/docs/manual/mod/mod_authnz_ldap.html.fr b/docs/manual/mod/mod_authnz_ldap.html.fr index 3bc606edbd6..61be46e5cad 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.fr +++ b/docs/manual/mod/mod_authnz_ldap.html.fr @@ -1103,7 +1103,7 @@ ldap2.example.com/dc=..."

processus d'autorisation, que des prérequis LDAP spécifiques soient présents ou non. Pour ignorer les échecs de mise en correspondance d'un nom d'utilisateur avec un DN au cours du processus - d'autorisation, définissez + d'autorisation, définissez AuthzLDAPAuthoritative à "off".

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 13cb873033c..e9dffda1eb9 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -1269,7 +1269,7 @@ be examined and a chain of trust will be constructed.

Security warning

If this directive is enabled, all of the certificates in the file will be -trusted as if they were also in +trusted as if they were also in SSLProxyCACertificateFile.

Example

diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index e8c0602048b..acd785889ee 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -747,7 +747,7 @@ Apache ThreadsPerChild settings require more than 16 server processes (default). Do not set the value of this directive any higher than the number of server - processes required by what you may want for MaxClients and ThreadsPerChild.

+ processes required by what you may want for MaxClients and ThreadsPerChild.

Note

There is a hard limit of ServerLimit 20000 compiled diff --git a/docs/manual/mod/mpm_common.html.ja.utf8 b/docs/manual/mod/mpm_common.html.ja.utf8 index 22cf15c9d75..b98dafa37d1 100644 --- a/docs/manual/mod/mpm_common.html.ja.utf8 +++ b/docs/manual/mod/mpm_common.html.ja.utf8 @@ -762,7 +762,7 @@ accept しようとしているときに、Apache がそれらの子プロセス ThreadsPerChild の設定で 16 サーバプロセス (デフォルト) 以上必要になる場合にのみ使用してください。希望の - MaxClients と + MaxClients と ThreadsPerChild とくらべて、必要となるサーバプロセス数以上に大きな値を 設定することは避けてください。

diff --git a/docs/manual/mod/mpm_common.html.tr.utf8 b/docs/manual/mod/mpm_common.html.tr.utf8 index 540cf10c7b5..c65e4e95185 100644 --- a/docs/manual/mod/mpm_common.html.tr.utf8 +++ b/docs/manual/mod/mpm_common.html.tr.utf8 @@ -754,7 +754,7 @@ MaxClients ve ThreadsPerChild ayarları 16 sunucu sürecinden (16 öntanımlıdır) fazlasını gerektiriyorsa - ayarlayınız. Bu yönergeye MaxClients + ayarlayınız. Bu yönergeye MaxClients ve ThreadsPerChild için gerekli gördüğünüz sunucu süreci sayısından fazlasını atamayınız.

diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en index a680bb04359..eb1fe2b258e 100644 --- a/docs/manual/mod/worker.html.en +++ b/docs/manual/mod/worker.html.en @@ -108,17 +108,17 @@ uses MaxClients directive. The maximum number of active child processes is determined by the MaxClients - directive divided by the + directive divided by the ThreadsPerChild directive.

Two directives set hard limits on the number of active child processes and the number of server threads in a child process, and can only be changed by fully stopping the server and then - starting it again. ServerLimit + starting it again. ServerLimit is a hard limit on the number of active child processes, and must be greater than or equal to the MaxClients - directive divided by the + directive divided by the ThreadsPerChild directive. ThreadLimit is a hard limit of the number of server threads, and must be greater than diff --git a/docs/manual/mod/worker.html.ja.utf8 b/docs/manual/mod/worker.html.ja.utf8 index c9a0c981ff1..ecafe864ee2 100644 --- a/docs/manual/mod/worker.html.ja.utf8 +++ b/docs/manual/mod/worker.html.ja.utf8 @@ -127,10 +127,10 @@

活動中の子プロセスの数と子プロセス中のサーバスレッドの数の越えられない 上限を設定するディレクティブが二つあります。これらはサーバを 完全に停止して、再起動することでしか変更することはできません。 - ServerLimit + ServerLimit は活動中の子プロセスの越えられない上限を設定し、 MaxClients ディレクティブ - の値を + の値を ThreadsPerChild の値で割った値以上である 必要があります。ThreadLimit は サーバスレッドの越えられない上限で、ThreadsPerChild ディレクティブの @@ -146,10 +146,10 @@ これは以下の様にして実現できます。

    -
  • +
  • MaxRequestsPerChild の値を 0 に設定する
    • -
  • +
  • MaxSpareThreads の値を MaxClients と同じ値にする
    • diff --git a/docs/manual/mod/worker.html.tr.utf8 b/docs/manual/mod/worker.html.tr.utf8 index 8406fe44298..da6b87cc784 100644 --- a/docs/manual/mod/worker.html.tr.utf8 +++ b/docs/manual/mod/worker.html.tr.utf8 @@ -125,7 +125,7 @@ ayarlanması iptal edilerek bu gibi durumlara karşı önlem alınabilir:

      -
    • MaxRequestsPerChild +
    • MaxRequestsPerChild yönergesinin değeri sıfır yapılır.
    • MaxSpareThreads ve diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index 0b1b63a564e..a98bc344a63 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -593,7 +593,7 @@ URI in request' warnings.

      S|skip

      The [S] flag is used to skip rules that you don't want to run. The syntax of the skip flag is [S=N], where N signifies -the number of rules to skip (provided the +the number of rules to skip (provided the RewriteRule matches). This can be thought of as a goto statement in your rewrite ruleset. In the following example, we only want to run the RewriteRule if the diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en index d14a0a5d0fc..83c10c12586 100644 --- a/docs/manual/vhosts/fd-limits.html.en +++ b/docs/manual/vhosts/fd-limits.html.en @@ -89,7 +89,7 @@ statistical analysis of the various virtual hosts. This can be accomplished in the following manner.

      First, you will need to add the virtual host information to the log -entries. This can be done using the +entries. This can be done using the LogFormat directive, and the %v variable. Add this to the beginning of your log format string:

      diff --git a/docs/manual/vhosts/fd-limits.html.fr b/docs/manual/vhosts/fd-limits.html.fr index 6c2ebd82581..57188af442a 100644 --- a/docs/manual/vhosts/fd-limits.html.fr +++ b/docs/manual/vhosts/fd-limits.html.fr @@ -99,7 +99,7 @@ de la mani

      Tout d'abord, vous devez ajouter le nom du serveur virtuel à chaque entrée du journal. Ceci se paramètre au moyen de la directive - LogFormat et de la + LogFormat et de la variable %v. Ajoutez cette variable au début de la chaîne de définition du format de journalisations :

      @@ -112,7 +112,7 @@ CustomLog logs/multiple_vhost_log vhost journalisation au format standard (CLF : 'Common Log Format'), mais dont chaque ligne débutera par le nom canonique du serveur virtuel (spécifié par la directive ServerName). -(Voir Formats de journalisation +(Voir Formats de journalisation personnalisés pour d'autres informations sur la personnalisation des fichiers journaux.)