Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Additional Cake references to CakePHP and docblock typo
  • Loading branch information
Bryan Crowe committed Oct 9, 2013
1 parent ce1939c commit 4242bd4
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -11,7 +11,7 @@ Some Handy Links

[CakePHP](http://www.cakephp.org) - The rapid development PHP framework

[Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here!
[Cookbook](http://book.cakephp.org) - THE CakePHP user documentation; start learning here!

[Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework

Expand Down
2 changes: 1 addition & 1 deletion app/Config/acl.php
Expand Up @@ -2,7 +2,7 @@
/**
* This is the PHP base ACL configuration file.
*
* Use it to configure access control of your Cake application.
* Use it to configure access control of your CakePHP application.
*
* PHP 5
*
Expand Down
4 changes: 2 additions & 2 deletions app/View/Pages/home.ctp
Expand Up @@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
echo __d('cake_dev', 'Cake is able to connect to the database.');
echo __d('cake_dev', 'CakePHP is able to connect to the database.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
echo '<br /><br />';
echo $errorMsg;
echo '</span>';
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Command/AclShell.php
Expand Up @@ -76,7 +76,7 @@ public function startup() {
App::uses($class, $plugin . 'Controller/Component/Acl');
if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) {
$out = "--------------------------------------------------\n";
$out .= __d('cake_console', 'Error: Your current Cake configuration is set to an ACL implementation other than DB.') . "\n";
$out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.') . "\n";
$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n";
$out .= "--------------------------------------------------\n";
$out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n";
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/ShellDispatcher.php
Expand Up @@ -98,7 +98,7 @@ protected function _initConstants() {
*/
protected function _initEnvironment() {
if (!$this->_bootstrap()) {
$message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'Cake exists in ' . CAKE_CORE_INCLUDE_PATH;
$message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'CakePHP exists in ' . CAKE_CORE_INCLUDE_PATH;
throw new CakeException($message);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/Config/acl.ini.php
Expand Up @@ -10,7 +10,7 @@
; * @since CakePHP(tm) v 0.10.0.1076
; */

; acl.ini.php - Cake ACL Configuration
; acl.ini.php - CakePHP ACL Configuration
; ---------------------------------------------------------------------
; Use this file to specify user permissions.
; aco = access control object (something in your application)
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/Config/acl.php
Expand Up @@ -2,7 +2,7 @@
/**
* This is the PHP base ACL configuration file.
*
* Use it to configure access control of your Cake application.
* Use it to configure access control of your CakePHP application.
*
* PHP 5
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Console/Templates/skel/View/Pages/home.ctp
Expand Up @@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
echo __d('cake_dev', 'Cake is able to connect to the database.');
echo __d('cake_dev', 'CakePHP is able to connect to the database.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
echo '<br /><br />';
echo $errorMsg;
echo '</span>';
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Controller.php
Expand Up @@ -713,7 +713,7 @@ public function httpCodes($code = null) {

/**
* Loads and instantiates models required by this controller.
* If the model is non existent, it will throw a missing database table error, as Cake generates
* If the model is non existent, it will throw a missing database table error, as CakePHP generates
* dynamic models for the time being.
*
* @param string $modelClass Name of model class to load
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Core/Configure.php
Expand Up @@ -169,7 +169,7 @@ public static function write($config, $value = null) {
}

/**
* Used to read information stored in Configure. Its not
* Used to read information stored in Configure. It's not
* possible to store `null` values in Configure.
*
* Usage:
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/Model.php
Expand Up @@ -2,7 +2,7 @@
/**
* Object-relational mapper.
*
* DBO-backed object data model, for mapping database tables to Cake objects.
* DBO-backed object data model, for mapping database tables to CakePHP objects.
*
* PHP 5
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/ModelBehavior.php
Expand Up @@ -2,7 +2,7 @@
/**
* Model behaviors base class.
*
* Adds methods and automagic functionality to Cake Models.
* Adds methods and automagic functionality to CakePHP Models.
*
* PHP 5
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Network/CakeSocket.php
@@ -1,6 +1,6 @@
<?php
/**
* Cake Socket connection class.
* CakePHP Socket connection class.
*
* PHP 5
*
Expand All @@ -21,7 +21,7 @@
App::uses('Validation', 'Utility');

/**
* Cake network socket connection class.
* CakePHP network socket connection class.
*
* Core base class for network communication.
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Network/Email/CakeEmail.php
@@ -1,6 +1,6 @@
<?php
/**
* Cake E-Mail
* CakePHP Email
*
* PHP 5
*
Expand All @@ -26,7 +26,7 @@
App::uses('View', 'View');

/**
* Cake e-mail class.
* CakePHP email class.
*
* This class is used for handling Internet Message Format based
* based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Network/Http/HttpSocket.php
Expand Up @@ -23,7 +23,7 @@
App::uses('Hash', 'Utility');

/**
* Cake network socket connection class.
* CakePHP network socket connection class.
*
* Core base class for HTTP network communication. HttpSocket can be used as an
* Object Oriented replacement for cURL in many places.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Router.php
Expand Up @@ -372,7 +372,7 @@ public static function connect($route, $defaults = array(), $options = array())
* routes that end in `*` are greedy. As you can remap URLs and not loose any passed/named args.
*
* @param string $route A string describing the template of the route
* @param array $url A URL to redirect to. Can be a string or a Cake array-based URL
* @param array $url A URL to redirect to. Can be a string or a CakePHP array-based URL
* @param array $options An array matching the named elements in the route to regular expressions which that
* element should match. Also contains additional parameters such as which routed parameters should be
* shifted into the passed arguments. As well as supplying patterns for routing parameters.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/basics.php
@@ -1,6 +1,6 @@
<?php
/**
* Basic Cake functionality.
* Basic CakePHP functionality.
*
* Core functions for including other source files, loading models and so forth.
*
Expand Down

0 comments on commit 4242bd4

Please sign in to comment.