tonyair
/
doc.silverstripe.org
mirror of https://github.com/silverstripe/doc.silverstripe.org
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 65df571780 into 95161d2daa

This commit is contained in:
David Alexander 2015-07-10 01:44:01 +00:00
parent 95161d2daa 65df571780
commit db7dfa7ffe
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.htaccess
View File

@ -38,6 +38,14 @@
RewriteCond %{REQUEST_URI} !(3.0|2.4)
RewriteRule ^(.*)/topics/testing/create-functional-test$ /$1/topics/testing/creating-a-functional-test [R=301,L]
RewriteRule ^(.*)/authenticator/?$ /$1/en/developer_guides/security/authentication [R=301,L]
RewriteRule ^(.*)/changelog/?$ /$1/en/changelogs [R=301,L]
RewriteRule ^(.*)/datefield/?$ /$1/en/developer_guides/forms/field_types/datefield [R=301,L]
RewriteRule ^docs.silverstripe.org/modules:mssql/?$ addons.silverstripe.org/add-ons/silverstripe/mssql [R=301,L]
RewriteRule ^docs.silverstripe.org/modules:rssaggregator/?$ addons.silverstripe.org/add-ons/silverstripe/versionfeed [R=301,L]
RewriteRule ^(.*)/howto$ /$1/developer_guides [R=301,L]
RewriteRule ^(.*)/howto/cache-control$ /$1/developer_guides/performance/caching [R=301,L]
RewriteRule ^(.*)/howto/cms-alternating-button$ /$1/developer_guides/customising_the_admin_interface/how_tos/cms_alternating_button [R=301,L]
@ -54,10 +62,11 @@
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/?$ /$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]
RewriteRule ^(.*)/installation/from-source$ /$1/getting_started/installation [R=301,L]
RewriteRule ^(.*)/installation-into-subversion/?$ /$1/en/getting_started_composer/ [R=301,L]
RewriteRule ^(.*)/installation/lighttpd$ /$1/getting_started/installation/how_to/configure_lighttpd [R=301,L]
RewriteRule ^(.*)/installation/mac-osx$ /$1/getting_started/installation/mac_osx [R=301,L]
RewriteRule ^(.*)/installation/nginx$ /$1/getting_started/installation/how_to/configure_nginx [R=301,L]
@ -71,6 +80,8 @@
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 ^(.*)/member/?$ /$1/en/developer_guides/security/member [R=301,L]
RewriteRule ^(.*)/memberauthenticator/?$ /$1/en/developer_guides/security/authentication [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]
@ -80,6 +91,7 @@
RewriteRule ^(.*)/misc/contributing/translation-process$ /$1/contributing/translation-process [R=301,L]
RewriteRule ^(.*)/misc/release-process$ /$1/contributing/release_process [R=301,L]
RewriteRule ^(.*)/recipes:combining_files/?$ /$1/developer_guides/templates/requirements [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]
@ -114,11 +126,13 @@
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 ^(.*)/treedropdownfield/?$ /$1/en/developer_guides/forms/field_types/common_subclasses [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]
RewriteRule ^(.*)/topics/caching$ /$1/developer_guides/performance/caching [R=301,L]
RewriteRule ^(.*)/topics/commandline$ /$1/developer_guides/cli [R=301,L]
RewriteRule ^(.*)/topics/datamodel/?$ /$1/developer_guides/model/data_model_and_orm [R=301,L]
RewriteRule ^(.*)/topics/directory-structure$ /$1/getting_started/directory_structure [R=301,L]
RewriteRule ^(.*)/topics/environment-management$ /$1/getting_started/environment_management [R=301,L]
RewriteRule ^(.*)/topics/files$ /$1/developer_guides/files [R=301,L]
@ -145,11 +159,11 @@
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]
RewriteRule ^(.*)/tutorials/4-site-search$ /$1/tutorials/site_search [R=301,L]
RewriteRule ^(.*)/tutorials/5-dataobject-relationship-management$ /$1/tutorials/dataobject_relationship_management [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]
RewriteRule ^(.*)/tutorials/4-site-search/?$ /$1/tutorials/site_search [R=301,L]
RewriteRule ^(.*)/tutorials/5-dataobject-relationship-management/?$ /$1/tutorials/dataobject_relationship_management [R=301,L]
# 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]