From: André Malo Date: Sat, 1 Feb 2014 22:57:40 +0000 (+0000) Subject: update transformation X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c727dc100b589ca25f4a796bd11063897d17a846;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1563505 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index ebe54e15fa3..0dc4e7c6c69 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -205,8 +205,8 @@ by other LDAP modules

Using SSL

The ability to create an SSL connections to an LDAP server - is defined by the directives - LDAPTrustedCA and + is defined by the directives + LDAPTrustedCA and LDAPTrustedCAType. These directives specify the certificate file or database and the certificate type. Whenever the LDAP url includes ldaps://, mod_ldap will establish diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index 331dff316c5..a912f992289 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -698,7 +698,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.

With the perchild MPM, use this directive only if you need to set NumServers higher than 8 (default).

diff --git a/docs/manual/mod/mpm_common.html.es b/docs/manual/mod/mpm_common.html.es index a47b53225a8..99d6614de25 100644 --- a/docs/manual/mod/mpm_common.html.es +++ b/docs/manual/mod/mpm_common.html.es @@ -772,7 +772,7 @@ Apache MaxClients y ThreadsPerChild precisan más de 16 procesos del servidor (valor por defecto). No especifique en esta directiva un valor mayor que el número de procesos del servidor - requeridos por lo especificado en las directivas MaxClients y ThreadsPerChild.

+ requeridos por lo especificado en las directivas MaxClients y ThreadsPerChild.

Con el MPM perchild, use esta directiva solo si tiene que especificar en la directiva NumServers un valor mayor de 8 (el diff --git a/docs/manual/mod/mpm_common.html.ja.utf8 b/docs/manual/mod/mpm_common.html.ja.utf8 index 185fd17c3d2..e2d6fa46dc4 100644 --- a/docs/manual/mod/mpm_common.html.ja.utf8 +++ b/docs/manual/mod/mpm_common.html.ja.utf8 @@ -745,7 +745,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 82d9e9a37fc..d5895b22c94 100644 --- a/docs/manual/mod/mpm_common.html.tr.utf8 +++ b/docs/manual/mod/mpm_common.html.tr.utf8 @@ -703,7 +703,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 fd5a0e3f998..05d154e998f 100644 --- a/docs/manual/mod/worker.html.en +++ b/docs/manual/mod/worker.html.en @@ -107,17 +107,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 @@ -135,10 +135,10 @@ uses the following:

diff --git a/docs/manual/mod/worker.html.es b/docs/manual/mod/worker.html.es index 968a67a1237..3f96515a979 100644 --- a/docs/manual/mod/worker.html.es +++ b/docs/manual/mod/worker.html.es @@ -116,17 +116,17 @@ puertos que usa Apache determinado por la directiva MaxClients. El número máximo de procesos hijo activos está determinado por el valor especificado en la directiva MaxClients dividido por el valor - especificado en la directiva + especificado en la directiva ThreadsPerChild.

Hay dos directivas que establecen límites estrictos al número de procesos hijo activos y al número de hebras del servidor en un proceso hijo, y puede cambiarse solo parando completamente el servidor y volviendo a iniciarlo. La directiva - ServerLimit marca el + ServerLimit marca el límite estricto de procesos hijo activos posibles, y debe ser mayor o igual al valor de la directiva MaxClients dividido por el valor - de la directiva + de la directiva ThreadsPerChild. El valor de la directiva ThreadLimit es el límite estricto del número de hebras del servidor, y debe ser mayor o igual al valor de la directiva ThreadsPerChild. Si los valores @@ -144,10 +144,10 @@ puertos que usa Apache siguiente manera:

diff --git a/docs/manual/mod/worker.html.ja.utf8 b/docs/manual/mod/worker.html.ja.utf8 index 8ae00480af7..2d288746ac7 100644 --- a/docs/manual/mod/worker.html.ja.utf8 +++ b/docs/manual/mod/worker.html.ja.utf8 @@ -124,10 +124,10 @@

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

    -
  • +
  • MaxRequestsPerChild の値を 0 に設定する
    • -
  • +
  • MaxSpareThreads の値を MaxClients と同じ値にする
    • diff --git a/docs/manual/mod/worker.html.tr.utf8 b/docs/manual/mod/worker.html.tr.utf8 index bd4c049e2eb..3a8d3a21f22 100644 --- a/docs/manual/mod/worker.html.tr.utf8 +++ b/docs/manual/mod/worker.html.tr.utf8 @@ -124,7 +124,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/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl index 5fbe16db166..0df06dd4e82 100644 --- a/docs/manual/style/xsl/common.xsl +++ b/docs/manual/style/xsl/common.xsl @@ -386,7 +386,7 @@