Merge branch 'typos'

base.php

@@ -23,6 +23,7 @@
  *
  * @param   string  text to translate
  * @param   array   values to replace in the translated text
+ * @param   string  target language
  * @return  string
  */
 function __($string, array $values = NULL, $lang = 'en-us')

classes/kohana/arr.php

@@ -106,7 +106,7 @@ public static function range($step = 10, $max = 100)
 	}
 
 	/**
-	 * Retreive a single key from an array. If the key does not exist in the
+	 * Retrieve a single key from an array. If the key does not exist in the
 	 * array, the default value will be returned instead.
 	 *
 	 * @param   array   array to extract from

classes/kohana/date.php

@@ -265,8 +265,8 @@ public static function span($time1, $time2 = NULL, $output = 'years,months,weeks
 		extract(array_flip($output), EXTR_SKIP);
 
 		// Default values
-		$time1  = max(0, (int) $time1);
-		$time2  = empty($time2) ? time() : max(0, (int) $time2);
+		$time1 = max(0, (int) $time1);
+		$time2 = empty($time2) ? time() : max(0, (int) $time2);
 
 		// Calculate timespan (seconds)
 		$timespan = abs($time1 - $time2);
@@ -339,7 +339,7 @@ public static function span($time1, $time2 = NULL, $output = 'years,months,weeks
 	/**
 	 * Returns the difference between a time and now in a "fuzzy" way.
 	 *
-	 * @param   integer  past UNIX timestamp
+	 * @param   integer  UNIX timestamp
 	 * @return  string
 	 */
 	public static function fuzzy_span($timestamp)

classes/kohana/route.php

@@ -10,19 +10,19 @@
  * a pattern for the key:
  *
  *     // This route will only match when <id> is a digit
- *     Route::factory('user/edit/<id>', array('id' => '\d+'));
+ *     Route::set('user/edit/<id>', array('id' => '\d+'));
  *
  *     // This route will match when <path> is anything
- *     Route::factory('<path>', array('path' => '.*'));
+ *     Route::set('<path>', array('path' => '.*'));
  *
  * It is also possible to create optional segments by using parentheses in
  * the URI definition:
  *
  *     // This is the standard default route, and no keys are required
- *     Route::default('(<controller>(/<action>(/<id>)))');
+ *     Route::set('(<controller>(/<action>(/<id>)))');
  *
- *     // This route only requires the :file key
- *     Route::factory('(<path>/)<file>(<format>)', array('path' => '.*', 'format' => '\.\w+'));
+ *     // This route only requires the <file> key
+ *     Route::set('(<path>/)<file>(<format>)', array('path' => '.*', 'format' => '\.\w+'));
  *
  * Routes also provide a way to generate URIs (called "reverse routing"), which
  * makes them an extremely powerful and flexible way to generate internal links.