Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #221 from majna/2.0-doc-comments

Fixed doc block comments.
  • Loading branch information...
commit aa6d6a991812e00f1501a6e97389d276d5ecb964 2 parents 08b974d + 681207e
@lorenzo lorenzo authored
View
2  lib/Cake/Controller/Scaffold.php
@@ -75,7 +75,7 @@ class Scaffold {
public $request;
/**
- * valid session.
+ * Valid session.
*
* @var boolean
*/
View
4 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.
*
View
1  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) {
View
2  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'.
*
Please sign in to comment.
Something went wrong with that request. Please try again.