Merge pull request #9 from simonwelsh/patch-1

FIX Map sapphire to framework
This commit is contained in:
Ingo Schommer 2012-09-18 03:45:23 -07:00
commit cb5010c652

View File

@ -323,9 +323,12 @@
# Legacy rewrite: Can't use 'master' as it confuses api.ss.org linking # Legacy rewrite: Can't use 'master' as it confuses api.ss.org linking
RewriteRule ^framework/en/master(.*) http://doc.silverstripe.org/framework/en/trunk$1 [R=301,L] RewriteRule ^framework/en/master(.*) http://doc.silverstripe.org/framework/en/trunk$1 [R=301,L]
# Legacy rewrite: sapphire should point to framework
RewriteRule ^sapphire(.*) http://doc.silverstripe.org/framework$1 [R=301,L]
# Changelogs are just kept up-to-date on trunk # Changelogs are just kept up-to-date on trunk
RewriteRule ^framework/en/changelogs(.*) http://doc.silverstripe.org/framework/en/trunk/changelogs/$1 [R=301,L] RewriteRule ^framework/en/changelogs(.*) http://doc.silverstripe.org/framework/en/trunk/changelogs$1 [R=301,L]
RewriteRule ^cms/en/changelogs(.*) http://doc.silverstripe.org/cms/en/trunk/changelogs/$1 [R=301,L] RewriteRule ^cms/en/changelogs(.*) http://doc.silverstripe.org/cms/en/trunk/changelogs$1 [R=301,L]
# Anything in sapphire/en/<version>/misc is redirected to trunk, the info in there is usually not version specific, # Anything in sapphire/en/<version>/misc is redirected to trunk, the info in there is usually not version specific,
# and only updated on master (e.g. contribution and coding guidelines) # and only updated on master (e.g. contribution and coding guidelines)