From 65e341d0cb7172f7fe45176d280b4bbb87ec97e5 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 14 May 2011 09:50:20 +0000
Subject: [PATCH] Fix typos and inconsistencies in PHPdoc / function
 declarations. See #17414 props duck_

git-svn-id: http://svn.automattic.com/wordpress/trunk@17925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/plugins.php       |  2 +-
 wp-includes/class-http.php |  4 ++--
 wp-includes/formatting.php |  4 ++--
 wp-includes/l10n.php       | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 44792740ba..80e398ea22 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -59,7 +59,7 @@ if ( $action ) {
 				update_option('recently_activated', $recent);
 			}
 			if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-				wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix
+				wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
 			} else {
 				wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
 			}
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 9d8ccae22c..d883fe3241 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -192,7 +192,7 @@ class WP_Http {
 	}
 
 	/**
-	 * Tests which transports are capabable of supporting the request.
+	 * Tests which transports are capable of supporting the request.
 	 * 
 	 * @since 3.2.0
 	 * @access private
@@ -247,7 +247,7 @@ class WP_Http {
 		if ( !$class )
 			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
 
-		// Transport claims to support request, Instantate it and give it a whirl.
+		// Transport claims to support request, instantiate it and give it a whirl.
 		if ( empty( $transports[$class] ) )
 			$transports[$class] = new $class;
 
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 758bc84184..a7a4b53386 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1227,7 +1227,7 @@ function addslashes_gpc($gpc) {
  *
  * @since 2.0.0
  *
- * @param array|string $value The array or string to be striped.
+ * @param array|string $value The array or string to be stripped.
  * @return array|string Stripped array (or string in the callback).
  */
 function stripslashes_deep($value) {
@@ -2748,7 +2748,7 @@ function _links_add_base($m) {
  * This function by default only applies to <a> tags, however this can be
  * modified by the 3rd param.
  *
- * <b>NOTE:</b> Any current target attributed will be striped and replaced.
+ * <b>NOTE:</b> Any current target attributed will be stripped and replaced.
  *
  * @since 2.7.0
  *
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index fd24477bb1..f2c1e7b780 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -186,8 +186,8 @@ function esc_html_e( $text, $domain = 'default' ) {
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _x( $single, $context, $domain = 'default' ) {
-	return translate_with_gettext_context( $single, $context, $domain );
+function _x( $text, $context, $domain = 'default' ) {
+	return translate_with_gettext_context( $text, $context, $domain );
 }
 
 /**
@@ -201,8 +201,8 @@ function _x( $single, $context, $domain = 'default' ) {
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _ex( $single, $context, $domain = 'default' ) {
-	echo _x( $single, $context, $domain );
+function _ex( $text, $context, $domain = 'default' ) {
+	echo _x( $text, $context, $domain );
 }
 
 function esc_attr_x( $single, $context, $domain = 'default' ) {
@@ -270,9 +270,9 @@ function _nx($single, $plural, $number, $context, $domain = 'default') {
  *  $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count );
  *
  * @since 2.5
- * @param string $single Single form to be i18ned
+ * @param string $singular Single form to be i18ned
  * @param string $plural Plural form to be i18ned
- * @return array array($single, $plural)
+ * @return array array($singular, $plural)
  */
 function _n_noop( $singular, $plural ) {
 	return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null );