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

MINOR Changed silverstripe.com references to silverstripe.org 

MINOR Fixed broken wiki links (#4672) (from r90886)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90957 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-11-06 03:35:07 +00:00
parent 7b7d11dd08
commit 4252067f0c
12 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.php
View File

@ -62,7 +62,7 @@ define('MCE_ROOT', 'jsparty/tiny_mce/');
* Change this to something different for increase security (you can * Change this to something different for increase security (you can
* override it in mysite/_config.php to ease upgrades). * override it in mysite/_config.php to ease upgrades).
* For more information see: * 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'); define('EMAIL_BOUNCEHANDLER_KEY', '1aaaf8fb60ea253dbf6efa71baaacbb3');

2
api/RestfulService.php
View File

@ -2,7 +2,7 @@
/** /**
* RestfulService class allows you to consume various RESTful APIs. * RestfulService class allows you to consume various RESTful APIs.
* Through this you could connect and aggregate data of various web services. * 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 * @package sapphire
* @subpackage integration * @subpackage integration
*/ */

4
conf/ConfigureFromEnv.php
View File

@ -50,7 +50,7 @@ if(defined('SS_ENVIRONMENT_FILE')) {
'SS_DATABASE_PASSWORD', 'SS_DATABASE_PASSWORD',
'SS_DATABASE_USERNAME', 'SS_DATABASE_USERNAME',
'SS_ENVIRONMENT_TYPE',) as $reqDefine) { '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_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); Security::setDefaultAdmin(SS_DEFAULT_ADMIN_USERNAME, SS_DEFAULT_ADMIN_PASSWORD);
} }
if(defined('SS_USE_BASIC_AUTH') && SS_USE_BASIC_AUTH) { if(defined('SS_USE_BASIC_AUTH') && SS_USE_BASIC_AUTH) {

2
core/control/ContentController.php
View File

@ -440,7 +440,7 @@ HTML;
$password = Session::get('password'); $password = Session::get('password');
$title->setValue("Installation Successful"); $title->setValue("Installation Successful");
global $project; global $project;
$tutorialOnly = ($project == 'tutorial') ? "<p>This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at <a href=\"http://doc.silverstripe.com/doku.php?id=tutorial:1-building-a-basic-site\">our new tutorials</a>.</p>" : ''; $tutorialOnly = ($project == 'tutorial') ? "<p>This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at <a href=\"http://doc.silverstripe.org/doku.php?id=tutorials\">our new tutorials</a>.</p>" : '';
$content->setValue(<<<HTML $content->setValue(<<<HTML
<p style="margin: 1em 0"><b>Congratulations, SilverStripe has been successfully installed.</b></p> <p style="margin: 1em 0"><b>Congratulations, SilverStripe has been successfully installed.</b></p>

6
core/control/ContentNegotiator.php
View File

@ -22,9 +22,9 @@
* *
* @package sapphire * @package sapphire
* @subpackage control * @subpackage control
* @see http://doc.silverstripe.com/doku.php?id=xhtml-support * @see http://doc.silverstripe.org/doku.php?id=xhtml-support
* @see http://doc.silverstripe.com/doku.php?id=contentnegotiator * @see http://doc.silverstripe.org/doku.php?id=contentnegotiator
* @see http://doc.silverstripe.com/doku.php?id=html * @see http://doc.silverstripe.org/doku.php?id=html
* *
* @todo Check for correct XHTML doctype in xhtml() * @todo Check for correct XHTML doctype in xhtml()
* @todo Allow for other HTML4 doctypes (e.g. Transitional) in html() * @todo Allow for other HTML4 doctypes (e.g. Transitional) in html()

2
core/model/SiteTree.php
View File

@ -1230,7 +1230,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$homepage = new Page(); $homepage = new Page();
$homepage->Title = _t('SiteTree.DEFAULTHOMETITLE', 'Home'); $homepage->Title = _t('SiteTree.DEFAULTHOMETITLE', 'Home');
$homepage->Content = _t('SiteTree.DEFAULTHOMECONTENT', '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>. You can now access the <a href="http://doc.silverstripe.com">developer documentation</a>, or begin <a href="http://doc.silverstripe.com/doku.php?id=tutorials">the tutorials.</a></p>'); $homepage->Content = _t('SiteTree.DEFAULTHOMECONTENT', '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>. You can now access the <a href="http://doc.silverstripe.org">developer documentation</a>, or begin <a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>');
$homepage->URLSegment = "home"; $homepage->URLSegment = "home";
$homepage->Status = "Published"; $homepage->Status = "Published";
$homepage->write(); $homepage->write();

2
core/model/Translatable.php
View File

@ -145,7 +145,7 @@
* or manually filter out translated objects through their "Locale" property * or manually filter out translated objects through their "Locale" property
* in the database. * in the database.
* *
* @see http://doc.silverstripe.com/doku.php?id=multilingualcontent * @see http://doc.silverstripe.org/doku.php?id=multilingualcontent
* *
* @author Ingo Schommer <ingo (at) silverstripe (dot) com> * @author Ingo Schommer <ingo (at) silverstripe (dot) com>
* @author Michael Gall <michael (at) wakeless (dot) net> * @author Michael Gall <michael (at) wakeless (dot) net>

2
dev/DevelopmentAdmin.php
View File

@ -46,7 +46,7 @@ class DevelopmentAdmin extends Controller {
} }
else { else {
echo 'Warning: You probably want to define $_FILE_TO_URL_MAPPING in '. 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";
} }
} }

8
dev/install/config-form.html
View File

@ -37,14 +37,14 @@
<?php if(isset($hasErrorOtherThanDatabase)) { ?> <?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="error"> <p class="error">
You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br /> You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br />
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.com/doku.php?id=server-requirements">server requirements wiki page</a>. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
</p> </p>
<?php } else { ?> <?php } else { ?>
<?php if($req->hasWarnings()) { ?> <?php if($req->hasWarnings()) { ?>
<p class="warning"> <p class="warning">
There are some issues that we recommend you look at before installing, however, you are still able to install the software. 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.<br /> Please see below for details.<br />
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.com/doku.php?id=server-requirements">server requirements wiki page</a>. If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
</p> </p>
<?php } else if(!$dbReq->hasErrors()) { ?> <?php } else if(!$dbReq->hasErrors()) { ?>
<p class="good"> <p class="good">
@ -143,7 +143,7 @@
127.0.0.1</textarea></span> 127.0.0.1</textarea></span>
</p> </p>
<p class="devHelp"> <p class="devHelp">
SilverStripe allows you to run a site in <a href="http://doc.silverstripe.com/doku.php?id=devmode">development mode</a>. SilverStripe allows you to run a site in <a href="http://doc.silverstripe.org/doku.php?id=configuration">development mode</a>.
This shows all error messages in the web browser instead of emailing them to the administrator, and allows 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 the database to be built without logging in as administrator. Please enter the host/domain names for servers
you will be using for development. you will be using for development.
@ -166,7 +166,7 @@
<div id="Footer"> <div id="Footer">
<div class="footerTop"><!-- --></div> <div class="footerTop"><!-- --></div>
<p><a href="http://www.silverstripe.com">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p> <p><a href="http://www.silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p>
</div> </div>
</div> </div>
</body> </body>

2
dev/install/php5-required.html
View File

@ -33,7 +33,7 @@
<div id="Footer"> <div id="Footer">
<div class="footerTop"><!-- --></div> <div class="footerTop"><!-- --></div>
<p><a href="http://www.silverstripe.com">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p> <p><a href="http://www.silverstripe.org">SilverStripe Open Source CMS</a> | Copyright &copy; 2008 SilverStripe Limited</p>
</div> </div>
</div> </div>
</body> </body>

4
lang/en_US.php
View File

@ -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. $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.'; Enter your credentials below and we will send you right along.';
$lang['en_US']['SecurityAdmin']['ADVANCEDONLY'] = 'This section is for advanced users only. $lang['en_US']['SecurityAdmin']['ADVANCEDONLY'] = 'This section is for advanced users only.
See <a href="http://doc.silverstripe.com/doku.php?id=permissions:codes" target="_blank">this page</a> See <a href="http://doc.silverstripe.org/doku.php?id=permissions:codes" target="_blank">this page</a>
for more information.'; for more information.';
$lang['en_US']['SecurityAdmin']['GROUPNAME'] = 'Group name'; $lang['en_US']['SecurityAdmin']['GROUPNAME'] = 'Group name';
$lang['en_US']['SecurityAdmin']['IPADDRESSESHELP'] = '<p>You can restrict this group to a particular $lang['en_US']['SecurityAdmin']['IPADDRESSESHELP'] = '<p>You can restrict this group to a particular
@ -690,7 +690,7 @@ $lang['en_US']['SiteTree']['DEFAULTABOUTCONTENT'] = '<p>You can fill this page o
$lang['en_US']['SiteTree']['DEFAULTABOUTTITLE'] = 'About Us'; $lang['en_US']['SiteTree']['DEFAULTABOUTTITLE'] = 'About Us';
$lang['en_US']['SiteTree']['DEFAULTCONTACTCONTENT'] = '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>'; $lang['en_US']['SiteTree']['DEFAULTCONTACTCONTENT'] = '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>';
$lang['en_US']['SiteTree']['DEFAULTCONTACTTITLE'] = 'Contact Us'; $lang['en_US']['SiteTree']['DEFAULTCONTACTTITLE'] = 'Contact Us';
$lang['en_US']['SiteTree']['DEFAULTHOMECONTENT'] = '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>. You can now access the <a href="http://doc.silverstripe.com">developer documentation</a>, or begin <a href="http://doc.silverstripe.com/doku.php?id=tutorials">the tutorials.</a></p>'; $lang['en_US']['SiteTree']['DEFAULTHOMECONTENT'] = '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>. You can now access the <a href="http://doc.silverstripe.org">developer documentation</a>, or begin <a href="http://doc.silverstripe.org/doku.php?id=tutorials">the tutorials.</a></p>';
$lang['en_US']['SiteTree']['DEFAULTHOMETITLE'] = 'Home'; $lang['en_US']['SiteTree']['DEFAULTHOMETITLE'] = 'Home';
$lang['en_US']['SiteTree']['DELETEDPAGE'] = 'Deleted page'; $lang['en_US']['SiteTree']['DELETEDPAGE'] = 'Deleted page';
$lang['en_US']['SiteTree']['EDITANYONE'] = 'Anyone who can log-in to the CMS'; $lang['en_US']['SiteTree']['EDITANYONE'] = 'Anyone who can log-in to the CMS';

4
search/SearchForm.php
View File

@ -88,7 +88,7 @@ class SearchForm extends Form {
* @return DataObjectSet * @return DataObjectSet
*/ */
public function getResults($pageLength = null, $data = null){ 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; if(!isset($data) || !is_array($data)) $data = $_REQUEST;
// set language (if present) // set language (if present)
@ -160,7 +160,7 @@ class SearchForm extends Form {
* @return string * @return string
*/ */
public function getSearchQuery($data = null) { 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; if(!isset($data)) $data = $_REQUEST;
return Convert::raw2xml($data['Search']); return Convert::raw2xml($data['Search']);