Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.0' into 3.0-dsn-support
Browse files Browse the repository at this point in the history
* origin/3.0: (172 commits)
  Consolidate doc block headings.
  Adding a test for cakephp/cakephp#5019 the plugin view file path
  Fixing the view file loading for plugins in View/View.php
  Make method name better represent what it is going to do.
  Don't mutate cwd.
  More doc block corrections.
  Cosolidate doc block headers
  Add FlashComponent property to PHPDoc for Controller class
  Fix doubly inflected variable names in controller task.
  Use chdir() instead of calling multiple commands.
  Add missing 'b' to radio docs
  Fix FormHelper::radio() options docs
  Add test case for quoted strings
  Fix issue in PoFileParser where only slashes from translations of type array are stripped.
  Remove for attributes for other group type inputs.
  Remove meaningless and possibly wrong for attr.
  Fix missing label elements in input(type=radio)
  Fix radio widget and label=false.
  Fix input() making multiple checkboxes.
  Not using union, but OR conditions
  ...
  • Loading branch information
AD7six committed Oct 31, 2014
2 parents 896d2bf + 463594f commit a3216f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Engine/FileLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class FileLog extends BaseLog {
* - `size` Used to implement basic log file rotation. If log file size
* reaches specified size the existing file is renamed by appending timestamp
* to filename and new log file is created. Can be integer bytes value or
* human reabable string values like '10MB', '100KB' etc.
* human readable string values like '10MB', '100KB' etc.
* - `rotate` Log files are rotated specified times before being removed.
* If value is 0, old versions are removed rather then rotated.
* - `mask` A mask is applied when log files are created. Left empty no chmod
Expand Down
2 changes: 1 addition & 1 deletion Engine/SyslogLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SyslogLog extends BaseLog {
* the running process. For a local prefix, to be used only by one stream, you
* can use the format key.
*
* ## Example:
* ### Example:
*
* {{{
* Log::config('error', ]
Expand Down

0 comments on commit a3216f3

Please sign in to comment.