Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 35978 invoked from network); 15 Aug 2004 23:43:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Aug 2004 23:43:58 -0000 Received: (qmail 88430 invoked by uid 500); 15 Aug 2004 23:43:57 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 88394 invoked by uid 500); 15 Aug 2004 23:43:57 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 88380 invoked by uid 500); 15 Aug 2004 23:43:57 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 88374 invoked by uid 99); 15 Aug 2004 23:43:57 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sun, 15 Aug 2004 16:43:57 -0700 Received: (qmail 35961 invoked by uid 1569); 15 Aug 2004 23:43:56 -0000 Date: 15 Aug 2004 23:43:56 -0000 Message-ID: <20040815234356.35960.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/docs/conf httpd-std.conf.in httpd-win.conf X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2004/08/15 16:43:56 Modified: docs/conf Tag: APACHE_2_0_BRANCH httpd-std.conf.in httpd-win.conf Log: simplify configuration Revision Changes Path No revision No revision 1.27.2.21 +1 -7 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.20 retrieving revision 1.27.2.21 diff -u -u -r1.27.2.20 -r1.27.2.21 --- httpd-std.conf.in 24 Apr 2004 18:13:43 -0000 1.27.2.20 +++ httpd-std.conf.in 15 Aug 2004 23:43:56 -0000 1.27.2.21 @@ -574,13 +574,7 @@ SetHandler type-map - SetEnvIf Request_URI ^/manual/de/ prefer-language=de - SetEnvIf Request_URI ^/manual/en/ prefer-language=en - SetEnvIf Request_URI ^/manual/es/ prefer-language=es - 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 + 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 1.75.2.20 +1 -7 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.19 retrieving revision 1.75.2.20 diff -u -u -r1.75.2.19 -r1.75.2.20 --- httpd-win.conf 24 Apr 2004 18:13:43 -0000 1.75.2.19 +++ httpd-win.conf 15 Aug 2004 23:43:56 -0000 1.75.2.20 @@ -500,13 +500,7 @@ SetHandler type-map - SetEnvIf Request_URI ^/manual/de/ prefer-language=de - SetEnvIf Request_URI ^/manual/en/ prefer-language=en - SetEnvIf Request_URI ^/manual/es/ prefer-language=es - 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 + 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