Merge pull request #257 from rchavik/etc

Fixing typos and removing 'empty' files from non-empty dirs

app/webroot/css/cake.generic.css

@@ -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 {

app/webroot/index.php

@@ -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.

index.php

@@ -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.
  *

lib/Cake/Cache/Cache.php

@@ -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.

lib/Cake/Console/Templates/skel/webroot/index.php

@@ -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.

lib/Cake/Controller/Component.php

@@ -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.
  *

lib/Cake/Controller/Component/AuthComponent.php

@@ -536,7 +536,7 @@ class AuthComponent extends Component {
 /**
  * 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
  */

lib/Cake/Controller/Scaffold.php

@@ -212,7 +212,7 @@ class Scaffold {
  * 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
  */

lib/Cake/Core/CakePlugin.php

@@ -194,7 +194,7 @@ class CakePlugin {
 	}
 
 /**
- * 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

lib/Cake/Model/BehaviorCollection.php

@@ -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
  *

lib/Cake/Model/Model.php

@@ -722,7 +722,7 @@ class Model extends Object {
 	}
 
 /**
- * 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
@@ -3032,7 +3032,7 @@ class Model extends Object {
  * 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()
  */

lib/Cake/Model/ModelBehavior.php

@@ -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

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.

lib/Cake/Routing/Router.php

@@ -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.
  *

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
  *

lib/Cake/Utility/Debugger.php

@@ -204,7 +204,7 @@ class Debugger {
  * @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();

lib/Cake/Utility/String.php

@@ -255,7 +255,7 @@ class String {
 /**
  * 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

lib/Cake/Utility/Validation.php

@@ -522,7 +522,7 @@ class Validation {
  * 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
@@ -556,7 +556,7 @@ class Validation {
  * 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);
@@ -715,7 +715,7 @@ class Validation {
  *
  * @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);