httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-std.conf.in httpd-win.conf
Date Thu, 29 May 2003 19:45:15 GMT
nd          2003/05/29 12:45:15

  Modified:    docs/conf Tag: APACHE_2_0_BRANCH httpd-std.conf.in
                        httpd-win.conf
  Log:
  adjust configuration to support the cross-language links
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.2.9  +10 -3     httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.27.2.8
  retrieving revision 1.27.2.9
  diff -u -r1.27.2.8 -r1.27.2.9
  --- httpd-std.conf.in	28 May 2003 20:45:16 -0000	1.27.2.8
  +++ httpd-std.conf.in	29 May 2003 19:45:14 -0000	1.27.2.9
  @@ -561,14 +561,21 @@
   # the manual, even if you choose to move your DocumentRoot.  You may comment
   # this out if you do not care for the documentation.
   #
  -Alias /manual "@exp_manualdir@"
  +AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
   
   <Directory "@exp_manualdir@">
  -    Options Indexes FollowSymLinks MultiViews IncludesNoExec
  -    AddOutputFilter Includes html
  +    Options Indexes FollowSymLinks MultiViews
       AllowOverride None
       Order allow,deny
       Allow from all
  +
  +    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
  +    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
  +    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
  +    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
  +    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
  +    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
  +    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
   </Directory>
   
   #
  
  
  
  1.75.2.10 +10 -3     httpd-2.0/docs/conf/httpd-win.conf
  
  Index: httpd-win.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
  retrieving revision 1.75.2.9
  retrieving revision 1.75.2.10
  diff -u -r1.75.2.9 -r1.75.2.10
  --- httpd-win.conf	28 May 2003 20:45:16 -0000	1.75.2.9
  +++ httpd-win.conf	29 May 2003 19:45:15 -0000	1.75.2.10
  @@ -488,14 +488,21 @@
   # the manual, even if you choose to move your DocumentRoot.  You may comment
   # this out if you do not care for the documentation.
   #
  -Alias /manual "@@ServerRoot@@/manual"
  +AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
   
   <Directory "@@ServerRoot@@/manual">
  -    Options Indexes FollowSymLinks MultiViews IncludesNoExec
  -    AddOutputFilter Includes html
  +    Options Indexes FollowSymLinks MultiViews
       AllowOverride None
       Order allow,deny
       Allow from all
  +
  +    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
  +    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
  +    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
  +    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
  +    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
  +    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
  +    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
   </Directory>
   
   #
  
  
  

Mime
View raw message