diff --git a/.htaccess b/.htaccess index e26a901..13c8c3c 100644 --- a/.htaccess +++ b/.htaccess @@ -53,6 +53,7 @@ RewriteRule ^(.*)/howto/navigation-menu$ /$1/developer_guides/templates/how_tos/navigation_menus [R=301,L] RewriteRule ^(.*)/howto/pagination$ /$1/developer_guides/templates/how_tos/pagination [R=301,L] RewriteRule ^(.*)/howto/simple-contact-form$ /$1/developer_guides/forms/how_tos/simple_contact_form [R=301,L] + RewriteRule ^([a-z]{2})/installation/?$ /$1/getting_started/installation [R=301,L] RewriteRule ^(.*)/installation/common-problems$ /$1/getting_started/installation/common_problems [R=301,L] RewriteRule ^(.*)/installation/composer$ /$1/getting_started/composer [R=301,L] @@ -69,6 +70,7 @@ RewriteRule ^(.*)/installation/windows-manual-iis-7$ /$1/getting_started/installation/other_installation_options/windows_iis7 [R=301,L] RewriteRule ^(.*)/installation/windows-pi$ /$1/getting_started/installation/other_installation_options/windows_platform_installer [R=301,L] RewriteRule ^(.*)/installation/windows-wamp$ /$1/getting_started/installation/windows [R=301,L] + RewriteRule ^(.*)/misc/coding-conventions$ /$1/getting_started/coding_conventions [R=301,L] RewriteRule ^(.*)/misc/contributing$ /$1/contributing [R=301,L] RewriteRule ^(.*)/misc/contributing/code$ /$1/contributing/code [R=301,L] @@ -77,26 +79,19 @@ RewriteRule ^(.*)/misc/contributing/translation$ /$1/contributing/translations [R=301,L] RewriteRule ^(.*)/misc/contributing/translation-process$ /$1/contributing/translation-process [R=301,L] RewriteRule ^(.*)/misc/release-process$ /$1/contributing/release_process [R=301,L] + RewriteRule ^(.*)/reference$ /$1/developer_guides [R=301,L] RewriteRule ^(.*)/reference/aspects$ /$1/developer_guides/extending/aspects [R=301,L] RewriteRule ^(.*)/reference/cms-architecture$ /$1/developer_guides/customising_the_admin_interface/cms_architecture [R=301,L] - RewriteRule ^(.*)/reference/configuration$ /$1/developer_guides/configuration [R=301,L] - RewriteRule ^(.*)/reference/controller$ /$1/developer_guides/controllers [R=301,L] - RewriteRule ^(.*)/reference/css$ /$1/developer_guides/templates [R=301,L] - RewriteRule ^(.*)/topics/data-types$ /$1/developer_guides/model/data_types_and_casting [R=301,L] + RewriteRule ^(.*)/reference/grid-field$ /$1/developer_guides/forms/field_types/gridfield [R=301,L] RewriteRule ^(.*)/reference/database-structure$ /$1/developer_guides/model [R=301,L] RewriteRule ^(.*)/reference/dataextension$ /$1/developer_guides/extending/extensions [R=301,L] - RewriteRule ^(.*)/reference/datamodel$ /$1/developer_guides/model [R=301,L] RewriteRule ^(.*)/reference/dataobject$ /$1/developer_guides/model [R=301,L] RewriteRule ^(.*)/reference/datefield$ /$1/developer_guides/forms/fields/datefield [R=301,L] - RewriteRule ^(.*)/reference/debugging$ /$1/developer_guides/debugging [R=301,L] RewriteRule ^(.*)/reference/director$ /$1/developer_guides/execution_pipeline/director [R=301,L] - RewriteRule ^(.*)/reference/email$ /$1/developer_guides/email [R=301,L] - RewriteRule ^(.*)/reference/error-handling$ /$1/developer_guides/debugging/error_handling [R=301,L] RewriteRule ^(.*)/reference/execution-pipeline$ /$1/developer_guides/execution_pipeline [R=301,L] RewriteRule ^(.*)/reference/flushable$ /$1/developer_guides/execution_pipeline/flushable [R=301,L] RewriteRule ^(.*)/reference/form-field-types$ /$1/developer_guides/forms/fields/common_subclasses [R=301,L] - RewriteRule ^(.*)/reference/forms$ /$1/developer_guides/forms [R=301,L] RewriteRule ^(.*)/reference/image$ /$1/developer_guides/files/image [R=301,L] RewriteRule ^(.*)/reference/injector$ /$1/developer_guides/extending/injector [R=301,L] RewriteRule ^(.*)/reference/layout$ /$1/developer_guides/customising_the_admin_interface/cms_layout [R=301,L] @@ -110,7 +105,6 @@ RewriteRule ^(.*)/reference/rssfeed$ /$1/developer_guides/integration/rssfeed [R=301,L] RewriteRule ^(.*)/reference/searchcontext$ /$1/developer_guides/search/searchcontext [R=301,L] RewriteRule ^(.*)/reference/shortcodes$ /$1/developer_guides/extending/shortcodes [R=301,L] - RewriteRule ^(.*)/reference/shortcodes$ /$1/developer_guides/extending/shortcodes [R=301,L] RewriteRule ^(.*)/reference/siteconfig$ /$1/developer_guides/configuration/siteconfig [R=301,L] RewriteRule ^(.*)/reference/sitetree$ /$1/developer_guides/model/data_model_and_orm [R=301,L] RewriteRule ^(.*)/reference/sqlquery$ /$1/developer_guides/model/sqlquery [R=301,L] @@ -119,6 +113,7 @@ RewriteRule ^(.*)/reference/typography$ /$1/developer_guides/customising_the_admin_interface/typography [R=301,L] RewriteRule ^(.*)/reference/uploadfield$ /$1/developer_guides/forms/fields [R=301,L] RewriteRule ^(.*)/reference/urlvariabletools$ /$1/developer_guides/debugging/url_variable_tools [R=301,L] + RewriteRule ^(.*)/topics$ /$1/developer_guides [R=301,L] RewriteRule ^(.*)/topics/access-control$ /$1/developer_guides/security/access_control [R=301,L] RewriteRule ^(.*)/topics/authentication$ /$1/developer_guides/security/authentication [R=301,L] @@ -140,6 +135,16 @@ RewriteRule ^(.*)/topics/theme-development$ /$1/developer_guides/templates/themes [R=301,L] RewriteRule ^(.*)/topics/versioning$ /$1/developer_guides/model/versioning [R=301,L] RewriteRule ^(.*)/topics/widgets$ https://github.com/silverstripe/silverstripe-widgets [R=301,L] + RewriteRule ^(.*)/topics/configuration$ /$1/developer_guides/configuration [R=301,L] + RewriteRule ^(.*)/topics/controller$ /$1/developer_guides/controllers [R=301,L] + RewriteRule ^(.*)/topics/css$ /$1/developer_guides/templates [R=301,L] + RewriteRule ^(.*)/topics/data-types$ /$1/developer_guides/model/data_types_and_casting [R=301,L] + RewriteRule ^(.*)/topics/datamodel$ /$1/developer_guides/model [R=301,L] + RewriteRule ^(.*)/topics/debugging$ /$1/developer_guides/debugging [R=301,L] + RewriteRule ^(.*)/topics/email$ /$1/developer_guides/email [R=301,L] + RewriteRule ^(.*)/topics/error-handling$ /$1/developer_guides/debugging/error_handling [R=301,L] + RewriteRule ^(.*)/topics/forms$ /$1/developer_guides/forms [R=301,L] + RewriteRule ^(.*)/tutorials/1-building-a-basic-site$ /$1/tutorials/building_a_basic_site [R=301,L] RewriteRule ^(.*)/tutorials/2-extending-a-basic-site$ /$1/tutorials/extending_a_basic_site [R=301,L] RewriteRule ^(.*)/tutorials/3-forms$ /$1/tutorials/forms [R=301,L]