From f7392ef9171b7800a22b7085d8a503395d83194d Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 4 Sep 2014 15:23:16 +0000
Subject: [PATCH] Pinking shears.

Built from https://develop.svn.wordpress.org/trunk@29707


git-svn-id: http://core.svn.wordpress.org/trunk@29481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-comments-list-table.php | 4 ++--
 wp-admin/includes/class-wp-importer.php            | 2 +-
 wp-admin/includes/class-wp-links-list-table.php    | 4 ++--
 wp-admin/includes/class-wp-list-table.php          | 2 +-
 wp-admin/includes/class-wp-ms-sites-list-table.php | 4 ++--
 wp-admin/includes/class-wp-plugins-list-table.php  | 4 ++--
 wp-admin/includes/class-wp-posts-list-table.php    | 2 +-
 wp-admin/includes/class-wp-terms-list-table.php    | 4 ++--
 wp-admin/includes/class-wp-themes-list-table.php   | 4 ++--
 wp-admin/includes/class-wp-users-list-table.php    | 4 ++--
 wp-admin/includes/misc.php                         | 2 +-
 wp-admin/users.php                                 | 2 +-
 wp-includes/class-wp-embed.php                     | 2 +-
 wp-includes/formatting.php                         | 6 +++---
 14 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 4238d8f327..5803b1dca0 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -23,14 +23,14 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		global $post_id;
 
diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index 46f5020e73..b54573f675 100644
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -196,7 +196,7 @@ class WP_Importer {
 	/**
 	 * Bump up the request timeout for http requests
 	 *
-	 * @param int $val 
+	 * @param int $val
 	 * @return int
 	 */
 	public function bump_request_timeout( $val ) {
diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php
index 79359e4456..7f2760d426 100644
--- a/wp-admin/includes/class-wp-links-list-table.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -11,14 +11,14 @@ class WP_Links_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'plural' => 'bookmarks',
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index adbcdaef97..8d2bc51e00 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -89,7 +89,7 @@ class WP_List_Table {
 	 *                            screen. If left null, the current screen will be automatically set.
 	 *                            Default null.
 	 * }
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		$args = wp_parse_args( $args, array(
 			'plural' => '',
diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index 8b488333a6..05c55bc779 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -11,14 +11,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'plural' => 'sites',
diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 1f64a708e7..9fa1261e2b 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -11,14 +11,14 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		global $status, $page;
 
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 8a91900e75..5914aea92e 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -47,7 +47,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index ba8ca82ccc..743dfde45a 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -13,14 +13,14 @@ class WP_Terms_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		global $post_type, $taxonomy, $action, $tax;
 
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index 89f301e6ed..de34581d8a 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -14,14 +14,14 @@ class WP_Themes_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'ajax' => true,
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 01380ff6a7..15d55f4e41 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -30,14 +30,14 @@ class WP_Users_List_Table extends WP_List_Table {
 
 	/**
 	 * Constructor.
-	 * 
+	 *
 	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @see WP_List_Table::__construct() for more information on default arguments.
 	 *
 	 * @param array $args An associative array of arguments.
-	 */	
+	 */
 	public function __construct( $args = array() ) {
 		parent::__construct( array(
 			'singular' => 'user',
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 949ea0efe5..f93e138819 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -832,7 +832,7 @@ add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
  * as they disregard the autocomplete setting on the editor textarea. That can break the editor
  * when the user navigates to it with the browser's Back button. See #28037
  *
- * @since 4.0 
+ * @since 4.0
  */
 function post_form_autocomplete_off() {
 	global $is_safari, $is_chrome;
diff --git a/wp-admin/users.php b/wp-admin/users.php
index a40a6ba68a..c83dbaa644 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -248,7 +248,7 @@ case 'delete':
 	/**
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
-	 * @since 4.0.0 
+	 * @since 4.0.0
 	 *
 	 * @param WP_User $current_user WP_User object for the user being deleted.
 	 */
diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index 844cfd732c..6b5a51a715 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -15,7 +15,7 @@ class WP_Embed {
 	/**
 	 * When an URL cannot be embedded, return false instead of returning a link
 	 * or the URL. Bypasses the 'embed_maybe_make_link' filter.
-	 */	 	 	
+	 */
 	public $return_false_on_fail = false;
 
 	/**
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index f307a54330..1f18ab9d91 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -147,7 +147,7 @@ function wptexturize($text, $reset = false) {
 		$dynamic_characters['apos'] = array_keys( $dynamic );
 		$dynamic_replacements['apos'] = array_values( $dynamic );
 		$dynamic = array();
-		
+
 		// Quoted Numbers like "42"
 		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
 			$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
@@ -167,11 +167,11 @@ function wptexturize($text, $reset = false) {
 		if ( '"' !== $closing_quote ) {
 			$dynamic[ '/"/' ] = $closing_quote;
 		}
-		
+
 		$dynamic_characters['quote'] = array_keys( $dynamic );
 		$dynamic_replacements['quote'] = array_values( $dynamic );
 		$dynamic = array();
-		
+
 		// Dashes and spaces
 		$dynamic[ '/---/' ] = $em_dash;
 		$dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;