diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php index db781dd9844..84aaaad3752 100644 --- a/lib/Cake/Controller/Scaffold.php +++ b/lib/Cake/Controller/Scaffold.php @@ -75,7 +75,7 @@ class Scaffold { public $request; /** - * valid session. + * Valid session. * * @var boolean */ diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index b3d0aee84d4..b70d1ae8218 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -43,7 +43,7 @@ * You can inspect the currently loaded paths using `App::path('Controller')` for example to see loaded * controller paths. * - * It is also possible to inspect paths for plugin classes, for instance, to see a plugin's helpers you would call + * It is also possible to inspect paths for plugin classes, for instance, to see a plugin's helpers you would call * `App::path('View/Helper', 'MyPlugin')` * * ### Locating plugins and themes @@ -251,7 +251,7 @@ public static function paths() { * * `App::build(array('Model' => array('/path/to/models/')), App::RESET); will setup the path as the only valid path for searching models` * - * `App::build(array('View/Helper' => array('/path/to/helpers/', '/another/path/))); will setup multiple search paths for helpers` + * `App::build(array('View/Helper' => array('/path/to/helpers/', '/another/path/'))); will setup multiple search paths for helpers` * * If reset is set to true, all loaded plugins will be forgotten and they will be needed to be loaded again. * diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php index c7dbd92c851..46e4fcceff1 100644 --- a/lib/Cake/Model/CakeSchema.php +++ b/lib/Cake/Model/CakeSchema.php @@ -412,7 +412,6 @@ public function generateTable($table, $fields) { } $col .= join(', ', $props); } elseif ($field == 'tableParameters') { - //@todo add charset, collate and engine here $col = "\t\t'tableParameters' => array("; $props = array(); foreach ((array)$value as $key => $param) { diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php index 322caf7663c..07fbc025841 100644 --- a/lib/Cake/View/Helper/PaginatorHelper.php +++ b/lib/Cake/View/Helper/PaginatorHelper.php @@ -64,7 +64,7 @@ class PaginatorHelper extends AppHelper { * - `update` DOM id of the element updated with the results of the AJAX call. * If this key isn't specified Paginator will use plain HTML links. * - `paging['paramType']` The type of parameters to use when creating links. Valid options are - * 'querystring', 'named', and 'route'. See PaginatorComponent::$settings for more information. + * 'querystring' and 'named'. See PaginatorComponent::$settings for more information. * - `convertKeys` - A list of keys in url arrays that should be converted to querysting params * if paramType == 'querystring'. *