diff --git a/.htaccess b/.htaccess
index f2dbe26..5b251bd 100644
--- a/.htaccess
+++ b/.htaccess
@@ -11,6 +11,11 @@
 
 <IfModule mod_rewrite.c>
 	RewriteEngine On
+
+	# Legacy rewrite from sapphire/ to framework/ namespace
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_URI} !^sapphire/main\.php
+	RewriteRule ^sapphire/?(.*) http://doc.silverstripe.org/framework/$1 [R=301,L]
 	
 	# DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id=<pagename>
 	# to /pagename, which can then be matched by the legacy rewrite rules further down
@@ -22,63 +27,63 @@
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_URI} !\.(css|gif|ico|jpg|js|png|swf|txt)$
-	#RewriteRule ^execution-pipeline$ http://doc.silverstripe.org/sapphire/en/reference/ [R=301,L]
+	#RewriteRule ^execution-pipeline$ http://doc.silverstripe.org/framework/en/reference/ [R=301,L]
 		
 	RewriteRule ^arraydata$ http://api.silverstripe.org/search/lookup/?q=ArrayData&module=sapphire [R=301,L]
 	RewriteRule ^autocompletefield$ http://api.silverstripe.org/search/lookup/?q=AutocompleteField&module=sapphire [R=301,L]
-	RewriteRule ^bbcode$ http://doc.silverstripe.org/sapphire/en/reference/ [R=301,L]
-	RewriteRule ^building-for-modularity$ http://doc.silverstripe.org/sapphire/en/topics/module-development [R=301,L]
-	RewriteRule ^built-in-page-controls$ http://doc.silverstripe.org/sapphire/en/reference/built-in-page-controls [R=301,L]
+	RewriteRule ^bbcode$ http://doc.silverstripe.org/framework/en/reference/ [R=301,L]
+	RewriteRule ^building-for-modularity$ http://doc.silverstripe.org/framework/en/topics/module-development [R=301,L]
+	RewriteRule ^built-in-page-controls$ http://doc.silverstripe.org/framework/en/reference/built-in-page-controls [R=301,L]
 	RewriteRule ^cache-control$ http://wiki.silverstripe.org/howto:cache-control [R=301,L]
-	RewriteRule ^casting$ http://doc.silverstripe.org/sapphire/en/topics/data-types [R=301,L]
+	RewriteRule ^casting$ http://doc.silverstripe.org/framework/en/topics/data-types [R=301,L]
 	RewriteRule ^checkboxfield$ http://api.silverstripe.org/search/lookup/?q=CheckboxField&module=sapphire [R=301,L]
 	RewriteRule ^checkboxsetfield$ http://api.silverstripe.org/search/lookup/?q=CheckboxSetField&module=sapphire [R=301,L]
 	RewriteRule ^checkoutpagetest$ http://doc.silverstripe.org/old/checkoutpagetest [R=301,L]
-	RewriteRule ^cmsmain$ http://doc.silverstripe.org/sapphire/en/topics/extending-the-cms [R=301,L]
+	RewriteRule ^cmsmain$ http://doc.silverstripe.org/framework/en/topics/extending-the-cms [R=301,L]
 	RewriteRule ^cmsmenu$ http://api.silverstripe.org/search/lookup/?q=CMSMenu&module=sapphire [R=301,L]
-	RewriteRule ^common-problems$ http://doc.silverstripe.org/sapphire/en/installation/common-problems [R=301,L]
+	RewriteRule ^common-problems$ http://doc.silverstripe.org/framework/en/installation/common-problems [R=301,L]
 	RewriteRule ^community_run_third_party_websites$ http://doc.silverstripe.org/old/community_run_third_party_websites [R=301,L]
-	RewriteRule ^complextablefield$ http://doc.silverstripe.org/sapphire/en/reference/complextablefield [R=301,L]
+	RewriteRule ^complextablefield$ http://doc.silverstripe.org/framework/en/reference/complextablefield [R=301,L]
 	RewriteRule ^complextablefieldexamples$ http://doc.silverstripe.org/old/complextablefieldexamples [R=301,L]
 	RewriteRule ^compositefield$ http://api.silverstripe.org/search/lookup/?q=CompositeField&module=sapphire [R=301,L]
-	RewriteRule ^configuration$ http://doc.silverstripe.org/sapphire/en/topics/configuration [R=301,L]
+	RewriteRule ^configuration$ http://doc.silverstripe.org/framework/en/topics/configuration [R=301,L]
 	RewriteRule ^contentdeliverynetworkissues$ http://doc.silverstripe.org/old/contentdeliverynetworkissues [R=301,L]
 	RewriteRule ^contentnegotiator$ http://api.silverstripe.org/search/lookup/?q=ContentNegotiator&module=sapphire [R=301,L]
 	RewriteRule ^contributors$ http://doc.silverstripe.org/old/contributors [R=301,L]
-	RewriteRule ^contributing$ http://doc.silverstripe.org/sapphire/en/misc/contributing [R=301,L]
-	RewriteRule ^controller$ http://doc.silverstripe.org/sapphire/en/topics/controller [R=301,L]
-	RewriteRule ^controllers$ http://doc.silverstripe.org/sapphire/en/topics/controller [R=301,L]
-	RewriteRule ^creating-modules$ http://doc.silverstripe.org/sapphire/en/topics/module-development [R=301,L]
-	RewriteRule ^css$ http://doc.silverstripe.org/sapphire/en/reference/theme-development [R=301,L]
+	RewriteRule ^contributing$ http://doc.silverstripe.org/framework/en/misc/contributing [R=301,L]
+	RewriteRule ^controller$ http://doc.silverstripe.org/framework/en/topics/controller [R=301,L]
+	RewriteRule ^controllers$ http://doc.silverstripe.org/framework/en/topics/controller [R=301,L]
+	RewriteRule ^creating-modules$ http://doc.silverstripe.org/framework/en/topics/module-development [R=301,L]
+	RewriteRule ^css$ http://doc.silverstripe.org/framework/en/reference/theme-development [R=301,L]
 	RewriteRule ^csvbulkloader$ http://api.silverstripe.org/search/lookup/?q=CSVBulkLoader&module=sapphire [R=301,L]
 	RewriteRule ^currencyfield$ http://api.silverstripe.org/search/lookup/?q=CurrencyField&module=sapphire [R=301,L]
 	RewriteRule ^daily-builds$ http://doc.silverstripe.org/old/daily-builds [R=301,L]
-	RewriteRule ^data-types$ http://doc.silverstripe.org/sapphire/en/topics/data-types [R=301,L]
-	RewriteRule ^database-structure$ http://doc.silverstripe.org/sapphire/en/reference/database-structure [R=301,L]
-	RewriteRule ^database-troubleshooting$ http://doc.silverstripe.org/sapphire/en/reference/database-troubleshooting [R=301,L]
-	RewriteRule ^datamodel$ http://doc.silverstripe.org/sapphire/en/topics/datamodel [R=301,L]
-	RewriteRule ^dataobject$ http://doc.silverstripe.org/sapphire/en/reference/dataobject [R=301,L]
-	RewriteRule ^dataobjectdecorator$ http://doc.silverstripe.org/sapphire/en/reference/dataobjectdecorator [R=301,L]
-	RewriteRule ^dataobjectset$ http://doc.silverstripe.org/sapphire/en/reference/dataobjectset [R=301,L]
+	RewriteRule ^data-types$ http://doc.silverstripe.org/framework/en/topics/data-types [R=301,L]
+	RewriteRule ^database-structure$ http://doc.silverstripe.org/framework/en/reference/database-structure [R=301,L]
+	RewriteRule ^database-troubleshooting$ http://doc.silverstripe.org/framework/en/reference/database-troubleshooting [R=301,L]
+	RewriteRule ^datamodel$ http://doc.silverstripe.org/framework/en/topics/datamodel [R=301,L]
+	RewriteRule ^dataobject$ http://doc.silverstripe.org/framework/en/reference/dataobject [R=301,L]
+	RewriteRule ^dataobjectdecorator$ http://doc.silverstripe.org/framework/en/reference/dataobjectdecorator [R=301,L]
+	RewriteRule ^dataobjectset$ http://doc.silverstripe.org/framework/en/reference/dataobjectset [R=301,L]
 	RewriteRule ^datefield$ http://api.silverstripe.org/search/lookup/?q=DateField&module=sapphire [R=301,L]
-	RewriteRule ^debugging$ http://doc.silverstripe.org/sapphire/en/topics/debugging [R=301,L]
-	RewriteRule ^deprecation$ http://doc.silverstripe.org/sapphire/en/misc/release-process [R=301,L]
+	RewriteRule ^debugging$ http://doc.silverstripe.org/framework/en/topics/debugging [R=301,L]
+	RewriteRule ^deprecation$ http://doc.silverstripe.org/framework/en/misc/release-process [R=301,L]
 	RewriteRule ^director$ http://api.silverstripe.org/search/lookup/?q=Director&module=sapphire [R=301,L]
-	RewriteRule ^directory-structure$ http://doc.silverstripe.org/sapphire/en/topics/directory-structure [R=301,L]
-	RewriteRule ^documentation-guidelines$ http://doc.silverstripe.org/sapphire/en/misc/contributing [R=301,L]
+	RewriteRule ^directory-structure$ http://doc.silverstripe.org/framework/en/topics/directory-structure [R=301,L]
+	RewriteRule ^documentation-guidelines$ http://doc.silverstripe.org/framework/en/misc/contributing [R=301,L]
 	RewriteRule ^dropdownfield$ http://api.silverstripe.org/search/lookup/?q=DropdownField&module=sapphire [R=301,L]
 	RewriteRule ^ecommercerole$ http://doc.silverstripe.org/old/ecommercerole [R=301,L]
-	RewriteRule ^email$ http://doc.silverstripe.org/sapphire/en/topics/email [R=301,L]
+	RewriteRule ^email$ http://doc.silverstripe.org/framework/en/topics/email [R=301,L]
 	RewriteRule ^emailfield$ http://api.silverstripe.org/search/lookup/?q=EmailField&module=sapphire [R=301,L]
-	RewriteRule ^environment-management$ http://doc.silverstripe.org/sapphire/en/topics/environment-management [R=301,L]
-	RewriteRule ^error-handling$ http://doc.silverstripe.org/sapphire/en/topics/error-handling [R=301,L]
-	RewriteRule ^escape-types$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
+	RewriteRule ^environment-management$ http://doc.silverstripe.org/framework/en/topics/environment-management [R=301,L]
+	RewriteRule ^error-handling$ http://doc.silverstripe.org/framework/en/topics/error-handling [R=301,L]
+	RewriteRule ^escape-types$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
 	RewriteRule ^fieldgroup$ http://api.silverstripe.org/search/lookup/?q=FieldGroup&module=sapphire [R=301,L]
 	RewriteRule ^filefield$ http://api.silverstripe.org/search/lookup/?q=FileField&module=sapphire [R=301,L]
 	RewriteRule ^flickrservice$ http://doc.silverstripe.org/old/flickrservice [R=301,L]
-	RewriteRule ^form$ http://doc.silverstripe.org/sapphire/en/topics/forms [R=301,L]
-	RewriteRule ^form-field-types$ http://doc.silverstripe.org/sapphire/en/reference/form-field-types [R=301,L]
-	RewriteRule ^form-validation$ http://doc.silverstripe.org/sapphire/en/topics/form-validation [R=301,L]
+	RewriteRule ^form$ http://doc.silverstripe.org/framework/en/topics/forms [R=301,L]
+	RewriteRule ^form-field-types$ http://doc.silverstripe.org/framework/en/reference/form-field-types [R=301,L]
+	RewriteRule ^form-validation$ http://doc.silverstripe.org/framework/en/topics/form-validation [R=301,L]
 	RewriteRule ^formaction$ http://api.silverstripe.org/search/lookup/?q=FormAction&module=sapphire [R=301,L]
 	RewriteRule ^functionaltest$ http://api.silverstripe.org/search/lookup/?q=FunctionalTest&module=sapphire [R=301,L]
 	RewriteRule ^gsoc$ http://doc.silverstripe.org/old/gsoc [R=301,L]
@@ -89,35 +94,35 @@
 	RewriteRule ^hiddenfield$ http://api.silverstripe.org/search/lookup/?q=HiddenField&module=sapphire [R=301,L]
 	RewriteRule ^hide-ancestor$ http://doc.silverstripe.org/old/hide-ancestor [R=301,L]
 	RewriteRule ^hierarchy$ http://api.silverstripe.org/search/lookup/?q=Hierarchy&module=sapphire [R=301,L]
-	RewriteRule ^how-page-security-works$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
-	RewriteRule ^html$ http://doc.silverstripe.org/sapphire/en/topics/theme-development [R=301,L]
+	RewriteRule ^how-page-security-works$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
+	RewriteRule ^html$ http://doc.silverstripe.org/framework/en/topics/theme-development [R=301,L]
 	RewriteRule ^htmleditorconfig$ http://api.silverstripe.org/search/lookup/?q=HTMLEditorConfig&module=sapphire [R=301,L]
 	RewriteRule ^htmleditorfield$ http://api.silverstripe.org/search/lookup/?q=HTMLEditorField&module=sapphire [R=301,L]
-	RewriteRule ^i18n$ http://doc.silverstripe.org/sapphire/en/topics/i18n [R=301,L]
-	RewriteRule ^image$ http://doc.silverstripe.org/sapphire/en/reference/image [R=301,L]
+	RewriteRule ^i18n$ http://doc.silverstripe.org/framework/en/topics/i18n [R=301,L]
+	RewriteRule ^image$ http://doc.silverstripe.org/framework/en/reference/image [R=301,L]
 	RewriteRule ^imagefield$ http://api.silverstripe.org/search/lookup/?q=ImageField&module=sapphire [R=301,L]
-	RewriteRule ^installation$ http://doc.silverstripe.org/sapphire/en/ [R=301,L]
-	RewriteRule ^installation-on-lighttpd$ http://doc.silverstripe.org/sapphire/en/installation/lighttpd [R=301,L]
-	RewriteRule ^installation-on-mac-osx$ http://doc.silverstripe.org/sapphire/en/installation/mac-osx [R=301,L]
-	RewriteRule ^installation-on-nginx$ http://doc.silverstripe.org/sapphire/en/installation/nginx [R=301,L]
-	RewriteRule ^installation-on-webserver$ http://doc.silverstripe.org/sapphire/en/installation/webserver [R=301,L]
-	RewriteRule ^installation-on-windows-manual-iis$ http://doc.silverstripe.org/sapphire/en/installation/windows-manual-iis [R=301,L]
-	RewriteRule ^installation-on-windows-server-2003-iis-6$ http://doc.silverstripe.org/sapphire/en/installation/windows-manual-iis [R=301,L]
-	RewriteRule ^installation-on-windows-pi$ http://doc.silverstripe.org/sapphire/en/installation/windows-pi [R=301,L]
-	RewriteRule ^installation-on-windows-wamp$ http://doc.silverstripe.org/sapphire/en/installation/windows-wamp [R=301,L]
-	RewriteRule ^installing-modules$ http://doc.silverstripe.org/sapphire/en/topics/modules [R=301,L]
-	RewriteRule ^javascript$ http://doc.silverstripe.org/sapphire/en/reference/javascript [R=301,L]
-	RewriteRule ^jquery$ http://doc.silverstripe.org/sapphire/en/reference/javascript [R=301,L]
+	RewriteRule ^installation$ http://doc.silverstripe.org/framework/en/ [R=301,L]
+	RewriteRule ^installation-on-lighttpd$ http://doc.silverstripe.org/framework/en/installation/lighttpd [R=301,L]
+	RewriteRule ^installation-on-mac-osx$ http://doc.silverstripe.org/framework/en/installation/mac-osx [R=301,L]
+	RewriteRule ^installation-on-nginx$ http://doc.silverstripe.org/framework/en/installation/nginx [R=301,L]
+	RewriteRule ^installation-on-webserver$ http://doc.silverstripe.org/framework/en/installation/webserver [R=301,L]
+	RewriteRule ^installation-on-windows-manual-iis$ http://doc.silverstripe.org/framework/en/installation/windows-manual-iis [R=301,L]
+	RewriteRule ^installation-on-windows-server-2003-iis-6$ http://doc.silverstripe.org/framework/en/installation/windows-manual-iis [R=301,L]
+	RewriteRule ^installation-on-windows-pi$ http://doc.silverstripe.org/framework/en/installation/windows-pi [R=301,L]
+	RewriteRule ^installation-on-windows-wamp$ http://doc.silverstripe.org/framework/en/installation/windows-wamp [R=301,L]
+	RewriteRule ^installing-modules$ http://doc.silverstripe.org/framework/en/topics/modules [R=301,L]
+	RewriteRule ^javascript$ http://doc.silverstripe.org/framework/en/reference/javascript [R=301,L]
+	RewriteRule ^jquery$ http://doc.silverstripe.org/framework/en/reference/javascript [R=301,L]
 	RewriteRule ^labelfield$ http://api.silverstripe.org/search/lookup/?q=LabelField&module=sapphire [R=301,L]
 	RewriteRule ^languagedropdownfield$ http://api.silverstripe.org/search/lookup/?q=LanguageDropdownField&module=sapphire [R=301,L]
-	RewriteRule ^leftandmain$ http://doc.silverstripe.org/sapphire/en/reference/leftandmain [R=301,L]
+	RewriteRule ^leftandmain$ http://doc.silverstripe.org/framework/en/reference/leftandmain [R=301,L]
 	RewriteRule ^listboxfield$ http://api.silverstripe.org/search/lookup/?q=ListBoxField&module=sapphire [R=301,L]
 	RewriteRule ^literalfield$ http://api.silverstripe.org/search/lookup/?q=LiteralField&module=sapphire [R=301,L]
 	RewriteRule ^manifestbuilder$ http://api.silverstripe.org/search/lookup/?q=ManifestBuilder&module=sapphire [R=301,L]
-	RewriteRule ^member$ http://doc.silverstripe.org/sapphire/en/reference/member [R=301,L]
-	RewriteRule ^modeladmin$ http://doc.silverstripe.org/sapphire/en/reference/modeladmin [R=301,L]
-	RewriteRule ^module-maintainers$ http://doc.silverstripe.org/sapphire/en/misc/module-release-process [R=301,L]
-	RewriteRule ^module-releases$ http://doc.silverstripe.org/sapphire/en/misc/module-release-process [R=301,L]
+	RewriteRule ^member$ http://doc.silverstripe.org/framework/en/reference/member [R=301,L]
+	RewriteRule ^modeladmin$ http://doc.silverstripe.org/framework/en/reference/modeladmin [R=301,L]
+	RewriteRule ^module-maintainers$ http://doc.silverstripe.org/framework/en/misc/module-release-process [R=301,L]
+	RewriteRule ^module-releases$ http://doc.silverstripe.org/framework/en/misc/module-release-process [R=301,L]
 	RewriteRule ^module:external-content$ http://doc.silverstripe.org/old/module:external-content [R=301,L]
 	RewriteRule ^module:external-content-alfresco-connector$ http://doc.silverstripe.org/old/module:external-content-alfresco-connector [R=301,L]
 	RewriteRule ^module:external-content-newconnector$ http://doc.silverstripe.org/old/module:external-content-newconnector [R=301,L]
@@ -180,17 +185,17 @@
 	RewriteRule ^modules:translation$ http://doc.silverstripe.org/old/modules:translation [R=301,L]
 	RewriteRule ^modules:userforms$ http://doc.silverstripe.org/old/modules:userforms [R=301,L]
 	RewriteRule ^modules:youtubeservice$ http://doc.silverstripe.org/old/modules:youtubeservice [R=301,L]
-	RewriteRule ^multilingualcontent$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
+	RewriteRule ^multilingualcontent$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
 	RewriteRule ^numericfield$ http://api.silverstripe.org/search/lookup/?q=NumericField&module=sapphire [R=301,L]
 	RewriteRule ^object$ http://api.silverstripe.org/search/lookup/?q=Object&module=sapphire [R=301,L]
-	RewriteRule ^objectmodel$ http://doc.silverstripe.org/sapphire/en/topics/datamodel [R=301,L]
+	RewriteRule ^objectmodel$ http://doc.silverstripe.org/framework/en/topics/datamodel [R=301,L]
 	RewriteRule ^optionsetfield$ http://api.silverstripe.org/search/lookup/?q=OptionSetField&module=sapphire [R=301,L]
-	RewriteRule ^page$ http://doc.silverstripe.org/sapphire/en/reference/page-types [R=301,L]
-	RewriteRule ^page-types$ http://doc.silverstripe.org/sapphire/en/topics/page-types [R=301,L]
+	RewriteRule ^page$ http://doc.silverstripe.org/framework/en/reference/page-types [R=301,L]
+	RewriteRule ^page-types$ http://doc.silverstripe.org/framework/en/topics/page-types [R=301,L]
 	RewriteRule ^pagecomment$ http://api.silverstripe.org/search/lookup/?q=PageComment&module=sapphire [R=301,L]
-	RewriteRule ^partial-caching$ http://doc.silverstripe.org/sapphire/en/reference/partial-caching [R=301,L]
+	RewriteRule ^partial-caching$ http://doc.silverstripe.org/framework/en/reference/partial-caching [R=301,L]
 	RewriteRule ^passwordfield$ http://api.silverstripe.org/search/lookup/?q=PasswordField&module=sapphire [R=301,L]
-	RewriteRule ^permission$ http://doc.silverstripe.org/sapphire/en/reference/permission [R=301,L]
+	RewriteRule ^permission$ http://doc.silverstripe.org/framework/en/reference/permission [R=301,L]
 	RewriteRule ^postale$ http://doc.silverstripe.org/old/postale [R=301,L]
 	RewriteRule ^readonlyfield$ http://api.silverstripe.org/search/lookup/?q=ReadonlyField&module=sapphire [R=301,L]
 	RewriteRule ^recipes:adding_metatags$ http://doc.silverstripe.org/old/recipes:adding_metatags [R=301,L]
@@ -245,46 +250,46 @@
 	RewriteRule ^recipes:update_records_for_a_class_using_code$ http://doc.silverstripe.org/old/recipes:update_records_for_a_class_using_code [R=301,L]
 	RewriteRule ^recipes:what_to_return_from_a_function$ http://doc.silverstripe.org/old/recipes:what_to_return_from_a_function [R=301,L]
 	RewriteRule ^recipes:widget-forms-2.3$ http://doc.silverstripe.org/old/recipes:widget-forms-2.3 [R=301,L]
-	RewriteRule ^releases$ http://doc.silverstripe.org/sapphire/en/misc/release-process [R=301,L]
-	RewriteRule ^requirements$ http://doc.silverstripe.org/sapphire/en/reference/requirements [R=301,L]
+	RewriteRule ^releases$ http://doc.silverstripe.org/framework/en/misc/release-process [R=301,L]
+	RewriteRule ^requirements$ http://doc.silverstripe.org/framework/en/reference/requirements [R=301,L]
 	RewriteRule ^restfulserver$ http://api.silverstripe.org/search/lookup/?q=RestfulServer&module=sapphire [R=301,L]
-	RewriteRule ^restfulservice$ http://doc.silverstripe.org/sapphire/en/reference/restfulservice [R=301,L]
-	RewriteRule ^rssfeed$ http://doc.silverstripe.org/sapphire/en/reference/rssfeed [R=301,L]
-	RewriteRule ^sake$ http://doc.silverstripe.org/sapphire/en/topics/commandline [R=301,L]
-	RewriteRule ^searchcontext$ http://doc.silverstripe.org/sapphire/en/topics/search [R=301,L]
-	RewriteRule ^searchform$ http://doc.silverstripe.org/sapphire/en/topics/search [R=301,L]
-	RewriteRule ^secure-development$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
-	RewriteRule ^security$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
+	RewriteRule ^restfulservice$ http://doc.silverstripe.org/framework/en/reference/restfulservice [R=301,L]
+	RewriteRule ^rssfeed$ http://doc.silverstripe.org/framework/en/reference/rssfeed [R=301,L]
+	RewriteRule ^sake$ http://doc.silverstripe.org/framework/en/topics/commandline [R=301,L]
+	RewriteRule ^searchcontext$ http://doc.silverstripe.org/framework/en/topics/search [R=301,L]
+	RewriteRule ^searchform$ http://doc.silverstripe.org/framework/en/topics/search [R=301,L]
+	RewriteRule ^secure-development$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
+	RewriteRule ^security$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
 	RewriteRule ^security-statement$ http://doc.silverstripe.org/old/security-statement [R=301,L]
 	RewriteRule ^selectiongroup$ http://api.silverstripe.org/search/lookup/?q=SelectionGroup&module=sapphire [R=301,L]
-	RewriteRule ^server-requirements$ http://doc.silverstripe.org/sapphire/en/installation/server-requirements [R=301,L]
+	RewriteRule ^server-requirements$ http://doc.silverstripe.org/framework/en/installation/server-requirements [R=301,L]
 	RewriteRule ^sessions$ http://api.silverstripe.org/search/lookup/?q=Session&module=sapphire [R=301,L]
-	RewriteRule ^shortcodes$ http://doc.silverstripe.org/sapphire/en/reference/bbcode [R=301,L]
+	RewriteRule ^shortcodes$ http://doc.silverstripe.org/framework/en/reference/bbcode [R=301,L]
 	RewriteRule ^silverstripe-book-errata$ http://doc.silverstripe.org/old/silverstripe-book-errata [R=301,L]
-	RewriteRule ^siteconfig$ http://doc.silverstripe.org/sapphire/en/reference/siteconfig [R=301,L]
-	RewriteRule ^sitetree$ http://doc.silverstripe.org/sapphire/en/reference/sitetree [R=301,L]
-	RewriteRule ^sqlquery$ http://doc.silverstripe.org/sapphire/en/reference/sqlquery [R=301,L]
-	RewriteRule ^start$ http://doc.silverstripe.org/sapphire/en/ [R=301,L]
+	RewriteRule ^siteconfig$ http://doc.silverstripe.org/framework/en/reference/siteconfig [R=301,L]
+	RewriteRule ^sitetree$ http://doc.silverstripe.org/framework/en/reference/sitetree [R=301,L]
+	RewriteRule ^sqlquery$ http://doc.silverstripe.org/framework/en/reference/sqlquery [R=301,L]
+	RewriteRule ^start$ http://doc.silverstripe.org/framework/en/ [R=301,L]
 	RewriteRule ^staticexporter$ http://api.silverstripe.org/search/lookup/?q=StaticExporter&module=sapphire [R=301,L]
-	RewriteRule ^staticpublisher$ http://doc.silverstripe.org/sapphire/en/reference/staticpublisher [R=301,L]
+	RewriteRule ^staticpublisher$ http://doc.silverstripe.org/framework/en/reference/staticpublisher [R=301,L]
 	RewriteRule ^suggested-web-hosts$ http://doc.silverstripe.org/old/suggested-web-hosts [R=301,L]
-	RewriteRule ^subversion$ http://doc.silverstripe.org/sapphire/en/installation/from-source [R=301,L]
+	RewriteRule ^subversion$ http://doc.silverstripe.org/framework/en/installation/from-source [R=301,L]
 	RewriteRule ^tab$ http://api.silverstripe.org/search/lookup/?q=Tab&module=sapphire [R=301,L]
-	RewriteRule ^tablefield$ http://doc.silverstripe.org/sapphire/en/reference/tablefield [R=301,L]
-	RewriteRule ^tablelistfield$ http://doc.silverstripe.org/sapphire/en/reference/tablelistfield [R=301,L]
+	RewriteRule ^tablefield$ http://doc.silverstripe.org/framework/en/reference/tablefield [R=301,L]
+	RewriteRule ^tablelistfield$ http://doc.silverstripe.org/framework/en/reference/tablelistfield [R=301,L]
 	RewriteRule ^tabset$ http://api.silverstripe.org/search/lookup/?q=TabSet&module=sapphire [R=301,L]
-	RewriteRule ^templates$ http://doc.silverstripe.org/sapphire/en/topics/templates [R=301,L]
-	RewriteRule ^testing-guide$ http://doc.silverstripe.org/sapphire/en/topics/testing/ [R=301,L]
-	RewriteRule ^testing-guide-glossary$ http://doc.silverstripe.org/sapphire/en/topics/testing/ [R=301,L]
-	RewriteRule ^testing-guide-intro$ http://doc.silverstripe.org/sapphire/en/topics/testing/testing-guide [R=301,L]
-	RewriteRule ^testing-guide-troubleshooting$ http://doc.silverstripe.org/sapphire/en/topics/testing/testing-guide-troubleshooting [R=301,L]
-	RewriteRule ^testing-howto:create-functional-test$ http://doc.silverstripe.org/sapphire/en/topics/testing/create-functional-test [R=301,L]
-	RewriteRule ^testing-howto:create-sapphire-test$ http://doc.silverstripe.org/sapphire/en/topics/testing/create-sapphire-test [R=301,L]
-	RewriteRule ^testing-howto:test-email-sending$ http://doc.silverstripe.org/sapphire/en/topics/testing/email-sending [R=301,L]
+	RewriteRule ^templates$ http://doc.silverstripe.org/framework/en/topics/templates [R=301,L]
+	RewriteRule ^testing-guide$ http://doc.silverstripe.org/framework/en/topics/testing/ [R=301,L]
+	RewriteRule ^testing-guide-glossary$ http://doc.silverstripe.org/framework/en/topics/testing/ [R=301,L]
+	RewriteRule ^testing-guide-intro$ http://doc.silverstripe.org/framework/en/topics/testing/testing-guide [R=301,L]
+	RewriteRule ^testing-guide-troubleshooting$ http://doc.silverstripe.org/framework/en/topics/testing/testing-guide-troubleshooting [R=301,L]
+	RewriteRule ^testing-howto:create-functional-test$ http://doc.silverstripe.org/framework/en/topics/testing/create-functional-test [R=301,L]
+	RewriteRule ^testing-howto:create-sapphire-test$ http://doc.silverstripe.org/framework/en/topics/testing/create-sapphire-test [R=301,L]
+	RewriteRule ^testing-howto:test-email-sending$ http://doc.silverstripe.org/framework/en/topics/testing/email-sending [R=301,L]
 	RewriteRule ^textareafield$ http://api.silverstripe.org/search/lookup/?q=TextAreaField&module=sapphire [R=301,L]
 	RewriteRule ^textfield$ http://api.silverstripe.org/search/lookup/?q=TextField&module=sapphire [R=301,L]
-	RewriteRule ^themes$ http://doc.silverstripe.org/sapphire/en/topics/themes [R=301,L]
-	RewriteRule ^themes:developing$ http://doc.silverstripe.org/sapphire/en/topics/theme-development [R=301,L]
+	RewriteRule ^themes$ http://doc.silverstripe.org/framework/en/topics/themes [R=301,L]
+	RewriteRule ^themes:developing$ http://doc.silverstripe.org/framework/en/topics/theme-development [R=301,L]
 	RewriteRule ^third-party-packages$ http://doc.silverstripe.org/old/third-party-packages [R=301,L]
 	RewriteRule ^tools$ http://doc.silverstripe.org/old/tools [R=301,L]
 	RewriteRule ^tools:dreamweaver$ http://doc.silverstripe.org/old/tools:dreamweaver [R=301,L]
@@ -292,45 +297,41 @@
 	RewriteRule ^tools:gedit$ http://doc.silverstripe.org/old/tools:gedit [R=301,L]
 	RewriteRule ^tools:netbeans$ http://doc.silverstripe.org/old/tools:netbeans [R=301,L]
 	RewriteRule ^tools:textmate$ http://doc.silverstripe.org/old/tools:textmate [R=301,L]
-	RewriteRule ^translatable$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
-	RewriteRule ^translation$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
-	RewriteRule ^sapphire/en/topics/translation https://github.com/silverstripe/silverstripe-translatable [R=301,L]
+	RewriteRule ^translatable$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
+	RewriteRule ^translation$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
 	RewriteRule ^treedropdownfield$ http://api.silverstripe.org/search/lookup/?q=TreeDropdownField&module=sapphire [R=301,L]
 	RewriteRule ^treemultiselectfield$ http://api.silverstripe.org/search/lookup/?q=TreeMultiSelectField&module=sapphire [R=301,L]
-	RewriteRule ^tutorial:1-building-a-basic-site$ http://doc.silverstripe.org/sapphire/en/tutorials/1-building-a-basic-site [R=301,L]
-	RewriteRule ^tutorial:2-extending-a-basic-site$ http://doc.silverstripe.org/sapphire/en/tutorials/2-extending-a-basic-site [R=301,L]
-	RewriteRule ^tutorial:3-forms$ http://doc.silverstripe.org/sapphire/en/tutorials/3-forms [R=301,L]
-	RewriteRule ^tutorial:4-site-search$ http://doc.silverstripe.org/sapphire/en/tutorials/4-site-search [R=301,L]
-	RewriteRule ^tutorial:5-dataobject-relationship-management$ http://doc.silverstripe.org/sapphire/en/tutorials/5-dataobject-relationship-management [R=301,L]
-	RewriteRule ^tutorials$ http://doc.silverstripe.org/sapphire/en/tutorials/ [R=301,L]
-	RewriteRule ^tutorials$ http://doc.silverstripe.org/sapphire/en/tutorials/ [R=301,L]
-	RewriteRule ^typography$ http://doc.silverstripe.org/sapphire/en/reference/typography [R=301,L]
-	RewriteRule ^upgrading$ http://doc.silverstripe.org/sapphire/en/installation/upgrading [R=301,L]
-	RewriteRule ^upgrading$ http://doc.silverstripe.org/sapphire/en/installation/upgrading/ [R=301,L]
+	RewriteRule ^tutorial:1-building-a-basic-site$ http://doc.silverstripe.org/framework/en/tutorials/1-building-a-basic-site [R=301,L]
+	RewriteRule ^tutorial:2-extending-a-basic-site$ http://doc.silverstripe.org/framework/en/tutorials/2-extending-a-basic-site [R=301,L]
+	RewriteRule ^tutorial:3-forms$ http://doc.silverstripe.org/framework/en/tutorials/3-forms [R=301,L]
+	RewriteRule ^tutorial:4-site-search$ http://doc.silverstripe.org/framework/en/tutorials/4-site-search [R=301,L]
+	RewriteRule ^tutorial:5-dataobject-relationship-management$ http://doc.silverstripe.org/framework/en/tutorials/5-dataobject-relationship-management [R=301,L]
+	RewriteRule ^tutorials$ http://doc.silverstripe.org/framework/en/tutorials/ [R=301,L]
+	RewriteRule ^tutorials$ http://doc.silverstripe.org/framework/en/tutorials/ [R=301,L]
+	RewriteRule ^typography$ http://doc.silverstripe.org/framework/en/reference/typography [R=301,L]
+	RewriteRule ^upgrading$ http://doc.silverstripe.org/framework/en/installation/upgrading [R=301,L]
+	RewriteRule ^upgrading$ http://doc.silverstripe.org/framework/en/installation/upgrading/ [R=301,L]
 	RewriteRule ^uploadify$ http://doc.silverstripe.org/old/uploadify [R=301,L]
-	RewriteRule ^urlvariabletools$ http://doc.silverstripe.org/sapphire/en/reference/urlvariabletools [R=301,L]
+	RewriteRule ^urlvariabletools$ http://doc.silverstripe.org/framework/en/reference/urlvariabletools [R=301,L]
 	RewriteRule ^validator$ http://api.silverstripe.org/search/lookup/?q=Validator&module=sapphire [R=301,L]
-	RewriteRule ^versioned$ http://doc.silverstripe.org/sapphire/en/reference/versioned [R=301,L]
+	RewriteRule ^versioned$ http://doc.silverstripe.org/framework/en/reference/versioned [R=301,L]
 	RewriteRule ^videotours$ http://doc.silverstripe.org/old/videotours [R=301,L]
 	RewriteRule ^virtualpage$ http://api.silverstripe.org/search/lookup/?q=VirtualPage&module=sapphire [R=301,L]
-	RewriteRule ^widgets$ http://doc.silverstripe.org/sapphire/en/topics/widgets [R=301,L]
+	RewriteRule ^widgets$ http://doc.silverstripe.org/framework/en/topics/widgets [R=301,L]
 	RewriteRule ^buildbot-try-server$ http://doc.silverstripe.org/old/buildbot-try-server [R=301,L]
-	
+
 	# Legacy rewrite: Can't use 'master' as it confuses api.ss.org linking
-	RewriteRule ^sapphire/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]
+
 	# Changelogs are just kept up-to-date on trunk
-	RewriteRule ^sapphire/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]
-  
+	
 	# 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/framework/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]
+	RewriteRule ^framework/en/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^framework/en/[\d.]*/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]
 
-	# TODO Rename all "sapphire" references to "framework". Until then, simply redirect.
-	RewriteRule ^framework/(.*) http://doc.silverstripe.org/sapphire/$1 [R=301,L]
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
@@ -352,5 +353,5 @@ ExpiresByType application/javascript "access plus 7 days"
 </IfModule>
 
 <IfModule mod_deflate.c>
-  SetOutputFilter DEFLATE
+	SetOutputFilter DEFLATE
 </IfModule>
diff --git a/.htaccess_live b/.htaccess_live
index cd0c1f3..5b251bd 100644
--- a/.htaccess_live
+++ b/.htaccess_live
@@ -11,6 +11,11 @@
 
 <IfModule mod_rewrite.c>
 	RewriteEngine On
+
+	# Legacy rewrite from sapphire/ to framework/ namespace
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_URI} !^sapphire/main\.php
+	RewriteRule ^sapphire/?(.*) http://doc.silverstripe.org/framework/$1 [R=301,L]
 	
 	# DokuWiki rewrite rules: Need to happen before other rules in order to redirect /doku.php?id=<pagename>
 	# to /pagename, which can then be matched by the legacy rewrite rules further down
@@ -22,63 +27,63 @@
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_URI} !\.(css|gif|ico|jpg|js|png|swf|txt)$
-	#RewriteRule ^execution-pipeline$ http://doc.silverstripe.org/sapphire/en/reference/ [R=301,L]
+	#RewriteRule ^execution-pipeline$ http://doc.silverstripe.org/framework/en/reference/ [R=301,L]
 		
 	RewriteRule ^arraydata$ http://api.silverstripe.org/search/lookup/?q=ArrayData&module=sapphire [R=301,L]
 	RewriteRule ^autocompletefield$ http://api.silverstripe.org/search/lookup/?q=AutocompleteField&module=sapphire [R=301,L]
-	RewriteRule ^bbcode$ http://doc.silverstripe.org/sapphire/en/reference/ [R=301,L]
-	RewriteRule ^building-for-modularity$ http://doc.silverstripe.org/sapphire/en/topics/module-development [R=301,L]
-	RewriteRule ^built-in-page-controls$ http://doc.silverstripe.org/sapphire/en/reference/built-in-page-controls [R=301,L]
+	RewriteRule ^bbcode$ http://doc.silverstripe.org/framework/en/reference/ [R=301,L]
+	RewriteRule ^building-for-modularity$ http://doc.silverstripe.org/framework/en/topics/module-development [R=301,L]
+	RewriteRule ^built-in-page-controls$ http://doc.silverstripe.org/framework/en/reference/built-in-page-controls [R=301,L]
 	RewriteRule ^cache-control$ http://wiki.silverstripe.org/howto:cache-control [R=301,L]
-	RewriteRule ^casting$ http://doc.silverstripe.org/sapphire/en/topics/data-types [R=301,L]
+	RewriteRule ^casting$ http://doc.silverstripe.org/framework/en/topics/data-types [R=301,L]
 	RewriteRule ^checkboxfield$ http://api.silverstripe.org/search/lookup/?q=CheckboxField&module=sapphire [R=301,L]
 	RewriteRule ^checkboxsetfield$ http://api.silverstripe.org/search/lookup/?q=CheckboxSetField&module=sapphire [R=301,L]
 	RewriteRule ^checkoutpagetest$ http://doc.silverstripe.org/old/checkoutpagetest [R=301,L]
-	RewriteRule ^cmsmain$ http://doc.silverstripe.org/sapphire/en/topics/extending-the-cms [R=301,L]
+	RewriteRule ^cmsmain$ http://doc.silverstripe.org/framework/en/topics/extending-the-cms [R=301,L]
 	RewriteRule ^cmsmenu$ http://api.silverstripe.org/search/lookup/?q=CMSMenu&module=sapphire [R=301,L]
-	RewriteRule ^common-problems$ http://doc.silverstripe.org/sapphire/en/installation/common-problems [R=301,L]
+	RewriteRule ^common-problems$ http://doc.silverstripe.org/framework/en/installation/common-problems [R=301,L]
 	RewriteRule ^community_run_third_party_websites$ http://doc.silverstripe.org/old/community_run_third_party_websites [R=301,L]
-	RewriteRule ^complextablefield$ http://doc.silverstripe.org/sapphire/en/reference/complextablefield [R=301,L]
+	RewriteRule ^complextablefield$ http://doc.silverstripe.org/framework/en/reference/complextablefield [R=301,L]
 	RewriteRule ^complextablefieldexamples$ http://doc.silverstripe.org/old/complextablefieldexamples [R=301,L]
 	RewriteRule ^compositefield$ http://api.silverstripe.org/search/lookup/?q=CompositeField&module=sapphire [R=301,L]
-	RewriteRule ^configuration$ http://doc.silverstripe.org/sapphire/en/topics/configuration [R=301,L]
+	RewriteRule ^configuration$ http://doc.silverstripe.org/framework/en/topics/configuration [R=301,L]
 	RewriteRule ^contentdeliverynetworkissues$ http://doc.silverstripe.org/old/contentdeliverynetworkissues [R=301,L]
 	RewriteRule ^contentnegotiator$ http://api.silverstripe.org/search/lookup/?q=ContentNegotiator&module=sapphire [R=301,L]
 	RewriteRule ^contributors$ http://doc.silverstripe.org/old/contributors [R=301,L]
-	RewriteRule ^contributing$ http://doc.silverstripe.org/sapphire/en/misc/contributing [R=301,L]
-	RewriteRule ^controller$ http://doc.silverstripe.org/sapphire/en/topics/controller [R=301,L]
-	RewriteRule ^controllers$ http://doc.silverstripe.org/sapphire/en/topics/controller [R=301,L]
-	RewriteRule ^creating-modules$ http://doc.silverstripe.org/sapphire/en/topics/module-development [R=301,L]
-	RewriteRule ^css$ http://doc.silverstripe.org/sapphire/en/reference/theme-development [R=301,L]
+	RewriteRule ^contributing$ http://doc.silverstripe.org/framework/en/misc/contributing [R=301,L]
+	RewriteRule ^controller$ http://doc.silverstripe.org/framework/en/topics/controller [R=301,L]
+	RewriteRule ^controllers$ http://doc.silverstripe.org/framework/en/topics/controller [R=301,L]
+	RewriteRule ^creating-modules$ http://doc.silverstripe.org/framework/en/topics/module-development [R=301,L]
+	RewriteRule ^css$ http://doc.silverstripe.org/framework/en/reference/theme-development [R=301,L]
 	RewriteRule ^csvbulkloader$ http://api.silverstripe.org/search/lookup/?q=CSVBulkLoader&module=sapphire [R=301,L]
 	RewriteRule ^currencyfield$ http://api.silverstripe.org/search/lookup/?q=CurrencyField&module=sapphire [R=301,L]
 	RewriteRule ^daily-builds$ http://doc.silverstripe.org/old/daily-builds [R=301,L]
-	RewriteRule ^data-types$ http://doc.silverstripe.org/sapphire/en/topics/data-types [R=301,L]
-	RewriteRule ^database-structure$ http://doc.silverstripe.org/sapphire/en/reference/database-structure [R=301,L]
-	RewriteRule ^database-troubleshooting$ http://doc.silverstripe.org/sapphire/en/reference/database-troubleshooting [R=301,L]
-	RewriteRule ^datamodel$ http://doc.silverstripe.org/sapphire/en/topics/datamodel [R=301,L]
-	RewriteRule ^dataobject$ http://doc.silverstripe.org/sapphire/en/reference/dataobject [R=301,L]
-	RewriteRule ^dataobjectdecorator$ http://doc.silverstripe.org/sapphire/en/reference/dataobjectdecorator [R=301,L]
-	RewriteRule ^dataobjectset$ http://doc.silverstripe.org/sapphire/en/reference/dataobjectset [R=301,L]
+	RewriteRule ^data-types$ http://doc.silverstripe.org/framework/en/topics/data-types [R=301,L]
+	RewriteRule ^database-structure$ http://doc.silverstripe.org/framework/en/reference/database-structure [R=301,L]
+	RewriteRule ^database-troubleshooting$ http://doc.silverstripe.org/framework/en/reference/database-troubleshooting [R=301,L]
+	RewriteRule ^datamodel$ http://doc.silverstripe.org/framework/en/topics/datamodel [R=301,L]
+	RewriteRule ^dataobject$ http://doc.silverstripe.org/framework/en/reference/dataobject [R=301,L]
+	RewriteRule ^dataobjectdecorator$ http://doc.silverstripe.org/framework/en/reference/dataobjectdecorator [R=301,L]
+	RewriteRule ^dataobjectset$ http://doc.silverstripe.org/framework/en/reference/dataobjectset [R=301,L]
 	RewriteRule ^datefield$ http://api.silverstripe.org/search/lookup/?q=DateField&module=sapphire [R=301,L]
-	RewriteRule ^debugging$ http://doc.silverstripe.org/sapphire/en/topics/debugging [R=301,L]
-	RewriteRule ^deprecation$ http://doc.silverstripe.org/sapphire/en/misc/release-process [R=301,L]
+	RewriteRule ^debugging$ http://doc.silverstripe.org/framework/en/topics/debugging [R=301,L]
+	RewriteRule ^deprecation$ http://doc.silverstripe.org/framework/en/misc/release-process [R=301,L]
 	RewriteRule ^director$ http://api.silverstripe.org/search/lookup/?q=Director&module=sapphire [R=301,L]
-	RewriteRule ^directory-structure$ http://doc.silverstripe.org/sapphire/en/topics/directory-structure [R=301,L]
-	RewriteRule ^documentation-guidelines$ http://doc.silverstripe.org/sapphire/en/misc/contributing [R=301,L]
+	RewriteRule ^directory-structure$ http://doc.silverstripe.org/framework/en/topics/directory-structure [R=301,L]
+	RewriteRule ^documentation-guidelines$ http://doc.silverstripe.org/framework/en/misc/contributing [R=301,L]
 	RewriteRule ^dropdownfield$ http://api.silverstripe.org/search/lookup/?q=DropdownField&module=sapphire [R=301,L]
 	RewriteRule ^ecommercerole$ http://doc.silverstripe.org/old/ecommercerole [R=301,L]
-	RewriteRule ^email$ http://doc.silverstripe.org/sapphire/en/topics/email [R=301,L]
+	RewriteRule ^email$ http://doc.silverstripe.org/framework/en/topics/email [R=301,L]
 	RewriteRule ^emailfield$ http://api.silverstripe.org/search/lookup/?q=EmailField&module=sapphire [R=301,L]
-	RewriteRule ^environment-management$ http://doc.silverstripe.org/sapphire/en/topics/environment-management [R=301,L]
-	RewriteRule ^error-handling$ http://doc.silverstripe.org/sapphire/en/topics/error-handling [R=301,L]
-	RewriteRule ^escape-types$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
+	RewriteRule ^environment-management$ http://doc.silverstripe.org/framework/en/topics/environment-management [R=301,L]
+	RewriteRule ^error-handling$ http://doc.silverstripe.org/framework/en/topics/error-handling [R=301,L]
+	RewriteRule ^escape-types$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
 	RewriteRule ^fieldgroup$ http://api.silverstripe.org/search/lookup/?q=FieldGroup&module=sapphire [R=301,L]
 	RewriteRule ^filefield$ http://api.silverstripe.org/search/lookup/?q=FileField&module=sapphire [R=301,L]
 	RewriteRule ^flickrservice$ http://doc.silverstripe.org/old/flickrservice [R=301,L]
-	RewriteRule ^form$ http://doc.silverstripe.org/sapphire/en/topics/forms [R=301,L]
-	RewriteRule ^form-field-types$ http://doc.silverstripe.org/sapphire/en/reference/form-field-types [R=301,L]
-	RewriteRule ^form-validation$ http://doc.silverstripe.org/sapphire/en/topics/form-validation [R=301,L]
+	RewriteRule ^form$ http://doc.silverstripe.org/framework/en/topics/forms [R=301,L]
+	RewriteRule ^form-field-types$ http://doc.silverstripe.org/framework/en/reference/form-field-types [R=301,L]
+	RewriteRule ^form-validation$ http://doc.silverstripe.org/framework/en/topics/form-validation [R=301,L]
 	RewriteRule ^formaction$ http://api.silverstripe.org/search/lookup/?q=FormAction&module=sapphire [R=301,L]
 	RewriteRule ^functionaltest$ http://api.silverstripe.org/search/lookup/?q=FunctionalTest&module=sapphire [R=301,L]
 	RewriteRule ^gsoc$ http://doc.silverstripe.org/old/gsoc [R=301,L]
@@ -89,35 +94,35 @@
 	RewriteRule ^hiddenfield$ http://api.silverstripe.org/search/lookup/?q=HiddenField&module=sapphire [R=301,L]
 	RewriteRule ^hide-ancestor$ http://doc.silverstripe.org/old/hide-ancestor [R=301,L]
 	RewriteRule ^hierarchy$ http://api.silverstripe.org/search/lookup/?q=Hierarchy&module=sapphire [R=301,L]
-	RewriteRule ^how-page-security-works$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
-	RewriteRule ^html$ http://doc.silverstripe.org/sapphire/en/topics/theme-development [R=301,L]
+	RewriteRule ^how-page-security-works$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
+	RewriteRule ^html$ http://doc.silverstripe.org/framework/en/topics/theme-development [R=301,L]
 	RewriteRule ^htmleditorconfig$ http://api.silverstripe.org/search/lookup/?q=HTMLEditorConfig&module=sapphire [R=301,L]
 	RewriteRule ^htmleditorfield$ http://api.silverstripe.org/search/lookup/?q=HTMLEditorField&module=sapphire [R=301,L]
-	RewriteRule ^i18n$ http://doc.silverstripe.org/sapphire/en/topics/i18n [R=301,L]
-	RewriteRule ^image$ http://doc.silverstripe.org/sapphire/en/reference/image [R=301,L]
+	RewriteRule ^i18n$ http://doc.silverstripe.org/framework/en/topics/i18n [R=301,L]
+	RewriteRule ^image$ http://doc.silverstripe.org/framework/en/reference/image [R=301,L]
 	RewriteRule ^imagefield$ http://api.silverstripe.org/search/lookup/?q=ImageField&module=sapphire [R=301,L]
-	RewriteRule ^installation$ http://doc.silverstripe.org/sapphire/en/ [R=301,L]
-	RewriteRule ^installation-on-lighttpd$ http://doc.silverstripe.org/sapphire/en/installation/lighttpd [R=301,L]
-	RewriteRule ^installation-on-mac-osx$ http://doc.silverstripe.org/sapphire/en/installation/mac-osx [R=301,L]
-	RewriteRule ^installation-on-nginx$ http://doc.silverstripe.org/sapphire/en/installation/nginx [R=301,L]
-	RewriteRule ^installation-on-webserver$ http://doc.silverstripe.org/sapphire/en/installation/webserver [R=301,L]
-	RewriteRule ^installation-on-windows-manual-iis$ http://doc.silverstripe.org/sapphire/en/installation/windows-manual-iis [R=301,L]
-	RewriteRule ^installation-on-windows-server-2003-iis-6$ http://doc.silverstripe.org/sapphire/en/installation/windows-manual-iis [R=301,L]
-	RewriteRule ^installation-on-windows-pi$ http://doc.silverstripe.org/sapphire/en/installation/windows-pi [R=301,L]
-	RewriteRule ^installation-on-windows-wamp$ http://doc.silverstripe.org/sapphire/en/installation/windows-wamp [R=301,L]
-	RewriteRule ^installing-modules$ http://doc.silverstripe.org/sapphire/en/topics/modules [R=301,L]
-	RewriteRule ^javascript$ http://doc.silverstripe.org/sapphire/en/reference/javascript [R=301,L]
-	RewriteRule ^jquery$ http://doc.silverstripe.org/sapphire/en/reference/javascript [R=301,L]
+	RewriteRule ^installation$ http://doc.silverstripe.org/framework/en/ [R=301,L]
+	RewriteRule ^installation-on-lighttpd$ http://doc.silverstripe.org/framework/en/installation/lighttpd [R=301,L]
+	RewriteRule ^installation-on-mac-osx$ http://doc.silverstripe.org/framework/en/installation/mac-osx [R=301,L]
+	RewriteRule ^installation-on-nginx$ http://doc.silverstripe.org/framework/en/installation/nginx [R=301,L]
+	RewriteRule ^installation-on-webserver$ http://doc.silverstripe.org/framework/en/installation/webserver [R=301,L]
+	RewriteRule ^installation-on-windows-manual-iis$ http://doc.silverstripe.org/framework/en/installation/windows-manual-iis [R=301,L]
+	RewriteRule ^installation-on-windows-server-2003-iis-6$ http://doc.silverstripe.org/framework/en/installation/windows-manual-iis [R=301,L]
+	RewriteRule ^installation-on-windows-pi$ http://doc.silverstripe.org/framework/en/installation/windows-pi [R=301,L]
+	RewriteRule ^installation-on-windows-wamp$ http://doc.silverstripe.org/framework/en/installation/windows-wamp [R=301,L]
+	RewriteRule ^installing-modules$ http://doc.silverstripe.org/framework/en/topics/modules [R=301,L]
+	RewriteRule ^javascript$ http://doc.silverstripe.org/framework/en/reference/javascript [R=301,L]
+	RewriteRule ^jquery$ http://doc.silverstripe.org/framework/en/reference/javascript [R=301,L]
 	RewriteRule ^labelfield$ http://api.silverstripe.org/search/lookup/?q=LabelField&module=sapphire [R=301,L]
 	RewriteRule ^languagedropdownfield$ http://api.silverstripe.org/search/lookup/?q=LanguageDropdownField&module=sapphire [R=301,L]
-	RewriteRule ^leftandmain$ http://doc.silverstripe.org/sapphire/en/reference/leftandmain [R=301,L]
+	RewriteRule ^leftandmain$ http://doc.silverstripe.org/framework/en/reference/leftandmain [R=301,L]
 	RewriteRule ^listboxfield$ http://api.silverstripe.org/search/lookup/?q=ListBoxField&module=sapphire [R=301,L]
 	RewriteRule ^literalfield$ http://api.silverstripe.org/search/lookup/?q=LiteralField&module=sapphire [R=301,L]
 	RewriteRule ^manifestbuilder$ http://api.silverstripe.org/search/lookup/?q=ManifestBuilder&module=sapphire [R=301,L]
-	RewriteRule ^member$ http://doc.silverstripe.org/sapphire/en/reference/member [R=301,L]
-	RewriteRule ^modeladmin$ http://doc.silverstripe.org/sapphire/en/reference/modeladmin [R=301,L]
-	RewriteRule ^module-maintainers$ http://doc.silverstripe.org/sapphire/en/misc/module-release-process [R=301,L]
-	RewriteRule ^module-releases$ http://doc.silverstripe.org/sapphire/en/misc/module-release-process [R=301,L]
+	RewriteRule ^member$ http://doc.silverstripe.org/framework/en/reference/member [R=301,L]
+	RewriteRule ^modeladmin$ http://doc.silverstripe.org/framework/en/reference/modeladmin [R=301,L]
+	RewriteRule ^module-maintainers$ http://doc.silverstripe.org/framework/en/misc/module-release-process [R=301,L]
+	RewriteRule ^module-releases$ http://doc.silverstripe.org/framework/en/misc/module-release-process [R=301,L]
 	RewriteRule ^module:external-content$ http://doc.silverstripe.org/old/module:external-content [R=301,L]
 	RewriteRule ^module:external-content-alfresco-connector$ http://doc.silverstripe.org/old/module:external-content-alfresco-connector [R=301,L]
 	RewriteRule ^module:external-content-newconnector$ http://doc.silverstripe.org/old/module:external-content-newconnector [R=301,L]
@@ -180,17 +185,17 @@
 	RewriteRule ^modules:translation$ http://doc.silverstripe.org/old/modules:translation [R=301,L]
 	RewriteRule ^modules:userforms$ http://doc.silverstripe.org/old/modules:userforms [R=301,L]
 	RewriteRule ^modules:youtubeservice$ http://doc.silverstripe.org/old/modules:youtubeservice [R=301,L]
-	RewriteRule ^multilingualcontent$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
+	RewriteRule ^multilingualcontent$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
 	RewriteRule ^numericfield$ http://api.silverstripe.org/search/lookup/?q=NumericField&module=sapphire [R=301,L]
 	RewriteRule ^object$ http://api.silverstripe.org/search/lookup/?q=Object&module=sapphire [R=301,L]
-	RewriteRule ^objectmodel$ http://doc.silverstripe.org/sapphire/en/topics/datamodel [R=301,L]
+	RewriteRule ^objectmodel$ http://doc.silverstripe.org/framework/en/topics/datamodel [R=301,L]
 	RewriteRule ^optionsetfield$ http://api.silverstripe.org/search/lookup/?q=OptionSetField&module=sapphire [R=301,L]
-	RewriteRule ^page$ http://doc.silverstripe.org/sapphire/en/reference/page-types [R=301,L]
-	RewriteRule ^page-types$ http://doc.silverstripe.org/sapphire/en/topics/page-types [R=301,L]
+	RewriteRule ^page$ http://doc.silverstripe.org/framework/en/reference/page-types [R=301,L]
+	RewriteRule ^page-types$ http://doc.silverstripe.org/framework/en/topics/page-types [R=301,L]
 	RewriteRule ^pagecomment$ http://api.silverstripe.org/search/lookup/?q=PageComment&module=sapphire [R=301,L]
-	RewriteRule ^partial-caching$ http://doc.silverstripe.org/sapphire/en/reference/partial-caching [R=301,L]
+	RewriteRule ^partial-caching$ http://doc.silverstripe.org/framework/en/reference/partial-caching [R=301,L]
 	RewriteRule ^passwordfield$ http://api.silverstripe.org/search/lookup/?q=PasswordField&module=sapphire [R=301,L]
-	RewriteRule ^permission$ http://doc.silverstripe.org/sapphire/en/reference/permission [R=301,L]
+	RewriteRule ^permission$ http://doc.silverstripe.org/framework/en/reference/permission [R=301,L]
 	RewriteRule ^postale$ http://doc.silverstripe.org/old/postale [R=301,L]
 	RewriteRule ^readonlyfield$ http://api.silverstripe.org/search/lookup/?q=ReadonlyField&module=sapphire [R=301,L]
 	RewriteRule ^recipes:adding_metatags$ http://doc.silverstripe.org/old/recipes:adding_metatags [R=301,L]
@@ -245,46 +250,46 @@
 	RewriteRule ^recipes:update_records_for_a_class_using_code$ http://doc.silverstripe.org/old/recipes:update_records_for_a_class_using_code [R=301,L]
 	RewriteRule ^recipes:what_to_return_from_a_function$ http://doc.silverstripe.org/old/recipes:what_to_return_from_a_function [R=301,L]
 	RewriteRule ^recipes:widget-forms-2.3$ http://doc.silverstripe.org/old/recipes:widget-forms-2.3 [R=301,L]
-	RewriteRule ^releases$ http://doc.silverstripe.org/sapphire/en/misc/release-process [R=301,L]
-	RewriteRule ^requirements$ http://doc.silverstripe.org/sapphire/en/reference/requirements [R=301,L]
+	RewriteRule ^releases$ http://doc.silverstripe.org/framework/en/misc/release-process [R=301,L]
+	RewriteRule ^requirements$ http://doc.silverstripe.org/framework/en/reference/requirements [R=301,L]
 	RewriteRule ^restfulserver$ http://api.silverstripe.org/search/lookup/?q=RestfulServer&module=sapphire [R=301,L]
-	RewriteRule ^restfulservice$ http://doc.silverstripe.org/sapphire/en/reference/restfulservice [R=301,L]
-	RewriteRule ^rssfeed$ http://doc.silverstripe.org/sapphire/en/reference/rssfeed [R=301,L]
-	RewriteRule ^sake$ http://doc.silverstripe.org/sapphire/en/topics/commandline [R=301,L]
-	RewriteRule ^searchcontext$ http://doc.silverstripe.org/sapphire/en/topics/search [R=301,L]
-	RewriteRule ^searchform$ http://doc.silverstripe.org/sapphire/en/topics/search [R=301,L]
-	RewriteRule ^secure-development$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
-	RewriteRule ^security$ http://doc.silverstripe.org/sapphire/en/topics/security [R=301,L]
+	RewriteRule ^restfulservice$ http://doc.silverstripe.org/framework/en/reference/restfulservice [R=301,L]
+	RewriteRule ^rssfeed$ http://doc.silverstripe.org/framework/en/reference/rssfeed [R=301,L]
+	RewriteRule ^sake$ http://doc.silverstripe.org/framework/en/topics/commandline [R=301,L]
+	RewriteRule ^searchcontext$ http://doc.silverstripe.org/framework/en/topics/search [R=301,L]
+	RewriteRule ^searchform$ http://doc.silverstripe.org/framework/en/topics/search [R=301,L]
+	RewriteRule ^secure-development$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
+	RewriteRule ^security$ http://doc.silverstripe.org/framework/en/topics/security [R=301,L]
 	RewriteRule ^security-statement$ http://doc.silverstripe.org/old/security-statement [R=301,L]
 	RewriteRule ^selectiongroup$ http://api.silverstripe.org/search/lookup/?q=SelectionGroup&module=sapphire [R=301,L]
-	RewriteRule ^server-requirements$ http://doc.silverstripe.org/sapphire/en/installation/server-requirements [R=301,L]
+	RewriteRule ^server-requirements$ http://doc.silverstripe.org/framework/en/installation/server-requirements [R=301,L]
 	RewriteRule ^sessions$ http://api.silverstripe.org/search/lookup/?q=Session&module=sapphire [R=301,L]
-	RewriteRule ^shortcodes$ http://doc.silverstripe.org/sapphire/en/reference/bbcode [R=301,L]
+	RewriteRule ^shortcodes$ http://doc.silverstripe.org/framework/en/reference/bbcode [R=301,L]
 	RewriteRule ^silverstripe-book-errata$ http://doc.silverstripe.org/old/silverstripe-book-errata [R=301,L]
-	RewriteRule ^siteconfig$ http://doc.silverstripe.org/sapphire/en/reference/siteconfig [R=301,L]
-	RewriteRule ^sitetree$ http://doc.silverstripe.org/sapphire/en/reference/sitetree [R=301,L]
-	RewriteRule ^sqlquery$ http://doc.silverstripe.org/sapphire/en/reference/sqlquery [R=301,L]
-	RewriteRule ^start$ http://doc.silverstripe.org/sapphire/en/ [R=301,L]
+	RewriteRule ^siteconfig$ http://doc.silverstripe.org/framework/en/reference/siteconfig [R=301,L]
+	RewriteRule ^sitetree$ http://doc.silverstripe.org/framework/en/reference/sitetree [R=301,L]
+	RewriteRule ^sqlquery$ http://doc.silverstripe.org/framework/en/reference/sqlquery [R=301,L]
+	RewriteRule ^start$ http://doc.silverstripe.org/framework/en/ [R=301,L]
 	RewriteRule ^staticexporter$ http://api.silverstripe.org/search/lookup/?q=StaticExporter&module=sapphire [R=301,L]
-	RewriteRule ^staticpublisher$ http://doc.silverstripe.org/sapphire/en/reference/staticpublisher [R=301,L]
+	RewriteRule ^staticpublisher$ http://doc.silverstripe.org/framework/en/reference/staticpublisher [R=301,L]
 	RewriteRule ^suggested-web-hosts$ http://doc.silverstripe.org/old/suggested-web-hosts [R=301,L]
-	RewriteRule ^subversion$ http://doc.silverstripe.org/sapphire/en/installation/from-source [R=301,L]
+	RewriteRule ^subversion$ http://doc.silverstripe.org/framework/en/installation/from-source [R=301,L]
 	RewriteRule ^tab$ http://api.silverstripe.org/search/lookup/?q=Tab&module=sapphire [R=301,L]
-	RewriteRule ^tablefield$ http://doc.silverstripe.org/sapphire/en/reference/tablefield [R=301,L]
-	RewriteRule ^tablelistfield$ http://doc.silverstripe.org/sapphire/en/reference/tablelistfield [R=301,L]
+	RewriteRule ^tablefield$ http://doc.silverstripe.org/framework/en/reference/tablefield [R=301,L]
+	RewriteRule ^tablelistfield$ http://doc.silverstripe.org/framework/en/reference/tablelistfield [R=301,L]
 	RewriteRule ^tabset$ http://api.silverstripe.org/search/lookup/?q=TabSet&module=sapphire [R=301,L]
-	RewriteRule ^templates$ http://doc.silverstripe.org/sapphire/en/topics/templates [R=301,L]
-	RewriteRule ^testing-guide$ http://doc.silverstripe.org/sapphire/en/topics/testing/ [R=301,L]
-	RewriteRule ^testing-guide-glossary$ http://doc.silverstripe.org/sapphire/en/topics/testing/ [R=301,L]
-	RewriteRule ^testing-guide-intro$ http://doc.silverstripe.org/sapphire/en/topics/testing/testing-guide [R=301,L]
-	RewriteRule ^testing-guide-troubleshooting$ http://doc.silverstripe.org/sapphire/en/topics/testing/testing-guide-troubleshooting [R=301,L]
-	RewriteRule ^testing-howto:create-functional-test$ http://doc.silverstripe.org/sapphire/en/topics/testing/create-functional-test [R=301,L]
-	RewriteRule ^testing-howto:create-sapphire-test$ http://doc.silverstripe.org/sapphire/en/topics/testing/create-sapphire-test [R=301,L]
-	RewriteRule ^testing-howto:test-email-sending$ http://doc.silverstripe.org/sapphire/en/topics/testing/email-sending [R=301,L]
+	RewriteRule ^templates$ http://doc.silverstripe.org/framework/en/topics/templates [R=301,L]
+	RewriteRule ^testing-guide$ http://doc.silverstripe.org/framework/en/topics/testing/ [R=301,L]
+	RewriteRule ^testing-guide-glossary$ http://doc.silverstripe.org/framework/en/topics/testing/ [R=301,L]
+	RewriteRule ^testing-guide-intro$ http://doc.silverstripe.org/framework/en/topics/testing/testing-guide [R=301,L]
+	RewriteRule ^testing-guide-troubleshooting$ http://doc.silverstripe.org/framework/en/topics/testing/testing-guide-troubleshooting [R=301,L]
+	RewriteRule ^testing-howto:create-functional-test$ http://doc.silverstripe.org/framework/en/topics/testing/create-functional-test [R=301,L]
+	RewriteRule ^testing-howto:create-sapphire-test$ http://doc.silverstripe.org/framework/en/topics/testing/create-sapphire-test [R=301,L]
+	RewriteRule ^testing-howto:test-email-sending$ http://doc.silverstripe.org/framework/en/topics/testing/email-sending [R=301,L]
 	RewriteRule ^textareafield$ http://api.silverstripe.org/search/lookup/?q=TextAreaField&module=sapphire [R=301,L]
 	RewriteRule ^textfield$ http://api.silverstripe.org/search/lookup/?q=TextField&module=sapphire [R=301,L]
-	RewriteRule ^themes$ http://doc.silverstripe.org/sapphire/en/topics/themes [R=301,L]
-	RewriteRule ^themes:developing$ http://doc.silverstripe.org/sapphire/en/topics/theme-development [R=301,L]
+	RewriteRule ^themes$ http://doc.silverstripe.org/framework/en/topics/themes [R=301,L]
+	RewriteRule ^themes:developing$ http://doc.silverstripe.org/framework/en/topics/theme-development [R=301,L]
 	RewriteRule ^third-party-packages$ http://doc.silverstripe.org/old/third-party-packages [R=301,L]
 	RewriteRule ^tools$ http://doc.silverstripe.org/old/tools [R=301,L]
 	RewriteRule ^tools:dreamweaver$ http://doc.silverstripe.org/old/tools:dreamweaver [R=301,L]
@@ -292,44 +297,41 @@
 	RewriteRule ^tools:gedit$ http://doc.silverstripe.org/old/tools:gedit [R=301,L]
 	RewriteRule ^tools:netbeans$ http://doc.silverstripe.org/old/tools:netbeans [R=301,L]
 	RewriteRule ^tools:textmate$ http://doc.silverstripe.org/old/tools:textmate [R=301,L]
-	RewriteRule ^translatable$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
-	RewriteRule ^translation$ http://doc.silverstripe.org/sapphire/en/topics/translation [R=301,L]
+	RewriteRule ^translatable$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
+	RewriteRule ^translation$ http://doc.silverstripe.org/framework/en/topics/translation [R=301,L]
 	RewriteRule ^treedropdownfield$ http://api.silverstripe.org/search/lookup/?q=TreeDropdownField&module=sapphire [R=301,L]
 	RewriteRule ^treemultiselectfield$ http://api.silverstripe.org/search/lookup/?q=TreeMultiSelectField&module=sapphire [R=301,L]
-	RewriteRule ^tutorial:1-building-a-basic-site$ http://doc.silverstripe.org/sapphire/en/tutorials/1-building-a-basic-site [R=301,L]
-	RewriteRule ^tutorial:2-extending-a-basic-site$ http://doc.silverstripe.org/sapphire/en/tutorials/2-extending-a-basic-site [R=301,L]
-	RewriteRule ^tutorial:3-forms$ http://doc.silverstripe.org/sapphire/en/tutorials/3-forms [R=301,L]
-	RewriteRule ^tutorial:4-site-search$ http://doc.silverstripe.org/sapphire/en/tutorials/4-site-search [R=301,L]
-	RewriteRule ^tutorial:5-dataobject-relationship-management$ http://doc.silverstripe.org/sapphire/en/tutorials/5-dataobject-relationship-management [R=301,L]
-	RewriteRule ^tutorials$ http://doc.silverstripe.org/sapphire/en/tutorials/ [R=301,L]
-	RewriteRule ^tutorials$ http://doc.silverstripe.org/sapphire/en/tutorials/ [R=301,L]
-	RewriteRule ^typography$ http://doc.silverstripe.org/sapphire/en/reference/typography [R=301,L]
-	RewriteRule ^upgrading$ http://doc.silverstripe.org/sapphire/en/installation/upgrading [R=301,L]
-	RewriteRule ^upgrading$ http://doc.silverstripe.org/sapphire/en/installation/upgrading/ [R=301,L]
+	RewriteRule ^tutorial:1-building-a-basic-site$ http://doc.silverstripe.org/framework/en/tutorials/1-building-a-basic-site [R=301,L]
+	RewriteRule ^tutorial:2-extending-a-basic-site$ http://doc.silverstripe.org/framework/en/tutorials/2-extending-a-basic-site [R=301,L]
+	RewriteRule ^tutorial:3-forms$ http://doc.silverstripe.org/framework/en/tutorials/3-forms [R=301,L]
+	RewriteRule ^tutorial:4-site-search$ http://doc.silverstripe.org/framework/en/tutorials/4-site-search [R=301,L]
+	RewriteRule ^tutorial:5-dataobject-relationship-management$ http://doc.silverstripe.org/framework/en/tutorials/5-dataobject-relationship-management [R=301,L]
+	RewriteRule ^tutorials$ http://doc.silverstripe.org/framework/en/tutorials/ [R=301,L]
+	RewriteRule ^tutorials$ http://doc.silverstripe.org/framework/en/tutorials/ [R=301,L]
+	RewriteRule ^typography$ http://doc.silverstripe.org/framework/en/reference/typography [R=301,L]
+	RewriteRule ^upgrading$ http://doc.silverstripe.org/framework/en/installation/upgrading [R=301,L]
+	RewriteRule ^upgrading$ http://doc.silverstripe.org/framework/en/installation/upgrading/ [R=301,L]
 	RewriteRule ^uploadify$ http://doc.silverstripe.org/old/uploadify [R=301,L]
-	RewriteRule ^urlvariabletools$ http://doc.silverstripe.org/sapphire/en/reference/urlvariabletools [R=301,L]
+	RewriteRule ^urlvariabletools$ http://doc.silverstripe.org/framework/en/reference/urlvariabletools [R=301,L]
 	RewriteRule ^validator$ http://api.silverstripe.org/search/lookup/?q=Validator&module=sapphire [R=301,L]
-	RewriteRule ^versioned$ http://doc.silverstripe.org/sapphire/en/reference/versioned [R=301,L]
+	RewriteRule ^versioned$ http://doc.silverstripe.org/framework/en/reference/versioned [R=301,L]
 	RewriteRule ^videotours$ http://doc.silverstripe.org/old/videotours [R=301,L]
 	RewriteRule ^virtualpage$ http://api.silverstripe.org/search/lookup/?q=VirtualPage&module=sapphire [R=301,L]
-	RewriteRule ^widgets$ http://doc.silverstripe.org/sapphire/en/topics/widgets [R=301,L]
+	RewriteRule ^widgets$ http://doc.silverstripe.org/framework/en/topics/widgets [R=301,L]
 	RewriteRule ^buildbot-try-server$ http://doc.silverstripe.org/old/buildbot-try-server [R=301,L]
 
 	# Legacy rewrite: Can't use 'master' as it confuses api.ss.org linking
-	RewriteRule ^sapphire/en/master(.*) http://doc.silverstripe.org/sapphire/en/trunk$1 [R=301,L]
+	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 ^sapphire/en/changelogs(.*) http://doc.silverstripe.org/sapphire/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]
 	
 	# 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]
+	RewriteRule ^framework/en/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]
+	RewriteRule ^framework/en/[\d.]*/misc/?(.*) http://doc.silverstripe.org/framework/en/trunk/misc/$1 [R=301,L]
 
-	# TODO Rename all "sapphire" references to "framework". Until then, simply redirect.
-	RewriteRule ^framework/(.*) http://doc.silverstripe.org/sapphire/$1 [R=301,L]
 
 	RewriteCond %{REQUEST_URI} ^(.*)$
 	RewriteCond %{REQUEST_FILENAME} !-f