Permalink
Browse files

Removed changelog redirection to master

It creates too much administrative overhead during
a release to do either of the following:
a) Commit changelogs to a different codebase (e.g. master when releasing 2.4)
b) Merge back 2.4 to 3.0 and master just in order to have changelogs showing.

In the end, the changelogs primarily belong into the branch
which release they're associated to, everything else can
be handled via mergebacks after the fact.
  • Loading branch information...
1 parent be9483b commit c40d0fdc678e5fea54fb7bd070f2c5bb2949f3ed @chillu chillu committed Oct 30, 2012
Showing with 0 additions and 8 deletions.
  1. +0 −4 .htaccess
  2. +0 −4 .htaccess_live
View
@@ -324,10 +324,6 @@
# 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]
- # 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 ^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,
# and only updated on master (e.g. contribution and coding guidelines)
RewriteRule ^framework/en/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]
View
@@ -327,10 +327,6 @@
# 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
- 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]
-
# 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)
RewriteRule ^framework/en/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]

0 comments on commit c40d0fd

Please sign in to comment.