From 3b794bb97a42a712c142d33a9f85eccc6ab88ae2 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 5 Nov 2009 03:07:17 +0000 Subject: [PATCH] MINOR Changed silverstripe.com references to silverstripe.org MINOR Fixed broken wiki links (#4672) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@90886 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- _config.php | 2 +- api/RestfulService.php | 2 +- conf/ConfigureFromEnv.php | 4 ++-- core/control/ContentController.php | 2 +- core/control/ContentNegotiator.php | 6 +++--- core/model/SiteTree.php | 2 +- core/model/Translatable.php | 2 +- dev/DevelopmentAdmin.php | 2 +- dev/install/config-form.html | 8 ++++---- dev/install/php5-required.html | 2 +- lang/en_US.php | 4 ++-- search/SearchForm.php | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/_config.php b/_config.php index 2df556ef3..f9e932c73 100755 --- a/_config.php +++ b/_config.php @@ -62,7 +62,7 @@ define('MCE_ROOT', 'jsparty/tiny_mce/'); * Change this to something different for increase security (you can * override it in mysite/_config.php to ease upgrades). * For more information see: - * {@link http://doc.silverstripe.com/doku.php?id=email_bouncehandler} + * {@link http://doc.silverstripe.org/doku.php?id=email_bouncehandler} */ define('EMAIL_BOUNCEHANDLER_KEY', '1aaaf8fb60ea253dbf6efa71baaacbb3'); diff --git a/api/RestfulService.php b/api/RestfulService.php index 84a066eda..4d9e7b119 100644 --- a/api/RestfulService.php +++ b/api/RestfulService.php @@ -2,7 +2,7 @@ /** * RestfulService class allows you to consume various RESTful APIs. * Through this you could connect and aggregate data of various web services. - * For more info visit wiki documentation - http://doc.silverstripe.com/doku.php?id=restfulservice + * For more info visit wiki documentation - http://doc.silverstripe.org/doku.php?id=restfulservice * @package sapphire * @subpackage integration */ diff --git a/conf/ConfigureFromEnv.php b/conf/ConfigureFromEnv.php index 12e76bbe7..d72667323 100644 --- a/conf/ConfigureFromEnv.php +++ b/conf/ConfigureFromEnv.php @@ -50,7 +50,7 @@ if(defined('SS_ENVIRONMENT_FILE')) { 'SS_DATABASE_PASSWORD', 'SS_DATABASE_USERNAME', 'SS_ENVIRONMENT_TYPE',) as $reqDefine) { - if(!defined($reqDefine)) user_error("$reqDefine must be defined in your _ss_environment.php. See http://doc.silverstripe.com/doku.php?id=environment-management for more infomration", E_USER_ERROR); + if(!defined($reqDefine)) user_error("$reqDefine must be defined in your _ss_environment.php. See http://doc.silverstripe.org/doku.php?id=environment-management for more infomration", E_USER_ERROR); } } @@ -94,7 +94,7 @@ if(defined('SS_SEND_ALL_EMAILS_TO')) { } if(defined('SS_DEFAULT_ADMIN_USERNAME')) { - if(!defined('SS_DEFAULT_ADMIN_PASSWORD')) user_error("SS_DEFAULT_ADMIN_PASSWORD must be defined in your _ss_environment.php, if SS_DEFAULT_ADMIN_USERNAME is defined. See http://doc.silverstripe.com/doku.php?id=environment-management for more infomration", E_USER_ERROR); + if(!defined('SS_DEFAULT_ADMIN_PASSWORD')) user_error("SS_DEFAULT_ADMIN_PASSWORD must be defined in your _ss_environment.php, if SS_DEFAULT_ADMIN_USERNAME is defined. See http://doc.silverstripe.org/doku.php?id=environment-management for more infomration", E_USER_ERROR); Security::setDefaultAdmin(SS_DEFAULT_ADMIN_USERNAME, SS_DEFAULT_ADMIN_PASSWORD); } if(defined('SS_USE_BASIC_AUTH') && SS_USE_BASIC_AUTH) { diff --git a/core/control/ContentController.php b/core/control/ContentController.php index cbdb5184b..5b3e53687 100755 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -440,7 +440,7 @@ HTML; $password = Session::get('password'); $title->setValue("Installation Successful"); global $project; - $tutorialOnly = ($project == 'tutorial') ? "

This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at our new tutorials.

" : ''; + $tutorialOnly = ($project == 'tutorial') ? "

This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at our new tutorials.

" : ''; $content->setValue(<<Congratulations, SilverStripe has been successfully installed.

diff --git a/core/control/ContentNegotiator.php b/core/control/ContentNegotiator.php index ff06ccc48..d798ee77a 100755 --- a/core/control/ContentNegotiator.php +++ b/core/control/ContentNegotiator.php @@ -22,9 +22,9 @@ * * @package sapphire * @subpackage control - * @see http://doc.silverstripe.com/doku.php?id=xhtml-support - * @see http://doc.silverstripe.com/doku.php?id=contentnegotiator - * @see http://doc.silverstripe.com/doku.php?id=html + * @see http://doc.silverstripe.org/doku.php?id=xhtml-support + * @see http://doc.silverstripe.org/doku.php?id=contentnegotiator + * @see http://doc.silverstripe.org/doku.php?id=html * * @todo Check for correct XHTML doctype in xhtml() * @todo Allow for other HTML4 doctypes (e.g. Transitional) in html() diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index df90ba731..ff85bd793 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -1230,7 +1230,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $homepage = new Page(); $homepage->Title = _t('SiteTree.DEFAULTHOMETITLE', 'Home'); - $homepage->Content = _t('SiteTree.DEFAULTHOMECONTENT', '

Welcome to SilverStripe! This is the default homepage. You can edit this page by opening the CMS. You can now access the developer documentation, or begin the tutorials.

'); + $homepage->Content = _t('SiteTree.DEFAULTHOMECONTENT', '

Welcome to SilverStripe! This is the default homepage. You can edit this page by opening the CMS. You can now access the developer documentation, or begin the tutorials.

'); $homepage->URLSegment = "home"; $homepage->Status = "Published"; $homepage->write(); diff --git a/core/model/Translatable.php b/core/model/Translatable.php index f07a8f650..8298cdf74 100755 --- a/core/model/Translatable.php +++ b/core/model/Translatable.php @@ -145,7 +145,7 @@ * or manually filter out translated objects through their "Locale" property * in the database. * - * @see http://doc.silverstripe.com/doku.php?id=multilingualcontent + * @see http://doc.silverstripe.org/doku.php?id=multilingualcontent * * @author Ingo Schommer * @author Michael Gall diff --git a/dev/DevelopmentAdmin.php b/dev/DevelopmentAdmin.php index 8d609f5dc..7f3d03076 100644 --- a/dev/DevelopmentAdmin.php +++ b/dev/DevelopmentAdmin.php @@ -46,7 +46,7 @@ class DevelopmentAdmin extends Controller { } else { echo 'Warning: You probably want to define $_FILE_TO_URL_MAPPING in '. - 'your _ss_environment.php as instructed on the "sake" page of the doc.silverstripe.com wiki' . "\n"; + 'your _ss_environment.php as instructed on the "sake" page of the doc.silverstripe.org wiki' . "\n"; } } diff --git a/dev/install/config-form.html b/dev/install/config-form.html index 893f2efac..7d413880a 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -37,14 +37,14 @@

You aren't currently able to install the software. Please see below for details.
- If you are having problems meeting the requirements, see the server requirements wiki page. + If you are having problems meeting the requirements, see the server requirements wiki page.

hasWarnings()) { ?>

There are some issues that we recommend you look at before installing, however, you are still able to install the software. Please see below for details.
- If you are having problems meeting the requirements, see the server requirements wiki page. + If you are having problems meeting the requirements, see the server requirements wiki page.

hasErrors()) { ?>

@@ -143,7 +143,7 @@ 127.0.0.1

- SilverStripe allows you to run a site in development mode. + SilverStripe allows you to run a site in development mode. This shows all error messages in the web browser instead of emailing them to the administrator, and allows the database to be built without logging in as administrator. Please enter the host/domain names for servers you will be using for development. @@ -166,7 +166,7 @@

diff --git a/dev/install/php5-required.html b/dev/install/php5-required.html index 7169b0899..d4890865b 100644 --- a/dev/install/php5-required.html +++ b/dev/install/php5-required.html @@ -33,7 +33,7 @@ diff --git a/lang/en_US.php b/lang/en_US.php index 46249fb6f..5bc7555b3 100644 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -633,7 +633,7 @@ $lang['en_US']['Security']['PASSWORDSENTTEXT'] = 'Thank you! A reset link has be $lang['en_US']['Security']['PERMFAILURE'] = ' This page is secured and you need administrator rights to access it. Enter your credentials below and we will send you right along.'; $lang['en_US']['SecurityAdmin']['ADVANCEDONLY'] = 'This section is for advanced users only. - See this page + See this page for more information.'; $lang['en_US']['SecurityAdmin']['GROUPNAME'] = 'Group name'; $lang['en_US']['SecurityAdmin']['IPADDRESSESHELP'] = '

You can restrict this group to a particular @@ -690,7 +690,7 @@ $lang['en_US']['SiteTree']['DEFAULTABOUTCONTENT'] = '

You can fill this page o $lang['en_US']['SiteTree']['DEFAULTABOUTTITLE'] = 'About Us'; $lang['en_US']['SiteTree']['DEFAULTCONTACTCONTENT'] = '

You can fill this page out with your own content, or delete it and create your own pages.

'; $lang['en_US']['SiteTree']['DEFAULTCONTACTTITLE'] = 'Contact Us'; -$lang['en_US']['SiteTree']['DEFAULTHOMECONTENT'] = '

Welcome to SilverStripe! This is the default homepage. You can edit this page by opening the CMS. You can now access the developer documentation, or begin the tutorials.

'; +$lang['en_US']['SiteTree']['DEFAULTHOMECONTENT'] = '

Welcome to SilverStripe! This is the default homepage. You can edit this page by opening the CMS. You can now access the developer documentation, or begin the tutorials.

'; $lang['en_US']['SiteTree']['DEFAULTHOMETITLE'] = 'Home'; $lang['en_US']['SiteTree']['DELETEDPAGE'] = 'Deleted page'; $lang['en_US']['SiteTree']['EDITANYONE'] = 'Anyone who can log-in to the CMS'; diff --git a/search/SearchForm.php b/search/SearchForm.php index 2e02d0d73..ce720a2c6 100755 --- a/search/SearchForm.php +++ b/search/SearchForm.php @@ -88,7 +88,7 @@ class SearchForm extends Form { * @return DataObjectSet */ public function getResults($pageLength = null, $data = null){ - // legacy usage: $data was defaulting to $_REQUEST, parameter not passed in doc.silverstripe.com tutorials + // legacy usage: $data was defaulting to $_REQUEST, parameter not passed in doc.silverstripe.org tutorials if(!isset($data) || !is_array($data)) $data = $_REQUEST; // set language (if present) @@ -160,7 +160,7 @@ class SearchForm extends Form { * @return string */ public function getSearchQuery($data = null) { - // legacy usage: $data was defaulting to $_REQUEST, parameter not passed in doc.silverstripe.com tutorials + // legacy usage: $data was defaulting to $_REQUEST, parameter not passed in doc.silverstripe.org tutorials if(!isset($data)) $data = $_REQUEST; return Convert::raw2xml($data['Search']);