From 021117077bb73927fe5a2456f899c0be13586a30 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 17 Feb 2012 11:40:10 +0000
Subject: [PATCH] MINOR Simplified /misc redirection

git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@122181 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .htaccess      |  9 +++++----
 .htaccess_live | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index 185ba2b..81f8a53 100644
--- a/.htaccess
+++ b/.htaccess
@@ -323,10 +323,11 @@
 	RewriteRule ^sapphire/en/changelogs(.*) http://doc.silverstripe.org/sapphire/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 ^sapphire/en/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
-  RewriteRule ^sapphire/en/[^/]*/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$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 ^sapphire/en/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^sapphire/en/2.3/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^sapphire/en/2.4/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/.htaccess_live b/.htaccess_live
index 7cacf14..56cff63 100644
--- a/.htaccess_live
+++ b/.htaccess_live
@@ -321,11 +321,12 @@
 	# Changelogs are just kept up-to-date on trunk
 	RewriteRule ^sapphire/en/changelogs(.*) http://doc.silverstripe.org/sapphire/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 ^sapphire/en/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
-  RewriteRule ^sapphire/en/[^/]*/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$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 ^sapphire/en/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^sapphire/en/2.3/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^sapphire/en/2.4/misc/?(.*) http://doc.silverstripe.org/sapphire/en/trunk/misc/$1 [R=301,L]
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
@@ -347,5 +348,5 @@ ExpiresByType application/javascript "access plus 7 days"
 </IfModule>
 
 <IfModule mod_deflate.c>
-  SetOutputFilter DEFLATE
+	SetOutputFilter DEFLATE
 </IfModule>