Skip to content

Commit

Permalink
fixing typos
Browse files Browse the repository at this point in the history
  • Loading branch information
rchavik committed Oct 19, 2011
1 parent 95737d7 commit 2bb9376
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion app/webroot/css/cake.generic.css
Expand Up @@ -611,7 +611,7 @@ pre {
overflow: auto;
position: relative;
-moz-border-radius: 4px;
-wekbkit-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.cake-stack-trace a {
Expand Down
2 changes: 1 addition & 1 deletion app/webroot/index.php
Expand Up @@ -49,7 +49,7 @@
* The absolute path to the "cake" directory, WITHOUT a trailing DS.
*
* Un-comment this line to specify a fixed path to CakePHP.
* This should point at the directory containg `Cake`.
* This should point at the directory containing `Cake`.
*
* For ease of development CakePHP uses PHP's include_path. If you
* cannot modify your include_path set this value.
Expand Down
2 changes: 1 addition & 1 deletion index.php
Expand Up @@ -3,7 +3,7 @@
* Requests collector.
*
* This file collects requests if:
* - no mod_rewrite is avilable or .htaccess files are not supported
* - no mod_rewrite is available or .htaccess files are not supported
* - requires App.baseUrl to be uncommented in app/Config/core.php
* - app/webroot is not set as a document root.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Cache/Cache.php
Expand Up @@ -96,7 +96,7 @@ class Cache {
*
* - `duration` Specify how long items in this cache configuration last.
* - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
* with either another cache config or annother application.
* with either another cache config or another application.
* - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
* cache::gc from ever being called automatically.
* - `servers' Used by memcache. Give the address of the memcached servers to use.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Console/Templates/skel/webroot/index.php
Expand Up @@ -49,7 +49,7 @@
* The absolute path to the "cake" directory, WITHOUT a trailing DS.
*
* Un-comment this line to specify a fixed path to CakePHP.
* This should point at the directory containg `Cake`.
* This should point at the directory containing `Cake`.
*
* For ease of development CakePHP uses PHP's include_path. If you
* cannot modify your include_path set this value.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component.php
Expand Up @@ -18,7 +18,7 @@
App::uses('ComponentCollection', 'Controller');

/**
* Base class for an individual Component. Components provide resuable bits of
* Base class for an individual Component. Components provide reusable bits of
* controller logic that can be composed into a controller. Components also
* provide request life-cycle callbacks for injecting logic at specific points.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/AuthComponent.php
Expand Up @@ -536,7 +536,7 @@ public function logout() {
/**
* Get the current user from the session.
*
* @param string $key field to retrive. Leave null to get entire User record
* @param string $key field to retrieve. Leave null to get entire User record
* @return mixed User record. or null if no user is logged in.
* @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Scaffold.php
Expand Up @@ -212,7 +212,7 @@ protected function _scaffoldForm($action = 'edit') {
* Saves or updates the scaffolded model.
*
* @param CakeRequest $request Request Object for scaffolding
* @param string $action add or edt
* @param string $action add or edit
* @return mixed Success on save/update, add/edit form if data is empty or error if save or update fails
* @throws NotFoundException
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Core/CakePlugin.php
Expand Up @@ -194,7 +194,7 @@ public static function routes($plugin = null) {
}

/**
* Retruns true if the plugin $plugin is already loaded
* Returns true if the plugin $plugin is already loaded
* If plugin is null, it will return a list of all loaded plugins
*
* @param string $plugin
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/BehaviorCollection.php
Expand Up @@ -2,7 +2,7 @@
/**
* BehaviorCollection
*
* Provides managment and interface for interacting with collections of behaviors.
* Provides management and interface for interacting with collections of behaviors.
*
* PHP 5
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Model/Model.php
Expand Up @@ -722,7 +722,7 @@ public function __call($method, $params) {
}

/**
* Handles the lazy loading of model associations by lookin in the association arrays for the requested variable
* Handles the lazy loading of model associations by looking in the association arrays for the requested variable
*
* @param string $name variable tested for existance in class
* @return boolean true if the variable exists (if is a not loaded model association it will be created), false otherwise
Expand Down Expand Up @@ -3032,7 +3032,7 @@ public function invalidFields($options = array()) {
* Runs validation for hasAndBelongsToMany associations that have 'with' keys
* set. And data in the set() data set.
*
* @param array $options Array of options to use on Valdation of with models
* @param array $options Array of options to use on Validation of with models
* @return boolean Failure of validation on with models.
* @see Model::validates()
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/ModelBehavior.php
Expand Up @@ -23,7 +23,7 @@
* Model behavior base class.
*
* Defines the Behavior interface, and contains common model interaction functionality. Behaviors
* allow you to simulate mixins, and create resuable blocks of application logic, that can be reused across
* allow you to simulate mixins, and create reusable blocks of application logic, that can be reused across
* several models. Behaviors also provide a way to hook into model callbacks and augment their behavior.
*
* ### Mixin methods
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Dispatcher.php
@@ -1,6 +1,6 @@
<?php
/**
* Dispatcher takes the URL information, parses it for paramters and
* Dispatcher takes the URL information, parses it for parameters and
* tells the involved controllers what to do.
*
* This is the heart of Cake's operation.
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Router.php
Expand Up @@ -144,7 +144,7 @@ class Router {
protected static $_requests = array();

/**
* Initial state is popualated the first time reload() is called which is at the bottom
* Initial state is populated the first time reload() is called which is at the bottom
* of this file. This is a cheat as get_class_vars() returns the value of static vars even if they
* have changed.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/TestSuite/CakeTestSuite.php
@@ -1,6 +1,6 @@
<?php
/**
* A class to contain test cases and run them with shered fixtures
* A class to contain test cases and run them with shared fixtures
*
* PHP 5
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Utility/Debugger.php
Expand Up @@ -204,7 +204,7 @@ public static function log($var, $level = LOG_DEBUG) {
* @param integer $line Line that triggered the error
* @param array $context Context
* @return boolean true if error was handled
* @deprecated This function is supersceeded by Debugger::outputError()
* @deprecated This function is superseded by Debugger::outputError()
*/
public static function showError($code, $description, $file = null, $line = null, $context = null) {
$_this = Debugger::getInstance();
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Utility/String.php
Expand Up @@ -255,7 +255,7 @@ public static function insert($str, $data, $options = array()) {
/**
* Cleans up a String::insert() formated string with given $options depending on the 'clean' key in
* $options. The default method used is text but html is also available. The goal of this function
* is to replace all whitespace and uneeded markup around placeholders that did not get replaced
* is to replace all whitespace and unneeded markup around placeholders that did not get replaced
* by String::insert().
*
* @param string $str
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/Utility/Validation.php
Expand Up @@ -522,7 +522,7 @@ public static function money($check, $symbolPosition = 'left') {
* Valid Options
*
* - in => provide a list of choices that selections must be made from
* - max => maximun number of non-zero choices that can be made
* - max => maximum number of non-zero choices that can be made
* - min => minimum number of non-zero choices that can be made
*
* @param mixed $check Value to check
Expand Down Expand Up @@ -556,7 +556,7 @@ public static function multiple($check, $options = array()) {
* Checks if a value is numeric.
*
* @param string $check Value to check
* @return boolean Succcess
* @return boolean Success
*/
public static function numeric($check) {
return is_numeric($check);
Expand Down Expand Up @@ -715,7 +715,7 @@ public static function url($check, $strict = false) {
*
* @param string $check Value to check
* @param array $list List to check against
* @return boolean Succcess
* @return boolean Success
*/
public static function inList($check, $list) {
return in_array($check, $list);
Expand Down

0 comments on commit 2bb9376

Please sign in to comment.