diff --git a/lib/Cake/Utility/Folder.php b/lib/Cake/Utility/Folder.php
index 6aa22681072..9c02e1a6028 100644
--- a/lib/Cake/Utility/Folder.php
+++ b/lib/Cake/Utility/Folder.php
@@ -292,7 +292,7 @@ public static function isAbsolute($path) {
  * Returns true if given $path is a registered stream wrapper.
  *
  * @param string $path Path to check
- * @return boolean true If path is registered stream wrapper.
+ * @return boo true If path is registered stream wrapper.
  */
 	public static function isRegisteredStreamWrapper($path) {
 		if (preg_match('/^[A-Z]+(?=:\/\/)/i', $path, $matches) &&
diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php
index 27d77881bc2..dee7bfa143a 100644
--- a/lib/Cake/Utility/Validation.php
+++ b/lib/Cake/Utility/Validation.php
@@ -111,9 +111,9 @@ public static function lengthBetween($check, $min, $max) {
  * Alias of Validator::lengthBetween() for backwards compatibility.
  *
  * @param string $check Value to check for length
- * @param integer $min Minimum value in range (inclusive)
- * @param integer $max Maximum value in range (inclusive)
- * @return boolean Success
+ * @param int $min Minimum value in range (inclusive)
+ * @param int $max Maximum value in range (inclusive)
+ * @return bool Success
  * @see Validator::lengthBetween()
  * @deprecated Deprecated 2.6. Use Validator::lengthBetween() instead.
  */
@@ -143,7 +143,8 @@ public static function blank($check) {
  * Returns true if $check is in the proper credit card format.
  *
  * @param string|array $check credit card number to validate
- * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit cards
+ * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit 
+ * cards
  *    if an array is used only the values of the array are checked.
  *    Example: array('amex', 'bankcard', 'maestro')
  * @param bool $deep set to true this will check the Luhn algorithm of the credit card.
@@ -178,11 +179,13 @@ public static function cc($check, $type = 'fast', $deep = false, $regex = null)
 				'maestro'	=> '/^(?:5020|6\\d{3})\\d{12}$/',
 				'mc'		=> '/^5[1-5]\\d{14}$/',
 				'solo'		=> '/^(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?$/',
-				'switch'	=> '/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
+				'switch'	=> 
+				'/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
 				'visa'		=> '/^4\\d{12}(\\d{3})?$/',
 				'voyager'	=> '/^8699[0-9]{11}$/'
 			),
-			'fast' => '/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/'
+			'fast' => 
+			'/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/'
 		);
 
 		if (is_array($type)) {
diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
index f8438da5936..017850f26f6 100644
--- a/lib/Cake/basics.php
+++ b/lib/Cake/basics.php
@@ -814,7 +814,7 @@ function __x($context, $singular, $args = null) {
  * @param string $context Context of the text
  * @param string $singular Singular text to translate
  * @param string $plural Plural text
- * @param integer $count Count
+ * @param int $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
  * @return mixed plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
@@ -867,7 +867,7 @@ function __dx($domain, $context, $msg, $args = null) {
  * @param string $context Context of the text
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param integer $count Count
+ * @param int $count Count
  * @param mixed $args Array with arguments or multiple arguments in function
  * @return plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
@@ -906,7 +906,7 @@ function __dxn($domain, $context, $singular, $plural, $count, $args = null) {
  * @param string $domain Domain
  * @param string $context Context of the text
  * @param string $msg Message to translate
- * @param integer $category Category
+ * @param int $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
  * @return translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
@@ -948,8 +948,8 @@ function __dxc($domain, $context, $msg, $category, $args = null) {
  * @param string $context Context of the text
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param integer $count Count
- * @param integer $category Category
+ * @param int $count Count
+ * @param int $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
  * @return plural form of translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
@@ -984,7 +984,7 @@ function __dxcn($domain, $context, $singular, $plural, $count, $category, $args
  *
  * @param string $context Context of the text
  * @param string $msg String to translate
- * @param integer $category Category
+ * @param int $category Category
  * @param mixed $args Array with arguments or multiple arguments in function
  * @return translated string
  * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c