summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2011-11-08 22:58:14 +0000
committerRainer Jung <rjung@apache.org>2011-11-08 22:58:14 +0000
commitb4ca82bac7ae595a41e2ad6b9191ef44000fca60 (patch)
tree29a27cdaad55dc522356317574a389c6d055659b /docs
parenta90ae4579d90137464edf3877a865cc4d406be80 (diff)
downloadhttpd-b4ca82bac7ae595a41e2ad6b9191ef44000fca60.tar.gz
Update docs for default TimeOut value for
other languages. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs')
-rw-r--r--docs/manual/mod/core.xml.de4
-rw-r--r--docs/manual/mod/core.xml.es2
-rw-r--r--docs/manual/mod/core.xml.fr2
-rw-r--r--docs/manual/mod/core.xml.ja2
-rw-r--r--docs/manual/mod/core.xml.tr2
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index d3a16fb0e8..8f2f7e55b1 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -3194,7 +3194,7 @@ verarbeiten</description>
<description>Zeitspanne, die der Server auf verschiedene Ereignisse wartet,
bevor er die Anfrage abbricht</description>
<syntax>TimeOut <var>Sekunden</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
<contextlist><context>server config</context></contextlist>
<usage>
@@ -3218,7 +3218,7 @@ bevor er die Anfrage abbricht</description>
meisten Situationen ben&ouml;tigt wird. Die Voreinstellung wurde nicht
weiter herabgesetzt, da gelegentlich noch Stellen im Code existieren
k&ouml;nnen, wo der Zeitgeber nicht zur&uuml;ckgesetzt wird, wenn ein
- Paket verschickt wird.</p>
+ Paket verschickt wird. Seit Apache 2.4 ist die Voreinstellung 60.</p>
</usage>
</directivesynopsis>
diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 86e3793afa..48316e5d31 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -3785,7 +3785,7 @@ server</description>
<description>Amount of time the server will wait for
certain events before failing a request</description>
<syntax>TimeOut <var>seconds</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
<contextlist><context>server config</context><context>virtual host</context></contextlist>
<usage>
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 8e1901a3d0..8d24c55262 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.xml.fr
@@ -4468,7 +4468,7 @@ host</context>
<description>Temps pendant lequel le serveur va attendre certains
&eacute;v&egrave;nements avant de consid&eacute;rer qu'une requ&ecirc;te a &eacute;chou&eacute;</description>
<syntax>TimeOut <var>secondes</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
<contextlist><context>server config</context><context>virtual
host</context></contextlist>
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 8abfc29229..e103c3ff96 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -2937,7 +2937,7 @@ module="core">Directory</directive></seealso>
<description>各イベントについて、リクエストを失敗させるまでにサーバが
待つ時間を設定</description>
<syntax>TimeOut <var>seconds</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
<contextlist><context>server config</context><context>virtual host</context></contextlist>
<usage>
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index ef0bb2327e..627f8b737c 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -2981,7 +2981,7 @@ belirler.</description>
<description>Bir istek için başarısız olmadan önce belirli olayların
gerçekleşmesi için sunucunun geçmesini bekleyeceği süre.</description>
<syntax>TimeOut <var>saniye</var></syntax>
-<default>TimeOut 300</default>
+<default>TimeOut 60</default>
<contextlist><context>server config</context><context>virtual host</context>
</contextlist>