OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 18:37:37
Branch: HEAD Handle: 2007062217373600
Modified files:
openpkg-src/apache apache.base apache.spec
Log:
add support for multi-language manual browsing
Summary:
Revision Changes Path
1.23 +9 -2 openpkg-src/apache/apache.base
1.411 +0 -6 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.22 -r1.23 apache.base
--- openpkg-src/apache/apache.base 22 Jun 2007 15:20:45 -0000 1.22
+++ openpkg-src/apache/apache.base 22 Jun 2007 16:37:36 -0000 1.23
@@ -104,12 +104,19 @@
Order allow,deny
Allow from all
</Directory>
- Alias /apache-manual @l_prefix@/share/apache/manual
+ AliasMatch
^/apache-manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$
@l_prefix@/share/apache/manual$1
<Directory "@l_prefix@/share/apache/manual">
- Options Indexes MultiViews
+ Options Indexes
AllowOverride None
Order allow,deny
Allow from all
+ <Files *.html>
+ SetHandler type-map
+ </Files>
+ SetEnvIf Request_URI
^/apache-manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
+ RedirectMatch 301
^/apache-manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /apache-manual/$1$2
+ LanguagePriority en de es fr ja ko pt-br ru
+ ForceLanguagePriority Prefer Fallback
</Directory>
Alias /apache-error @l_prefix@/share/apache/error
<Directory "@l_prefix@/share/apache/error">
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.410 -r1.411 apache.spec
--- openpkg-src/apache/apache.spec 22 Jun 2007 15:25:38 -0000 1.410
+++ openpkg-src/apache/apache.spec 22 Jun 2007 16:37:36 -0000 1.411
@@ -281,12 +281,6 @@
find . -name "*.xml" -print | xargs rm -f
find . -name "*.xml.*" -print | xargs rm -f
find . -name "*.xsl" -print | xargs rm -f
- for html in `find . -name "*.html" -print`; do
- if [ -f "$html.en" ]; then
- mv $html.en $html
- rm -f $html.*
- fi
- done
rm -rf style/xsl
rm -rf style/latex
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
