\n"; $output .= " -; SVN FILE: $Id$ ;/** ; * ACL Configuration ; * diff --git a/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/lib/Cake/Console/Templates/skel/Config/bootstrap.php index de45d4956..38ae63baf 100644 --- a/lib/Cake/Console/Templates/skel/Config/bootstrap.php +++ b/lib/Cake/Console/Templates/skel/Config/bootstrap.php @@ -30,16 +30,16 @@ Cache::config('default', array('engine' => 'File')); * The settings below can be used to set additional paths to models, views and controllers. * * App::build(array( - * 'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'), - * 'models' => array('/full/path/to/models/', '/next/full/path/to/models/'), - * 'views' => array('/full/path/to/views/', '/next/full/path/to/views/'), - * 'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'), - * 'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'), - * 'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'), - * 'components' => array('/full/path/to/components/', '/next/full/path/to/components/'), - * 'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'), - * 'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'), - * 'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'), + * 'Plugin' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'), + * 'Model' => array('/full/path/to/models/', '/next/full/path/to/models/'), + * 'View' => array('/full/path/to/views/', '/next/full/path/to/views/'), + * 'Controller' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'), + * 'Model/Datasource' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'), + * 'Model/Behavior' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'), + * 'Controller/Component' => array('/full/path/to/components/', '/next/full/path/to/components/'), + * 'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'), + * 'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'), + * 'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'), * 'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/') * )); * diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index a25329385..6bf57693d 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -196,7 +196,7 @@ * Will append a querystring parameter containing the time the file was modified. This is * useful for invalidating browser caches. * - * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable + * Set to `true` to apply timestamps, when debug > 0, or set to 'force' to always enable * timestamping. */ //Configure::write('Asset.timestamp', true); diff --git a/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php b/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php index 27baaff2c..a4b496bf1 100644 --- a/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php +++ b/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php @@ -22,7 +22,7 @@ App::uses('Helper', 'View'); /** * This is a placeholder class. - * Create the same file in app/app_helper.php + * Create the same file in app/View/Helper/AppHelper.php * * Add your application-wide methods in the class below, your helpers * will inherit them. diff --git a/lib/Cake/Model/AppModel.php b/lib/Cake/Model/AppModel.php index 5ca7a6cbd..5a21cda3b 100644 --- a/lib/Cake/Model/AppModel.php +++ b/lib/Cake/Model/AppModel.php @@ -26,7 +26,7 @@ App::uses('Model', 'Model'); * Application model for Cake. * * This is a placeholder class. - * Create the same file in app/app_model.php + * Create the same file in app/Model/AppModel.php * Add your application-wide methods to the class, your models will inherit them. * * @package Cake.Model diff --git a/lib/Cake/Network/Http/HttpResponse.php b/lib/Cake/Network/Http/HttpResponse.php index 976344be8..f921aad1b 100644 --- a/lib/Cake/Network/Http/HttpResponse.php +++ b/lib/Cake/Network/Http/HttpResponse.php @@ -17,6 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +/** + * HTTP Response + * + * @package Cake.Network.Http + */ class HttpResponse implements ArrayAccess { /** diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php index ab09b32ce..1445634f7 100644 --- a/lib/Cake/Utility/Debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -606,7 +606,7 @@ class Debugger { * straight HTML output, or 'txt' for unformatted text. * @param array $strings Template strings to be used for the output format. * @return string - * @deprecated Use Debugger::outputFormat() and Debugger::addFormat(). Will be removed + * @deprecated Use Debugger::outputAs() and Debugger::addFormat(). Will be removed * in 3.0 */ public function output($format = null, $strings = array()) { diff --git a/lib/Cake/Utility/File.php b/lib/Cake/Utility/File.php index a22687863..6f3c2c02e 100644 --- a/lib/Cake/Utility/File.php +++ b/lib/Cake/Utility/File.php @@ -45,7 +45,7 @@ class File { public $name = null; /** - * file info + * File info * * @var string */ @@ -59,14 +59,14 @@ class File { public $handle = null; /** - * enable locking for file reading and writing + * Enable locking for file reading and writing * * @var boolean */ public $lock = null; /** - * path property + * Path property * * Current file's absolute path * diff --git a/lib/Cake/View/Helper/AppHelper.php b/lib/Cake/View/Helper/AppHelper.php index 1ba164e8a..97b169d12 100644 --- a/lib/Cake/View/Helper/AppHelper.php +++ b/lib/Cake/View/Helper/AppHelper.php @@ -23,7 +23,7 @@ App::uses('Helper', 'View'); /** * This is a placeholder class. - * Create the same file in app/app_helper.php + * Create the same file in app/View/Helper/AppHelper.php * * Add your application-wide methods in the class below, your helpers * will inherit them. diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index 03469abb3..9dfc5efdb 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -308,6 +308,7 @@ class HtmlHelper extends AppHelper { * ### Options * * - `escape` Set to false to disable escaping of title and attributes. + * - `confirm` JavaScript confirmation message. * * @param string $title The content to be wrapped by tags. * @param mixed $url Cake-relative URL or array of URL parameters, or external URL (starts with http://) diff --git a/lib/Cake/View/Helper/JsHelper.php b/lib/Cake/View/Helper/JsHelper.php index 0230afb8c..f6c6eeffb 100644 --- a/lib/Cake/View/Helper/JsHelper.php +++ b/lib/Cake/View/Helper/JsHelper.php @@ -40,7 +40,7 @@ class JsHelper extends AppHelper { public $bufferScripts = true; /** - * helpers + * Helper dependencies * * @var array */