- PLD merge

[packages/apache.git] / apache-manual.conf

diff --git a/apache-manual.conf b/apache-manual.conf
index 77edb70db0a83efa3935a00837a09c285baf2fa7..709d97f229366b73af61399d5b8037614647ffb2 100644 (file)
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -5,9 +5,10 @@
 #  http://httpd.apache.org/docs/2.2/
 #
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
+#                   mod_setenvif, mod_negotiation
 #
 
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/httpd/manual$1"
+AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/home/services/httpd/manual$1"
 
 <Directory "/home/services/httpd/manual">
        Options Indexes
@@ -17,10 +18,16 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/h
        <Files *.html>
                SetHandler type-map
        </Files>
+       # .tr is text/troff in mime.types!
+       <Files *.html.tr.utf8>
+               ForceType text/html
+       </Files>
+
+       AddLanguage da .da
 
-       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
-       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
+       SetEnvIf Request_URI ^/manual/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)/ prefer-language=$
+       RedirectMatch 301 ^/manual(?:/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)){2,}(/.*)?$ /manual/$1$2
 
-       LanguagePriority en de es fr ja ko pt-br ru 
+       LanguagePriority en da de es fr ja ko pt-br ru tr
        ForceLanguagePriority Prefer Fallback
 </Directory>