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

MINOR Keep using 'trunk' naming instead of 'master', as it confuses the hell out of ss2api 

git-svn-id: http://svn.silverstripe.com/projects/ss2doc/branches/v2@116585 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2011-02-24 04:57:53 +00:00
parent b3961ee2ab
commit 6ce0c75590
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@ -313,7 +313,9 @@
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 ^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]
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f

2
.htaccess_live
View File

@ -314,6 +314,8 @@
RewriteRule ^widgets$ http://doc.silverstripe.org/sapphire/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]
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f

2
mysite/_config.php
View File

@ -43,7 +43,7 @@ DocumentationSearch::enable();
try{
//DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.4/docs/", '2.4');
//DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_2.3/docs/", '2.3');
DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_master/docs/", 'master');
DocumentationService::register("sapphire", BASE_PATH ."/src/sapphire_master/docs/", 'trunk');
} catch(InvalidArgumentException $e) {
} // Silence if path is not found (for CI environment)