httpd-docs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rich Bowen <rbo...@rcbowen.com>
Subject Re: Broken language links in "/current/" httpd docs
Date Wed, 25 Aug 2010 19:57:35 GMT
Looks right to me.

On Aug 25, 2010, at 3:50 PM, Ruediger Pluem wrote:

>
>
> On 08/25/2010 12:39 PM, Tony Stevenson wrote:
>> On Wed, Aug 25, 2010 at 12:33:46PM +0200, Rainer Jung wrote:
>>> Hi Infra,
>>>
>>> there's a BZ 49818 about broken language links on
>>>
>>> http://httpd.apache.org/docs/current/
>>>
>>> It seems the feature "current" docs was introduced in the live
>>> config by Tony end of July in revisions 775995 and 775996 of the
>>> infra repos.
>>>
>>> I don't know by which means the language links are handled at the
>>> moment in the web server config, but it only works for "/trunk/" and
>>> the normal versions "/2.0/" and "/2.2/".
>>
>>
>> I'l take a look. Thanks.
>
> I guess the following patch will fix this:
>
>
> Index: httpd.apache.org.conf
> ===================================================================
> --- httpd.apache.org.conf       (Revision 776334)
> +++ httpd.apache.org.conf       (Arbeitskopie)
> @@ -14,10 +14,10 @@
>    </Directory>
>
>   # virtualize the language sub"directories"
> -  AliasMatch ^(/docs/(?:2\.[0-3]|trunk))(?:/(?:de|en|es|fr|ja|ko|pt- 
> br|ru|tr))?(/.*)?$ \
> +  AliasMatch ^(/docs/(?:2\.[0-3]|trunk|current))(?:/(?:de|en|es|fr| 
> ja|ko|pt-br|ru|tr))?(/.*)?$ \
>       /x1/www/httpd.apache.org$1$2
>
> -  <DirectoryMatch "/x1/www/httpd.apache.org/docs/(2\..|trunk)">
> +  <DirectoryMatch "/x1/www/httpd.apache.org/docs/(2\.[0-3]|trunk)">
>     Options -Multiviews
>     <Files *.html>
>         SetHandler type-map
> @@ -28,11 +28,11 @@
>     </Files>
>
>     # Tell mod_negotiation which language to prefer
> -    SetEnvIf Request_URI   ^/docs/(?:2\..|trunk)/(de|en|es|fr|ja|ko| 
> pt-br|ru|tr)/ \
> +    SetEnvIf Request_URI   ^/docs/(?:2\.[0-3]|trunk|current)/(de|en| 
> es|fr|ja|ko|pt-br|ru|tr)/ \
>         prefer-language=$1
>
>     # Deal with language switching (/docs/2.0/de/en/... -> /docs/2.0/ 
> en/...)
> -    RedirectMatch 301 ^(/docs/(?:2\..|trunk))(?:/(de|en|es|fr|ja|ko| 
> pt-br|ru|tr)){2,}(/.*)?$ \
> +    RedirectMatch 301 ^(/docs/(?:2\.[0-3]|trunk|current))(?:/(de|en| 
> es|fr|ja|ko|pt-br|ru|tr)){2,}(/.*)?$ \
>         $1/$2$3
>   </DirectoryMatch>
>
>
> Regards
>
> RĂ¼diger
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
> For additional commands, e-mail: docs-help@httpd.apache.org
>

--
Rich Bowen
rbowen@rcbowen.com




---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org


Mime
View raw message