summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Malo <nd@apache.org>2014-02-01 22:57:40 +0000
committerAndré Malo <nd@apache.org>2014-02-01 22:57:40 +0000
commitc727dc100b589ca25f4a796bd11063897d17a846 (patch)
treef0c07f1a41e4681531b780d50aedb7184232907d
parentb3c15caf2347720dcf1a82efb2edc0577128a28c (diff)
downloadhttpd-c727dc100b589ca25f4a796bd11063897d17a846.tar.gz
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1563505 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/mod_ldap.html.en4
-rw-r--r--docs/manual/mod/mpm_common.html.en2
-rw-r--r--docs/manual/mod/mpm_common.html.es2
-rw-r--r--docs/manual/mod/mpm_common.html.ja.utf82
-rw-r--r--docs/manual/mod/mpm_common.html.tr.utf82
-rw-r--r--docs/manual/mod/worker.html.en10
-rw-r--r--docs/manual/mod/worker.html.es10
-rw-r--r--docs/manual/mod/worker.html.ja.utf88
-rw-r--r--docs/manual/mod/worker.html.tr.utf82
-rw-r--r--docs/manual/style/xsl/common.xsl2
-rw-r--r--docs/manual/vhosts/fd-limits.html.en2
11 files changed, 23 insertions, 23 deletions
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index ebe54e15fa..0dc4e7c6c6 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</td></tr>
<h2><a name="usingssltls" id="usingssltls">Using SSL</a></h2>
<p>The ability to create an SSL connections to an LDAP server
- is defined by the directives <code class="directive"><a href="#&#10; ldaptrustedca">
- LDAPTrustedCA</a></code> and <code class="directive"><a href="#&#10; ldaptrustedcatype">
+ is defined by the directives <code class="directive"><a href="#ldaptrustedca">
+ LDAPTrustedCA</a></code> and <code class="directive"><a href="#ldaptrustedcatype">
LDAPTrustedCAType</a></code>. These directives specify the certificate
file or database and the certificate type. Whenever the LDAP url
includes <em>ldaps://</em>, <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> will establish
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index 331dff316c..a912f99228 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -698,7 +698,7 @@ Apache</a></li>
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
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 <code class="directive"><a href="#maxclients ">MaxClients </a></code> and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
+ processes required by what you may want for <code class="directive"><a href="#maxclients">MaxClients </a></code> and <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
<p>With the <code class="module"><a href="../mod/perchild.html">perchild</a></code> MPM, use this directive only
if you need to set <code class="directive"><a href="../mod/perchild.html#numservers">NumServers</a></code> higher than 8 (default).</p>
diff --git a/docs/manual/mod/mpm_common.html.es b/docs/manual/mod/mpm_common.html.es
index a47b53225a..99d6614de2 100644
--- a/docs/manual/mod/mpm_common.html.es
+++ b/docs/manual/mod/mpm_common.html.es
@@ -772,7 +772,7 @@ Apache</a></li>
<code class="directive"><a href="#maxclients">MaxClients</a></code> y <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> precisan ms de 16
procesos del servidor (valor por defecto). No especifique en esta
directiva un valor mayor que el nmero de procesos del servidor
- requeridos por lo especificado en las directivas <code class="directive"><a href="#maxclients ">MaxClients </a></code> y <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
+ requeridos por lo especificado en las directivas <code class="directive"><a href="#maxclients">MaxClients </a></code> y <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>.</p>
<p>Con el MPM <code class="module"><a href="../mod/perchild.html">perchild</a></code>, use esta directiva solo
si tiene que especificar en la directiva <code class="directive"><a href="../mod/perchild.html#numservers">NumServers</a></code> 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 185fd17c3d..e2d6fa46dc 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 がそれらの子プロセス
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
の設定で 16 サーバプロセス (デフォルト)
以上必要になる場合にのみ使用してください。希望の
- <code class="directive"><a href="#maxclients ">MaxClients </a></code> と
+ <code class="directive"><a href="#maxclients">MaxClients </a></code> と
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
とくらべて、必要となるサーバプロセス数以上に大きな値を
設定することは避けてください。</p>
diff --git a/docs/manual/mod/mpm_common.html.tr.utf8 b/docs/manual/mod/mpm_common.html.tr.utf8
index 82d9e9a37f..d5895b22c9 100644
--- a/docs/manual/mod/mpm_common.html.tr.utf8
+++ b/docs/manual/mod/mpm_common.html.tr.utf8
@@ -703,7 +703,7 @@
<code class="directive"><a href="#maxclients">MaxClients</a></code> ve
<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> ayarları 16
sunucu sürecinden (16 öntanımlıdır) fazlasını gerektiriyorsa
- ayarlayınız. Bu yönergeye <code class="directive"><a href="#maxclients&#10; ">MaxClients
+ ayarlayınız. Bu yönergeye <code class="directive"><a href="#maxclients">MaxClients
</a></code> ve <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> için gerekli gördüğünüz
sunucu süreci sayısından fazlasını atamayınız.</p>
diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en
index fd5a0e3f99..05d154e998 100644
--- a/docs/manual/mod/worker.html.en
+++ b/docs/manual/mod/worker.html.en
@@ -107,17 +107,17 @@ uses</a></li>
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> directive.
The maximum number of active child processes is determined by
the <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
- directive divided by the <code class="directive"><a href="../mod/mpm_common.html#&#10; threadsperchild">
+ directive divided by the <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
ThreadsPerChild</a></code> directive.</p>
<p>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. <code class="directive"><a href="../mod/mpm_common.html#serverlimit&#10; ">ServerLimit
+ starting it again. <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit
</a></code> is a hard limit on the number of active child
processes, and must be greater than or equal to the
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
- directive divided by the <code class="directive"><a href="../mod/mpm_common.html#&#10; threadsperchild">
+ directive divided by the <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
ThreadsPerChild</a></code> directive.
<code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> is a hard
limit of the number of server threads, and must be greater than
@@ -135,10 +135,10 @@ uses</a></li>
the following:</p>
<ul>
- <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#&#10; maxrequestsperchild">
+ <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">
MaxRequestsPerChild</a></code> to zero</li>
- <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#&#10; maxsparethreads">
+ <li>set the value of <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">
MaxSpareThreads</a></code> to the same value as
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code></li>
</ul>
diff --git a/docs/manual/mod/worker.html.es b/docs/manual/mod/worker.html.es
index 968a67a123..3f96515a97 100644
--- a/docs/manual/mod/worker.html.es
+++ b/docs/manual/mod/worker.html.es
@@ -116,17 +116,17 @@ puertos que usa Apache</a></li>
determinado por la directiva <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>. El nmero
mximo de procesos hijo activos est determinado por el
valor especificado en la directiva <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> dividido por el valor
- especificado en la directiva <code class="directive"><a href="../mod/mpm_common.html#&#10; threadsperchild">
+ especificado en la directiva <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
ThreadsPerChild</a></code>.</p>
<p>Hay dos directivas que establecen lmites estrictos al
nmero de procesos hijo activos y al nmero de hebras
del servidor en un proceso hijo, y puede cambiarse solo parando
completamente el servidor y volviendo a iniciarlo. La directiva
- <code class="directive"><a href="../mod/mpm_common.html#serverlimit ">ServerLimit </a></code> marca el
+ <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit </a></code> marca el
lmite estricto de procesos hijo activos posibles, y debe ser
mayor o igual al valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> dividido por el valor
- de la directiva <code class="directive"><a href="../mod/mpm_common.html#&#10; threadsperchild">
+ de la directiva <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
ThreadsPerChild</a></code>. El valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> es el lmite
estricto del nmero de hebras del servidor, y debe ser mayor
o igual al valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code>. Si los valores
@@ -144,10 +144,10 @@ puertos que usa Apache</a></li>
siguiente manera:</p>
<ul>
- <li>fijar el valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#&#10; maxrequestsperchild">
+ <li>fijar el valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">
MaxRequestsPerChild</a></code> a cero</li>
- <li>fijar el valor de la directiva <code class="directive"><a href="../mod/mpm_common.html# maxsparethreads"> MaxSpareThreads</a></code> al mismo valor
+ <li>fijar el valor de la directiva <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads"> MaxSpareThreads</a></code> al mismo valor
que la directiva <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code></li>
</ul>
diff --git a/docs/manual/mod/worker.html.ja.utf8 b/docs/manual/mod/worker.html.ja.utf8
index 8ae00480af..2d288746ac 100644
--- a/docs/manual/mod/worker.html.ja.utf8
+++ b/docs/manual/mod/worker.html.ja.utf8
@@ -124,10 +124,10 @@
<p>活動中の子プロセスの数と子プロセス中のサーバスレッドの数の越えられない
上限を設定するディレクティブが二つあります。これらはサーバを
完全に停止して、再起動することでしか変更することはできません。
- <code class="directive"><a href="../mod/mpm_common.html#serverlimit&#10; ">ServerLimit
+ <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit
</a></code> は活動中の子プロセスの越えられない上限を設定し、
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ディレクティブ
- の値を <code class="directive"><a href="../mod/mpm_common.html#&#10; threadsperchild">
+ の値を <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">
ThreadsPerChild</a></code> の値で割った値以上である
必要があります。<code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> は
サーバスレッドの越えられない上限で、<code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ディレクティブの
@@ -143,10 +143,10 @@
これは以下の様にして実現できます。</p>
<ul>
- <li><code class="directive"><a href="../mod/mpm_common.html#&#10; maxrequestsperchild">
+ <li><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">
MaxRequestsPerChild</a></code> の値を 0 に設定する</li>
- <li><code class="directive"><a href="../mod/mpm_common.html#&#10; maxsparethreads">
+ <li><code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">
MaxSpareThreads</a></code> の値を
<code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
と同じ値にする</li>
diff --git a/docs/manual/mod/worker.html.tr.utf8 b/docs/manual/mod/worker.html.tr.utf8
index bd4c049e2e..3a8d3a21f2 100644
--- a/docs/manual/mod/worker.html.tr.utf8
+++ b/docs/manual/mod/worker.html.tr.utf8
@@ -124,7 +124,7 @@ ayarlanması</a></li>
iptal edilerek bu gibi durumlara karşı önlem alınabilir:</p>
<ul>
- <li><code class="directive"><a href="../mod/mpm_common.html# maxrequestsperchild"> MaxRequestsPerChild</a></code>
+ <li><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild"> MaxRequestsPerChild</a></code>
yönergesinin değeri sıfır yapılır.</li>
<li><code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">MaxSpareThreads</a></code> ve
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 5fbe16db16..0df06dd4e8 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -386,7 +386,7 @@
</xsl:call-template>
<div id="footer">&lf;
<p class="apache">
- <xsl:text>Copyright 2014 The Apache Software Foundation.</xsl:text><br />
+ <xsl:text>Copyright 2013 The Apache Software Foundation.</xsl:text><br />
<xsl:if test="normalize-space($message[@id='before-license'])">
<xsl:value-of select="$message[@id='before-license']"/>
<xsl:text> </xsl:text>
diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en
index 2f7fcf912d..c082ab59c5 100644
--- a/docs/manual/vhosts/fd-limits.html.en
+++ b/docs/manual/vhosts/fd-limits.html.en
@@ -92,7 +92,7 @@ statistical analysis of the various virtual hosts. This can be
accomplished in the following manner.</p>
<p>First, you will need to add the virtual host information to the log
-entries. This can be done using the <code class="directive"><a href="../mod/mod_log_config.html#&#10;logformat">
+entries. This can be done using the <code class="directive"><a href="../mod/mod_log_config.html#logformat">
LogFormat</a></code>
directive, and the <code>%v</code> variable. Add this to the beginning
of your log format string:</p>