double spaces to single ones

lib/Cake/Cache/Cache.php

@@ -19,10 +19,10 @@
 /**
  * Cache provides a consistent interface to Caching in your application. It allows you
  * to use several different Cache engines, without coupling your application to a specific
- * implementation.  It also allows you to change out cache storage or configuration without effecting
+ * implementation. It also allows you to change out cache storage or configuration without effecting
  * the rest of your application.
  *
- * You can configure Cache engines in your application's `bootstrap.php` file.  A sample configuration would
+ * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would
  * be
  *
  * {{{
@@ -32,9 +32,9 @@
  *  ));
  * }}}
  *
- * This would configure an APC cache engine to the 'shared' alias.  You could then read and write
- * to that cache alias by using it for the `$config` parameter in the various Cache methods.  In
- * general all Cache operations are supported by all cache engines.  However, Cache::increment() and
+ * This would configure an APC cache engine to the 'shared' alias. You could then read and write
+ * to that cache alias by using it for the `$config` parameter in the various Cache methods. In
+ * general all Cache operations are supported by all cache engines. However, Cache::increment() and
  * Cache::decrement() are not supported by File caching.
  *
  * @package       Cake.Cache
@@ -65,7 +65,7 @@ class Cache {
 	protected static $_engines = array();
 
 /**
- * Set the cache configuration to use.  config() can
+ * Set the cache configuration to use. config() can
  * both create new configurations, return the settings for already configured
  * configurations.
  *
@@ -95,15 +95,15 @@ class Cache {
  *    handy for deleting a complete group from cache.
  * - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
  *    with either another cache config or another application.
- * - `probability` Probability of hitting a cache gc cleanup.  Setting to 0 will disable
+ * - `probability` Probability of hitting a cache gc cleanup. Setting to 0 will disable
  *    cache::gc from ever being called automatically.
  * - `servers' Used by memcache. Give the address of the memcached servers to use.
- * - `compress` Used by memcache.  Enables memcache's compressed format.
- * - `serialize` Used by FileCache.  Should cache objects be serialized first.
- * - `path` Used by FileCache.  Path to where cachefiles should be saved.
- * - `lock` Used by FileCache.  Should files be locked before writing to them?
- * - `user` Used by Xcache.  Username for XCache
- * - `password` Used by Xcache/Redis.  Password for XCache/Redis
+ * - `compress` Used by memcache. Enables memcache's compressed format.
+ * - `serialize` Used by FileCache. Should cache objects be serialized first.
+ * - `path` Used by FileCache. Path to where cachefiles should be saved.
+ * - `lock` Used by FileCache. Should files be locked before writing to them?
+ * - `user` Used by Xcache. Username for XCache
+ * - `password` Used by Xcache/Redis. Password for XCache/Redis
  *
  * @see app/Config/core.php for configuration settings
  * @param string $name Name of the configuration
@@ -180,7 +180,7 @@ public static function configured() {
 	}
 
 /**
- * Drops a cache engine.  Deletes the cache configuration information
+ * Drops a cache engine. Deletes the cache configuration information
  * If the deleted configuration is the last configuration using an certain engine,
  * the Engine instance is also unset.
  *
@@ -196,7 +196,7 @@ public static function drop($name) {
 	}
 
 /**
- * Temporarily change the settings on a cache config.  The settings will persist for the next write
+ * Temporarily change the settings on a cache config. The settings will persist for the next write
  * operation (write, decrement, increment, clear). Any reads that are done before the write, will
  * use the modified settings. If `$settings` is empty, the settings will be reset to the
  * original configuration.
@@ -262,7 +262,7 @@ public static function gc($config = 'default', $expires = null) {
 
 /**
  * Write data for key into cache. Will automatically use the currently
- * active cache configuration.  To set the currently active configuration use
+ * active cache configuration. To set the currently active configuration use
  * Cache::config()
  *
  * ### Usage:
@@ -312,8 +312,8 @@ public static function write($key, $value, $config = 'default') {
 	}
 
 /**
- * Read a key from the cache.  Will automatically use the currently
- * active cache configuration.  To set the currently active configuration use
+ * Read a key from the cache. Will automatically use the currently
+ * active cache configuration. To set the currently active configuration use
  * Cache::config()
  *
  * ### Usage:

lib/Cake/Cache/Engine/ApcEngine.php

@@ -117,10 +117,10 @@ public function delete($key) {
 	}
 
 /**
- * Delete all keys from the cache.  This will clear every cache config using APC.
+ * Delete all keys from the cache. This will clear every cache config using APC.
  *
  * @param boolean $check If true, nothing will be cleared, as entries are removed
- *    from APC as they expired.  This flag is really only used by FileEngine.
+ *    from APC as they expired. This flag is really only used by FileEngine.
  * @return boolean True Returns true.
  */
 	public function clear($check) {

lib/Cake/Cache/Engine/FileEngine.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * File Storage engine for cache.  Filestorage is the slowest cache storage
- * to read and write.  However, it is good for servers that don't have other storage
+ * File Storage engine for cache. Filestorage is the slowest cache storage
+ * to read and write. However, it is good for servers that don't have other storage
  * engine available, or have content which is not performance sensitive.
  *
  * You can configure a FileEngine cache, using Cache::config()
@@ -21,8 +21,8 @@
  */
 
 /**
- * File Storage engine for cache.  Filestorage is the slowest cache storage
- * to read and write.  However, it is good for servers that don't have other storage
+ * File Storage engine for cache. Filestorage is the slowest cache storage
+ * to read and write. However, it is good for servers that don't have other storage
  * engine available, or have content which is not performance sensitive.
  *
  * You can configure a FileEngine cache, using Cache::config()

lib/Cake/Cache/Engine/MemcacheEngine.php

@@ -19,8 +19,8 @@
  */
 
 /**
- * Memcache storage engine for cache.  Memcache has some limitations in the amount of
- * control you have over expire times far in the future.  See MemcacheEngine::write() for
+ * Memcache storage engine for cache. Memcache has some limitations in the amount of
+ * control you have over expire times far in the future. See MemcacheEngine::write() for
  * more information.
  *
  * @package       Cake.Cache.Engine
@@ -98,7 +98,7 @@ public function init($settings = array()) {
 	}
 
 /**
- * Parses the server address into the host/port.  Handles both IPv6 and IPv4
+ * Parses the server address into the host/port. Handles both IPv6 and IPv4
  * addresses and Unix sockets
  *
  * @param string $server The server address string.
@@ -126,7 +126,7 @@ protected function _parseServerString($server) {
 	}
 
 /**
- * Write data for key into cache.  When using memcache as your cache engine
+ * Write data for key into cache. When using memcache as your cache engine
  * remember that the Memcache pecl extension does not support cache expiry times greater
  * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
  *

lib/Cake/Cache/Engine/WincacheEngine.php

@@ -121,7 +121,7 @@ public function delete($key) {
 	}
 
 /**
- * Delete all keys from the cache.  This will clear every
+ * Delete all keys from the cache. This will clear every
  * item in the cache matching the cache config prefix.
  *
  * @param boolean $check If true, nothing will be cleared, as entries will

lib/Cake/Config/cacert.pem

@@ -5,7 +5,7 @@
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
+## file (certdata.txt). This file can be found in the mozilla source tree:
 ## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
 ##
 ## It contains the certificates in PEM format and therefore

lib/Cake/Configure/IniReader.php

@@ -25,7 +25,7 @@
  * class shares the same behavior, especially with regards to boolean and null values.
  *
  * In addition to the native `parse_ini_file` features, IniReader also allows you
- * to create nested array structures through usage of `.` delimited names.  This allows
+ * to create nested array structures through usage of `.` delimited names. This allows
  * you to create nested arrays structures in an ini config file. For example:
  *
  * `db.password = secret` would turn into `array('db' => array('password' => 'secret'))`

lib/Cake/Configure/PhpReader.php

@@ -37,7 +37,7 @@ class PhpReader implements ConfigReaderInterface {
 /**
  * Constructor for PHP Config file reading.
  *
- * @param string $path The path to read config files from.  Defaults to APP . 'Config' . DS
+ * @param string $path The path to read config files from. Defaults to APP . 'Config' . DS
  */
 	public function __construct($path = null) {
 		if (!$path) {
@@ -49,7 +49,7 @@ public function __construct($path = null) {
 /**
  * Read a config file and return its contents.
  *
- * Files with `.` in the name will be treated as values in plugins.  Instead of reading from
+ * Files with `.` in the name will be treated as values in plugins. Instead of reading from
  * the initialized path, plugin keys will be located using App::pluginPath().
  *
  * @param string $key The identifier to read from. If the key has a . it will be treated

lib/Cake/Console/Command/AclShell.php

@@ -24,8 +24,8 @@
 App::uses('Hash', 'Utility');
 
 /**
- * Shell for ACL management.  This console is known to have issues with zend.ze1_compatibility_mode
- * being enabled.  Be sure to turn it off when using this shell.
+ * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode
+ * being enabled. Be sure to turn it off when using this shell.
  *
  * @package       Cake.Console.Command
  */
@@ -501,7 +501,7 @@ public function getOptionParser() {
 					' - <model>.<id> - The node will be bound to a specific record of the given model.',
 					'',
 					' - <alias> - The node will be given a string alias (or path, in the case of <parent>)',
-					"   i.e. 'John'.  When used with <parent>, this takes the form of an alias path,",
+					"   i.e. 'John'. When used with <parent>, this takes the form of an alias path,",
 					"   i.e. <group>/<subgroup>/<parent>.",
 					'',
 					"To add a node at the root level, enter 'root' or '/' as the <parent> parameter."

lib/Cake/Console/Command/ConsoleShell.php

@@ -120,7 +120,7 @@ public function getOptionParser() {
 			"\tRoute <url>",
 			"",
 			"where url is the path to your your action plus any query parameters,",
-			"minus the application's base path.  For example:",
+			"minus the application's base path. For example:",
 			"",
 			"\tRoute /posts/view/1",
 			"",

lib/Cake/Console/Command/SchemaShell.php

@@ -237,7 +237,7 @@ public function dump() {
 	}
 
 /**
- * Run database create commands.  Alias for run create.
+ * Run database create commands. Alias for run create.
  *
  * @return void
  */
@@ -247,7 +247,7 @@ public function create() {
 	}
 
 /**
- * Run database create commands.  Alias for run create.
+ * Run database create commands. Alias for run create.
  *
  * @return void
  */

lib/Cake/Console/Command/Task/BakeTask.php

@@ -59,7 +59,7 @@ public function startup() {
 	}
 
 /**
- * Gets the path for output.  Checks the plugin property
+ * Gets the path for output. Checks the plugin property
  * and returns the correct path.
  *
  * @return string Path to output.

lib/Cake/Console/Command/Task/ControllerTask.php

@@ -96,7 +96,7 @@ public function execute() {
 	}
 
 /**
- * Bake All the controllers at once.  Will only bake controllers for models that exist.
+ * Bake All the controllers at once. Will only bake controllers for models that exist.
  *
  * @return void
  */

lib/Cake/Console/Command/Task/FixtureTask.php

@@ -115,7 +115,7 @@ public function execute() {
 	}
 
 /**
- * Bake All the Fixtures at once.  Will only bake fixtures for models that exist.
+ * Bake All the Fixtures at once. Will only bake fixtures for models that exist.
  *
  * @return void
  */

lib/Cake/Console/Command/Task/TemplateTask.php

@@ -43,7 +43,7 @@ class TemplateTask extends AppShell {
 	public $templatePaths = array();
 
 /**
- * Initialize callback.  Setup paths for the template task.
+ * Initialize callback. Setup paths for the template task.
  *
  * @return void
  */

lib/Cake/Console/Command/Task/ViewTask.php

@@ -63,7 +63,7 @@ class ViewTask extends BakeTask {
 	public $scaffoldActions = array('index', 'view', 'add', 'edit');
 
 /**
- * An array of action names that don't require templates.  These
+ * An array of action names that don't require templates. These
  * actions will not emit errors when doing bakeActions()
  *
  * @var array
@@ -423,7 +423,7 @@ public function getOptionParser() {
 		return $parser->description(
 			__d('cake_console', 'Bake views for a controller, using built-in or custom templates.')
 		)->addArgument('controller', array(
-			'help' => __d('cake_console', 'Name of the controller views to bake.  Can be Plugin.name as a shortcut for plugin baking.')
+			'help' => __d('cake_console', 'Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.')
 		))->addArgument('action', array(
 			'help' => __d('cake_console', "Will bake a single action's file. core templates are (index, add, edit, view)")
 		))->addArgument('alias', array(

lib/Cake/Console/ConsoleInputOption.php

@@ -47,7 +47,7 @@ class ConsoleInputOption {
 	protected $_help;
 
 /**
- * Is the option a boolean option.  Boolean options do not consume a parameter.
+ * Is the option a boolean option. Boolean options do not consume a parameter.
  *
  * @var boolean
  */
@@ -73,7 +73,7 @@ class ConsoleInputOption {
  * @param string|array $name The long name of the option, or an array with all the properties.
  * @param string $short The short alias for this option
  * @param string $help The help text for this option
- * @param boolean $boolean Whether this option is a boolean option.  Boolean options don't consume extra tokens
+ * @param boolean $boolean Whether this option is a boolean option. Boolean options don't consume extra tokens
  * @param string $default The default value for this option.
  * @param array $choices Valid choices for this option.
  * @throws ConsoleException