check in typemaps and accompanying config change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100455 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 4d2089ee843d10f3074e6898348b58645077481e..16e43ef29cb3eb5095adf07eb61bdd844ebb6ffa 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -564,11 +564,15 @@ Alias /icons/ "@exp_iconsdir@/"
 AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
 
 <Directory "@exp_manualdir@">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
 
+    <Files *.html>
+        SetHandler type-map
+    </Files>
+
     SetEnvIf Request_URI ^/manual/de/ prefer-language=de
     SetEnvIf Request_URI ^/manual/en/ prefer-language=en
     SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 50630a64ee4b5383568c9432f71584545515957d..a77b2c5b12a82ed29d6110a67f533bfd776bfd34 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -491,11 +491,15 @@ Alias /icons/ "@@ServerRoot@@/icons/"
 AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
 
 <Directory "@@ServerRoot@@/manual">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
 
+    <Files *.html>
+        SetHandler type-map
+    </Files>
+
     SetEnvIf Request_URI ^/manual/de/ prefer-language=de
     SetEnvIf Request_URI ^/manual/en/ prefer-language=en
     SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr

diff --git a/docs/manual/developer/API.html b/docs/manual/developer/API.html
new file mode 100644 (file)
index 0000000..a8a3c49
--- /dev/null
+++ b/docs/manual/developer/API.html
@@ -0,0 +1,3 @@
+URI: API.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/debugging.html b/docs/manual/developer/debugging.html
new file mode 100644 (file)
index 0000000..f7977f5
--- /dev/null
+++ b/docs/manual/developer/debugging.html
@@ -0,0 +1,3 @@
+URI: debugging.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/documenting.html b/docs/manual/developer/documenting.html
new file mode 100644 (file)
index 0000000..0731e2d
--- /dev/null
+++ b/docs/manual/developer/documenting.html
@@ -0,0 +1,3 @@
+URI: documenting.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/filters.html b/docs/manual/developer/filters.html
new file mode 100644 (file)
index 0000000..c65dc94
--- /dev/null
+++ b/docs/manual/developer/filters.html
@@ -0,0 +1,3 @@
+URI: filters.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/hooks.html b/docs/manual/developer/hooks.html
new file mode 100644 (file)
index 0000000..49fe68e
--- /dev/null
+++ b/docs/manual/developer/hooks.html
@@ -0,0 +1,3 @@
+URI: hooks.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/index.html b/docs/manual/developer/index.html
new file mode 100644 (file)
index 0000000..5f97bff
--- /dev/null
+++ b/docs/manual/developer/index.html
@@ -0,0 +1,3 @@
+URI: index.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/request.html b/docs/manual/developer/request.html
new file mode 100644 (file)
index 0000000..5477072
--- /dev/null
+++ b/docs/manual/developer/request.html
@@ -0,0 +1,3 @@
+URI: request.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/developer/thread_safety.html b/docs/manual/developer/thread_safety.html
new file mode 100644 (file)
index 0000000..02f067e
--- /dev/null
+++ b/docs/manual/developer/thread_safety.html
@@ -0,0 +1,3 @@
+URI: thread_safety.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/faq/index.html b/docs/manual/faq/index.html
new file mode 100644 (file)
index 0000000..5f97bff
--- /dev/null
+++ b/docs/manual/faq/index.html
@@ -0,0 +1,3 @@
+URI: index.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/faq/support.html b/docs/manual/faq/support.html
new file mode 100644 (file)
index 0000000..c1e7ffd
--- /dev/null
+++ b/docs/manual/faq/support.html
@@ -0,0 +1,3 @@
+URI: support.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/install.html b/docs/manual/install.html
index 8837d75224d14829ef8cb9996437a59e63ad31fe..24800faf2919537287f20a0c1d83cd71197f4e0f 100644 (file)
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -13,3 +13,7 @@ Content-type: text/html; charset=ISO-2022-JP
 URI: install.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: install.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r

diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index 089a6f54e019284134b3723817cee9028d0091fa..272c70710418a1d01a7f8a653f9f42f400ed5f1e 100644 (file)
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -13,3 +13,7 @@ Content-type: text/html; charset=ISO-2022-JP
 URI: invoking.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: invoking.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r

diff --git a/docs/manual/misc/custom_errordocs.html b/docs/manual/misc/custom_errordocs.html
new file mode 100644 (file)
index 0000000..4a06aae
--- /dev/null
+++ b/docs/manual/misc/custom_errordocs.html
@@ -0,0 +1,3 @@
+URI: custom_errordocs.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/misc/descriptors.html b/docs/manual/misc/descriptors.html
new file mode 100644 (file)
index 0000000..97d3340
--- /dev/null
+++ b/docs/manual/misc/descriptors.html
@@ -0,0 +1,3 @@
+URI: descriptors.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/misc/fin_wait_2.html b/docs/manual/misc/fin_wait_2.html
new file mode 100644 (file)
index 0000000..ade8017
--- /dev/null
+++ b/docs/manual/misc/fin_wait_2.html
@@ -0,0 +1,3 @@
+URI: fin_wait_2.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/misc/known_client_problems.html b/docs/manual/misc/known_client_problems.html
new file mode 100644 (file)
index 0000000..00276f0
--- /dev/null
+++ b/docs/manual/misc/known_client_problems.html
@@ -0,0 +1,3 @@
+URI: known_client_problems.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/misc/tutorials.html b/docs/manual/misc/tutorials.html
new file mode 100644 (file)
index 0000000..4cc3a6d
--- /dev/null
+++ b/docs/manual/misc/tutorials.html
@@ -0,0 +1,3 @@
+URI: tutorials.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index 7b79cb30543b4552f8b225fb0e2fcfdd4aeb66ed..8157bf9a3f71b1f7b8f9447cca5e581879268e07 100644 (file)
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -13,3 +13,7 @@ Content-type: text/html; charset=ISO-2022-JP
 URI: directives.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: directives.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r

diff --git a/docs/manual/mod/mod_access.html b/docs/manual/mod/mod_access.html
new file mode 100644 (file)
index 0000000..6c4d9d3
--- /dev/null
+++ b/docs/manual/mod/mod_access.html
@@ -0,0 +1,7 @@
+URI: mod_access.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1
+
+URI: mod_access.html.ja.jis
+Content-Language: ja
+Content-type: text/html; charset=ISO-2022-JP

diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html
new file mode 100644 (file)
index 0000000..5f8eff5
--- /dev/null
+++ b/docs/manual/mod/mod_auth.html
@@ -0,0 +1,7 @@
+URI: mod_auth.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1
+
+URI: mod_auth.html.ja.jis
+Content-Language: ja
+Content-type: text/html; charset=ISO-2022-JP

diff --git a/docs/manual/mod/mod_auth_anon.html b/docs/manual/mod/mod_auth_anon.html
new file mode 100644 (file)
index 0000000..e46e3c5
--- /dev/null
+++ b/docs/manual/mod/mod_auth_anon.html
@@ -0,0 +1,3 @@
+URI: mod_auth_anon.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html
new file mode 100644 (file)
index 0000000..48b4a53
--- /dev/null
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -0,0 +1,3 @@
+URI: mod_auth_dbm.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/mod/quickreference.html b/docs/manual/mod/quickreference.html
index 1f05150af45edea64d69964a214c745cb6fe2b47..6940d0448b6fec38d1c6af5d4ee641fcc9f6dd82 100644 (file)
--- a/docs/manual/mod/quickreference.html
+++ b/docs/manual/mod/quickreference.html
@@ -9,3 +9,7 @@ Content-type: text/html; charset=ISO-8859-1
 URI: quickreference.html.ja.jis
 Content-Language: ja
 Content-type: text/html; charset=ISO-2022-JP
+
+URI: quickreference.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r

diff --git a/docs/manual/mpm.html b/docs/manual/mpm.html
index 17f2ce8697a0772736f54e7cc6f1bb567f3406ae..b46300f50c367e0b3c6d15f5da6eba92327f4742 100644 (file)
--- a/docs/manual/mpm.html
+++ b/docs/manual/mpm.html
@@ -9,3 +9,7 @@ Content-type: text/html; charset=ISO-2022-JP
 URI: mpm.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: mpm.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r

diff --git a/docs/manual/programs/ab.html b/docs/manual/programs/ab.html
new file mode 100644 (file)
index 0000000..dd6e891
--- /dev/null
+++ b/docs/manual/programs/ab.html
@@ -0,0 +1,3 @@
+URI: ab.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/apxs.html b/docs/manual/programs/apxs.html
new file mode 100644 (file)
index 0000000..622d760
--- /dev/null
+++ b/docs/manual/programs/apxs.html
@@ -0,0 +1,3 @@
+URI: apxs.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/dbmmanage.html b/docs/manual/programs/dbmmanage.html
new file mode 100644 (file)
index 0000000..ff10603
--- /dev/null
+++ b/docs/manual/programs/dbmmanage.html
@@ -0,0 +1,3 @@
+URI: dbmmanage.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/htdigest.html b/docs/manual/programs/htdigest.html
new file mode 100644 (file)
index 0000000..2e37e61
--- /dev/null
+++ b/docs/manual/programs/htdigest.html
@@ -0,0 +1,3 @@
+URI: htdigest.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/htpasswd.html b/docs/manual/programs/htpasswd.html
new file mode 100644 (file)
index 0000000..14b7e9d
--- /dev/null
+++ b/docs/manual/programs/htpasswd.html
@@ -0,0 +1,3 @@
+URI: htpasswd.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/index.html b/docs/manual/programs/index.html
new file mode 100755 (executable)
index 0000000..5f97bff
--- /dev/null
+++ b/docs/manual/programs/index.html
@@ -0,0 +1,3 @@
+URI: index.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/logresolve.html b/docs/manual/programs/logresolve.html
new file mode 100644 (file)
index 0000000..ff7d3e3
--- /dev/null
+++ b/docs/manual/programs/logresolve.html
@@ -0,0 +1,3 @@
+URI: logresolve.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/other.html b/docs/manual/programs/other.html
new file mode 100755 (executable)
index 0000000..d286081
--- /dev/null
+++ b/docs/manual/programs/other.html
@@ -0,0 +1,3 @@
+URI: other.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/rotatelogs.html b/docs/manual/programs/rotatelogs.html
new file mode 100644 (file)
index 0000000..a1e1d00
--- /dev/null
+++ b/docs/manual/programs/rotatelogs.html
@@ -0,0 +1,3 @@
+URI: rotatelogs.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/programs/suexec.html b/docs/manual/programs/suexec.html
new file mode 100644 (file)
index 0000000..9de3f29
--- /dev/null
+++ b/docs/manual/programs/suexec.html
@@ -0,0 +1,3 @@
+URI: suexec.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html
index 5ae1f7c49684e0c5df20c9c5254e0f39a17ada62..4c5c24423a8b4d6de30fdb7eb71407a420f922d9 100644 (file)
--- a/docs/manual/stopping.html
+++ b/docs/manual/stopping.html
@@ -13,3 +13,7 @@ Content-type: text/html; charset=ISO-2022-JP
 URI: stopping.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: stopping.html.ru.koi8-r
+Content-Language: ru
+Content-type: text/html; charset=KOI8-r