Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	app/webroot/test.php
	lib/Cake/Console/Command/Task/ExtractTask.php
	lib/Cake/Console/Shell.php
	lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
	lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Core/Object.php
	lib/Cake/Error/exceptions.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/ModelValidator.php
	lib/Cake/Model/Validator/ValidationSet.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Routing/Dispatcher.php
	lib/Cake/Routing/Route/Route.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/TestCase/BasicsTest.php
	lib/Cake/Test/TestCase/Console/Command/SchemaShellTest.php
	lib/Cake/Test/TestCase/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/TestCase/Model/ModelWriteTest.php
	lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
	lib/Cake/Test/TestCase/View/JsonViewTest.php
	lib/Cake/TestSuite/Fixture/FixtureManager.php
	lib/Cake/TestSuite/TestSuiteDispatcher.php
	lib/Cake/Utility/Number.php
	lib/Cake/Utility/Validation.php
	lib/Cake/Utility/Xml.php

App/Config/bootstrap.php

@@ -138,7 +138,7 @@
  */
 
 /**
- * You can attach event listeners to the request lifecyle as Dispatcher Filter . By Default CakePHP bundles two filters:
+ * You can attach event listeners to the request lifecycle as Dispatcher Filter . By Default CakePHP bundles two filters:
  *
  * - AssetDispatcher filter will serve your asset files (css, images, js, etc) from your themes and plugins
  * - CacheDispatcher filter will read the Cache.check configure variable and try to serve cached content generated from controllers

App/Config/datasources.default.php

@@ -53,6 +53,12 @@
  *
  * unix_socket =>
  * For MySQL to connect via socket specify the `unix_socket` parameter instead of `host` and `port`
+ *
+ * settings =>
+ * Array of key/value pairs, on connection it executes SET statements for each pair
+ * For MySQL : http://dev.mysql.com/doc/refman/5.6/en/set-statement.html
+ * For Postgres : http://www.postgresql.org/docs/9.2/static/sql-set.html
+ * For Sql Server : http://msdn.microsoft.com/en-us/library/ms190356.aspx
  */
 
 /**

App/View/Pages/home.ctp

@@ -227,7 +227,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 	<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
 	<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api20.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
+	<li><a href="http://api.cakephp.org/"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Quick Reference'); ?></li></ul></li>
 	<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>