Merge pull request #2572 from bcrowe/hotfix-controllerBlocks

Update some grammar in Controller
This commit is contained in:
ADmad 2013-12-29 21:30:01 -08:00
commit f37eb9ad4b

View file

@ -29,7 +29,7 @@ App::uses('CakeEventManager', 'Event');
* *
* Controllers should provide a number of 'action' methods. These are public methods on the controller * Controllers should provide a number of 'action' methods. These are public methods on the controller
* that are not prefixed with a '_' and not part of Controller. Each action serves as an endpoint for * that are not prefixed with a '_' and not part of Controller. Each action serves as an endpoint for
* performing a specific action on a resource or collection of resources. For example adding or editing a new * performing a specific action on a resource or collection of resources. For example: adding or editing a new
* object, or listing a set of objects. * object, or listing a set of objects.
* *
* You can access request parameters, using `$this->request`. The request object contains all the POST, GET and FILES * You can access request parameters, using `$this->request`. The request object contains all the POST, GET and FILES
@ -259,7 +259,7 @@ class Controller extends Object implements CakeEventListener {
/** /**
* Holds current methods of the controller. This is a list of all the methods reachable * Holds current methods of the controller. This is a list of all the methods reachable
* via URL. Modifying this array, will allow you to change which methods can be reached. * via URL. Modifying this array will allow you to change which methods can be reached.
* *
* @var array * @var array
*/ */
@ -285,7 +285,7 @@ class Controller extends Object implements CakeEventListener {
public $modelKey = null; public $modelKey = null;
/** /**
* Holds any validation errors produced by the last call of the validateErrors() method/ * Holds any validation errors produced by the last call of the validateErrors() method.
* *
* @var array Validation errors, or false if none * @var array Validation errors, or false if none
*/ */
@ -610,7 +610,7 @@ class Controller extends Object implements CakeEventListener {
} }
/** /**
* Returns a list of all events that will fire in the controller during it's lifecycle. * Returns a list of all events that will fire in the controller during its lifecycle.
* You can override this function to add you own listener callbacks * You can override this function to add you own listener callbacks
* *
* @return array * @return array