From: Jim Jagielski
Date: Mon, 24 Sep 2012 21:02:40 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~6267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92f1d1458f4cc07c5faa05ff3c657749545ebcf6;p=thirdparty%2Fapache%2Fhttpd.git
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389580 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 59bf30baedf..22385ded656 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -341,10 +341,25 @@ Header merge Cache-Control no-store env=NO_STORE
headers are sent on the wire. This is a measure of the duration
of the request. The value is preceded by D=
.
The value is measured in microseconds.
-%{VARNAME}e |
+
%l |
+ The current load averages of the actual server itself. It is
+ designed to expose the values obtained by getloadavg()
+ and this represents the current load average, the 5 minute average, and
+ the 15 minute average. The value is preceded by l= with each
+ average separated by / .
+ |
+%i |
+ The current idle percentage of httpd (0 to 100) based on available
+ processes and threads. The value is preceded by i= .
+ |
+%b |
+ The current busy percentage of httpd (0 to 100) based on available
+ processes and threads. The value is preceded by b= .
+ |
+%{VARNAME}e |
The contents of the environment
variable VARNAME . |
-%{VARNAME}s |
+
%{VARNAME}s |
The contents of the SSL environment
variable VARNAME , if mod_ssl is enabled. |
diff --git a/docs/manual/mod/mod_headers.html.fr b/docs/manual/mod/mod_headers.html.fr
index da4318e1fe9..921f8b35140 100644
--- a/docs/manual/mod/mod_headers.html.fr
+++ b/docs/manual/mod/mod_headers.html.fr
@@ -29,6 +29,8 @@
ja |
ko
+Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.
Description: | Personnalisation des en-têtes de requêtes et de réponses
HTTP |
Statut: | Extension |
diff --git a/docs/manual/mod/mod_headers.xml.fr b/docs/manual/mod/mod_headers.xml.fr
index 916ec120b11..d660cfb14e5 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 0447c8f4be3..72e28198b23 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_ldap.xml.meta b/docs/manual/mod/mod_ldap.xml.meta
index 92fe318361b..c8ca8412817 100644
--- a/docs/manual/mod/mod_ldap.xml.meta
+++ b/docs/manual/mod/mod_ldap.xml.meta
@@ -8,6 +8,6 @@
en
- fr
+ fr
diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index 24b1e5eafaa..4310f9e0369 100644
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -1451,7 +1451,7 @@ redondant)
Dans une configuration de niveau répertoire pour
/chemin
- (/chemin/physique/vers/chemin/.htacccess
, avec
+ (/chemin/physique/vers/chemin/.htaccess
, avec
RewriteBase /chemin
)
pour la requête ``GET
/chemin/chemin-local/infochemin
'':