diff --git a/g11n/Locale.php b/g11n/Locale.php
index c112b0b265..ac80b1040d 100644
--- a/g11n/Locale.php
+++ b/g11n/Locale.php
@@ -62,8 +62,8 @@ class Locale extends \lithium\core\StaticObject {
 	 * methods to parse and retrieve individual tags from a locale.
 	 *
 	 * ```
-	 *     Locale::language('en_US'); // returns 'en'
-	 *     Locale::territory('en_US'); // returns 'US'
+	 * Locale::language('en_US'); // returns 'en'
+	 * Locale::territory('en_US'); // returns 'US'
 	 * ```
 	 *
 	 * @see lithium\g11n\Locale::$_tags
diff --git a/net/http/Media.php b/net/http/Media.php
index 674485bc0b..6844babdcd 100644
--- a/net/http/Media.php
+++ b/net/http/Media.php
@@ -176,7 +176,7 @@ public static function to($format, $data, array $options = array()) {
 	 *   use the same template(s) or other settings. Therefore, when serving JSONP content, you
 	 *   can specify that the extension defined in the type must be present in the URL:
 	 *  ```
-	 *  Media::type('jsonp', array('text/html'), array(
+	 *  Media::type('jsonp', array('application/json'), array(
 	 *  	// template settings...
 	 *  	'conditions' => array('type' => true)
 	 *  ));
@@ -286,7 +286,8 @@ public static function type($type, $content = null, array $options = array()) {
 	 * @see lithium\action\Request
 	 * @param \lithium\action\Request $request The request which contains the details of
 	 *        the request to be content-negotiated.
-	 * @return string Returns the first matching type name, i.e. `'html'` or `'json'`.
+	 * @return string|null Returns the first matching type name, i.e. `'html'` or `'json'`. When
+	 *         no matching type is found returns `null`.
 	 */
 	public static function negotiate($request) {
 		$self = get_called_class();
@@ -851,6 +852,7 @@ protected static function _handle($handler, $data, &$response) {
 	 * Helper method for listing registered media types. Returns all types, or a single
 	 * content type if a specific type is specified.
 	 *
+	 * @todo Use fnmatch() to support wildcards.
 	 * @param string $type Type to return.
 	 * @return mixed Array of types, or single type requested.
 	 */