Commit d96b1f98 authored by Andre Malo's avatar Andre Malo
Browse files

update config for pt-br inclusion


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124362 13f79535-47bb-0310-9956-ffa450edef68
parent 9c84be86
Loading
Loading
Loading
Loading
+4 −3
Changes for docs/conf/httpd-std.conf.in: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -574,7 +574,8 @@ ServerSignature On
    # the manual, even if you choose to move your DocumentRoot.  You may
    # comment this out if you do not care for the documentation.
    #
    AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
    AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \
        "@exp_manualdir@$1"

    <Directory "@exp_manualdir@">
        Options Indexes
@@ -586,8 +587,8 @@ ServerSignature On
            SetHandler type-map
        </Files>

        SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
        RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
        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
    </Directory>

    #
+4 −3
Changes for docs/conf/httpd-win.conf: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ Alias /icons/ "@@ServerRoot@@/icons/"
# the manual, even if you choose to move your DocumentRoot.  You may comment
# this out if you do not care for the documentation.
#
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ \
    "@@ServerRoot@@/manual$1"

<Directory "@@ServerRoot@@/manual">
    Options Indexes
@@ -550,8 +551,8 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$
        SetHandler type-map
    </Files>

    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
    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
</Directory>

#