From d2cc6894f05a644c8cdbff791bbc36573aa5e1c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Tue, 28 Jan 2014 23:04:45 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1562304 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/misc/perf-scaling.html.en | 57 +++++++++---------- docs/manual/mod/core.html.en | 12 ++-- docs/manual/mod/core.html.fr | 2 + docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_proxy.html.en | 2 +- docs/manual/mod/mod_proxy.html.fr | 2 + docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/mod_rewrite.html.en | 6 +- docs/manual/mod/mod_rewrite.html.fr | 2 + docs/manual/mod/mod_rewrite.xml.fr | 2 +- docs/manual/mod/mod_rewrite.xml.meta | 2 +- docs/manual/mod/mpmt_os2.html.en | 4 +- docs/manual/platform/netware.html.en | 19 ++++--- docs/manual/platform/netware.xml.ko | 2 +- .../manual/programs/log_server_status.html.en | 10 +--- docs/manual/programs/split-logfile.html.en | 10 +--- docs/manual/rewrite/advanced.html.en | 6 +- docs/manual/sitemap.html.en | 37 +++++++++--- docs/manual/sitemap.html.fr | 2 + docs/manual/sitemap.xml.de | 2 +- docs/manual/sitemap.xml.es | 2 +- docs/manual/sitemap.xml.fr | 2 +- docs/manual/sitemap.xml.ja | 2 +- docs/manual/sitemap.xml.ko | 2 +- docs/manual/sitemap.xml.meta | 2 +- docs/manual/sitemap.xml.tr | 2 +- docs/manual/sitemap.xml.zh-cn | 2 +- 34 files changed, 113 insertions(+), 98 deletions(-) diff --git a/docs/manual/misc/perf-scaling.html.en b/docs/manual/misc/perf-scaling.html.en index cf8b599748..307694aea9 100644 --- a/docs/manual/misc/perf-scaling.html.en +++ b/docs/manual/misc/perf-scaling.html.en @@ -5,8 +5,7 @@ This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> -Performance Scaling - - Apache HTTP Server +Performance Scaling - Apache HTTP Server @@ -20,8 +19,7 @@
<-
-Apache > HTTP Server > Documentation > Version 2.5

Performance Scaling

Available Languages:  en 

@@ -762,7 +760,7 @@ Swap: 3903784 12540 3891244 MPM runs a smaller number of child processes, and spawns multiple request handling threads within each child process. In 2.4 MPMs are no longer hard-wired. They too can be exchanged - via LoadModule. + via LoadModule. The default MPM in 2.4 is the event MPM.

The maximum number of workers, be they pre-forked child @@ -777,7 +775,7 @@ Swap: 3903784 12540 3891244

Finally, if the httpd server in question is not executing any third-party code, via mod_php, mod_perl or similar, - we recommend the use of mpm_event. This MPM is ideal + we recommend the use of mpm_event. This MPM is ideal for situations where httpd serves as a thin layer between clients and backend servers doing the real job, such as a proxy or cache.

@@ -787,8 +785,7 @@ Swap: 3903784 12540 3891244

- The MaxClients - + The MaxClients directive in your Apache httpd configuration file specifies the maximum number of workers your server can create. It has two related directives, MinSpareServers @@ -814,8 +811,7 @@ Swap: 3903784 12540 3891244 complicated. Threaded MPMs support the ThreadsPerChild - directive1 . Apache requires that MaxClients - + directive1 . Apache requires that MaxClients is evenly divisible by ThreadsPerChild .If you set either directive to a number that doesn't @@ -823,10 +819,8 @@ Swap: 3903784 12540 3891244 complaint to the error log and adjust the ThreadsPerChild - value downwards until it is an even factor of - MaxClients - - . + value downwards until it is an even factor of + MaxClients.

@@ -838,7 +832,7 @@ Swap: 3903784 12540 3891244 that all the memory on your system is used, but no more. If your system gets so overloaded that it needs to heavily swap core memory out to disk, performance will degrade - quickly. The formula for determining MaxClients + quickly. The formula for determining MaxClients is fairly simple:

@@ -1387,21 +1381,22 @@ Listen *:8001

- The Apache Software Foundation Wiki is served by MoinMoin. - MoinMoin is written in Python and runs as a CGI. To date, any - attempts to run it under mod_python has been unsuccessful. - The CGI proved to place an untenably high load on the - server machine, especially when the Wiki was being indexed - by search engines like Google. To lighten the load on the - server machine, the Apache Infrastructure team turned to - mod_cache. It turned out MoinMoin - - needed a small patch to ensure proper behavior behind the - caching server: certain requests can never be cached and - the corresponding Python modules were patched to send the - proper HTTP response headers. After this modification, the - cache in front of the Wiki was enabled with the following - configuration snippet in httpd.conf: + The Apache Software Foundation Wiki is served by + MoinMoin. MoinMoin is written in Python and runs as + a CGI. To date, any attempts to run it under + mod_python has been unsuccessful. The CGI proved to + place an untenably high load on the server machine, + especially when the Wiki was being indexed by search + engines like Google. To lighten the load on the + server machine, the Apache Infrastructure team + turned to mod_cache. It turned out MoinMoin needed a + small patch to ensure proper behavior behind the + caching server: certain requests can never be cached + and the corresponding Python modules were patched to + send the proper HTTP response headers. After this + modification, the cache in front of the Wiki was + enabled with the following configuration snippet in + httpd.conf: 

@@ -1416,7 +1411,7 @@ CacheMaxExpire 21600
                 
                 
This configuration will try to cache any and all content
                     within its virtual host. It will never cache content for
-                    more than six hours (the CacheMaxExpire
+                    more than six hours (the CacheMaxExpire
                     directive). If no Expires:
                     header is present in the response, mod_cache will compute
                     an expiration period from the Last-Modified:
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 8d93301c42..073af6b347 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -974,7 +974,7 @@ the contents of file-system directories matching a regular expression.
     
From 2.4.8 onwards, named groups and backreferences are captured and
     written to the environment with the corresponding name prefixed with
     "MATCH_" and in upper case. This allows elements of paths to be referenced
-    from within expressions and modules like
+    from within expressions and modules like
     mod_rewrite. In order to prevent confusion, numbered
     (unnamed) backreferences are ignored. Use named groups instead.

 
@@ -1821,14 +1821,14 @@ filenames
     
From 2.4.8 onwards, named groups and backreferences are captured and
     written to the environment with the corresponding name prefixed with
     "MATCH_" and in upper case. This allows elements of files to be referenced
-    from within expressions and modules like
+    from within expressions and modules like
     mod_rewrite. In order to prevent confusion, numbered
     (unnamed) backreferences are ignored. Use named groups instead.

 
 
-<FileMatch ^(?<sitename>[^/]+)>
+<FilesMatch ^(?<sitename>[^/]+)>
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
-</FileMatch>
+</FilesMatch>
 

 
 
@@ -1990,7 +1990,7 @@ satisfied by a request at runtime
     documentation is available in Expressions in
     Apache HTTP Server.

 
-    
Only directives that support the directory context can be used within this configuration section.

+    
Only directives that support the directory context can be used within this configuration section.

 
 
 
See also

@@ -2794,7 +2794,7 @@ matching URLs
     
From 2.4.8 onwards, named groups and backreferences are captured and
     written to the environment with the corresponding name prefixed with
     "MATCH_" and in upper case. This allows elements of URLs to be referenced
-    from within expressions and modules like
+    from within expressions and modules like
     mod_rewrite. In order to prevent confusion, numbered
     (unnamed) backreferences are ignored. Use named groups instead.

 
diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr
index 7d368d3f6c..2dc907c2b4 100644
--- a/docs/manual/mod/core.html.fr
+++ b/docs/manual/mod/core.html.fr
@@ -31,6 +31,8 @@
  ja  |
  tr 
+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
Statut:Core
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 12f2132041..8aa896f930 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 0f4cefb531..5412b51b13 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 58cfa2e548..81b6814283 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mpmt_os2.html.en b/docs/manual/mod/mpmt_os2.html.en index 5c032c15af..622239a1be 100644 --- a/docs/manual/mod/mpmt_os2.html.en +++ b/docs/manual/mod/mpmt_os2.html.en @@ -49,7 +49,7 @@

Directives

See also

    diff --git a/docs/manual/platform/netware.html.en b/docs/manual/platform/netware.html.en index 0c38930f25..aa5b5a0405 100644 --- a/docs/manual/platform/netware.html.en +++ b/docs/manual/platform/netware.html.en @@ -32,14 +32,15 @@ bug reporting page.

    -

    The bug reporting page and dev-httpd mailing list are not - provided to answer questions about configuration or running Apache. - Before you submit a bug report or request, first consult this document, the - Frequently Asked Questions page and the other - relevant documentation topics. If you still have a question or problem, - post it to the - novell.devsup.webserver newsgroup, where many Apache users are more than - willing to answer new and obscure questions about using Apache on NetWare.

    +

    The bug reporting page and dev-httpd mailing list are + not provided to answer questions about configuration or + running Apache. Before you submit a bug report or request, first + consult this document, the Frequently Asked + Questions page and the other relevant documentation topics. If + you still have a question or problem, post it to the + novell.devsup.webserver newsgroup, where many Apache users are + more than willing to answer new and obscure questions about using + Apache on NetWare.

    Most of this document assumes that you are installing Apache from a binary distribution. If you want to compile Apache @@ -327,7 +328,7 @@

    Apache is configured by reading configuration files usually stored in the conf directory. These are the same as files used to configure the Unix version, but there are a few different directives for - Apache on NetWare. See the Apache + Apache on NetWare. See the Apache module documentation for all the available directives.

    The main differences in Apache for NetWare are:

    diff --git a/docs/manual/platform/netware.xml.ko b/docs/manual/platform/netware.xml.ko index 4a52341733..90092cb7b9 100644 --- a/docs/manual/platform/netware.xml.ko +++ b/docs/manual/platform/netware.xml.ko @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja index 66689d2e38..379c81a9ed 100644 --- a/docs/manual/sitemap.xml.ja +++ b/docs/manual/sitemap.xml.ja @@ -1,7 +1,7 @@ - + + + +