From 3132c5b20d2168b712cb21554917203258c3632f Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Sat, 2 Dec 2017 22:28:40 +0000 Subject: [PATCH] rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816996 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/allmodules.xml | 1 - docs/manual/mod/allmodules.xml.de | 1 - docs/manual/mod/allmodules.xml.es | 1 - docs/manual/mod/allmodules.xml.fr | 1 - docs/manual/mod/allmodules.xml.ja | 1 - docs/manual/mod/allmodules.xml.ko | 1 - docs/manual/mod/allmodules.xml.tr | 1 - docs/manual/mod/allmodules.xml.zh-cn | 1 - docs/manual/mod/mod_brotli.html.en | 11 ++--------- docs/manual/mod/mod_deflate.html.fr | 2 ++ docs/manual/mod/mod_deflate.xml.fr | 2 +- docs/manual/mod/mod_deflate.xml.ja | 2 +- docs/manual/mod/mod_deflate.xml.ko | 2 +- docs/manual/mod/mod_deflate.xml.meta | 2 +- docs/manual/sitemap.html.fr | 1 + 15 files changed, 9 insertions(+), 21 deletions(-) diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index 736d51b318..7d396c08cc 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml mpm_winnt.xml worker.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 18ca8b76d8..3ac2d30a47 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml.de mpm_winnt.xml.de worker.xml.de diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 04be8a39cf..45cf4c2145 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -137,7 +137,6 @@ event.xml.es mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml mpm_winnt.xml worker.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 1bad464b74..27bf3ae7cf 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -137,7 +137,6 @@ event.xml.fr mpm_netware.xml.fr mpmt_os2.xml.fr - overrides.xml prefork.xml.fr mpm_winnt.xml.fr worker.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 890778c233..d99cd4b6b4 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml.ja mpm_winnt.xml.ja worker.xml.ja diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 74f5bb9b06..535c94fcc1 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml mpm_winnt.xml worker.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 8563d77216..de10dc5f91 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml.tr mpm_winnt.xml worker.xml.tr diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 736d51b318..7d396c08cc 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -137,7 +137,6 @@ event.xml mpm_netware.xml mpmt_os2.xml - overrides.xml prefork.xml mpm_winnt.xml worker.xml diff --git a/docs/manual/mod/mod_brotli.html.en b/docs/manual/mod/mod_brotli.html.en index 3c50a9eab1..85ee56f11a 100644 --- a/docs/manual/mod/mod_brotli.html.en +++ b/docs/manual/mod/mod_brotli.html.en @@ -156,18 +156,11 @@ content configuration like the following:

<IfModule mod_headers.c>
-    # Serve brotli compressed CSS files if they exist
+    # Serve brotli compressed CSS and JS files if they exist
     # and the client accepts brotli.
     RewriteCond "%{HTTP:Accept-encoding}" "br"
     RewriteCond "%{REQUEST_FILENAME}\.br" "-s"
-    RewriteRule "^(.*)\.css"              "$1\.css\.br" [QSA]
-
-    # Serve brotli compressed JS files if they exist
-    # and the client accepts brotli.
-    RewriteCond "%{HTTP:Accept-encoding}" "br"
-    RewriteCond "%{REQUEST_FILENAME}\.br" "-s"
-    RewriteRule "^(.*)\.js"               "$1\.js\.br" [QSA]
-
+    RewriteRule "^(.*)\.(js|css)"              "$1\.$2\.br" [QSA]
 
     # Serve correct content types, and prevent double compression.
     RewriteRule "\.css\.br$" "-" [T=text/css,E=no-brotli:1]
diff --git a/docs/manual/mod/mod_deflate.html.fr b/docs/manual/mod/mod_deflate.html.fr
index 1b98c87be0..e1cdac4a41 100644
--- a/docs/manual/mod/mod_deflate.html.fr
+++ b/docs/manual/mod/mod_deflate.html.fr
@@ -31,6 +31,8 @@
  ja  |
  ko 

 
+
Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.

 
diff --git a/docs/manual/mod/mod_deflate.xml.fr b/docs/manual/mod/mod_deflate.xml.fr
index 83117a3c05..197ceb76e5 100644
--- a/docs/manual/mod/mod_deflate.xml.fr
+++ b/docs/manual/mod/mod_deflate.xml.fr
@@ -1,7 +1,7 @@
 
-
+
 
diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja
index 5d48bf272b..c792d86236 100644
--- a/docs/manual/mod/mod_deflate.xml.ja
+++ b/docs/manual/mod/mod_deflate.xml.ja
@@ -1,7 +1,7 @@
 
-
+
+
Description:Comprime le contenu avant de le servir au
 client

 
Statut:Extension