From d2ccaacedfefa87c489a832b8e2b90a0a83b6be8 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 17 Apr 2019 13:26:51 +0000 Subject: [PATCH] Docs: Correct spelling in various comments and DocBlocks, per the conventions in Core Contributor Handbook. Props man4toman, samanehmirrajabi. Fixes #45857. Built from https://develop.svn.wordpress.org/trunk@45232 git-svn-id: http://core.svn.wordpress.org/trunk@45041 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 2 +- wp-includes/class-json.php | 8 ++++---- wp-includes/class-wp-customize-manager.php | 2 +- wp-includes/class-wp-customize-setting.php | 4 ++-- wp-includes/class-wp-site.php | 2 +- wp-includes/media.php | 2 +- wp-includes/script-loader.php | 2 +- wp-includes/theme.php | 2 +- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 0cb68f9164..c87b38e839 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -2218,7 +2218,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) { } $title = sprintf( - /* translators: %s: user's e-mail address */ + /* translators: %s: user's email address */ __( 'Personal Data Export for %s' ), $email_address ); diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php index e0926f0223..646c4b7a7c 100644 --- a/wp-includes/class-json.php +++ b/wp-includes/class-json.php @@ -15,11 +15,11 @@ if ( ! class_exists( 'Services_JSON' ) ) : * ideal data-interchange language. * * This package provides a simple encoder and decoder for JSON notation. It - * is intended for use with client-side Javascript applications that make + * is intended for use with client-side JavaScript applications that make * use of HTTPRequest to perform server communication functions - data can - * be encoded into JSON notation for use in a client-side javascript, or - * decoded from incoming Javascript requests. JSON format is native to - * Javascript, and can be directly eval()'ed with no further parsing + * be encoded into JSON notation for use in a client-side javaScript, or + * decoded from incoming JavaScript requests. JSON format is native to + * JavaScript, and can be directly eval()'ed with no further parsing * overhead * * All strings should be in ASCII or UTF-8 format! diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 1700259a1d..5319104760 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -3647,7 +3647,7 @@ final class WP_Customize_Manager { * @type string $capability Capability required for the setting. Default 'edit_theme_options' * @type string|array $theme_supports Theme features required to support the panel. Default is none. * @type string $default Default value for the setting. Default is empty string. - * @type string $transport Options for rendering the live preview of changes in Theme Customizer. + * @type string $transport Options for rendering the live preview of changes in Customizer. * Using 'refresh' makes the change visible by reloading the whole preview. * Using 'postMessage' allows a custom JavaScript to handle live changes. * @link https://developer.wordpress.org/themes/customize-api diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index 4052bc3b1b..3e0a1c0770 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -66,9 +66,9 @@ class WP_Customize_Setting { public $default = ''; /** - * Options for rendering the live preview of changes in Theme Customizer. + * Options for rendering the live preview of changes in Customizer. * - * Set this value to 'postMessage' to enable a custom Javascript handler to render changes to this setting + * Set this value to 'postMessage' to enable a custom JavaScript handler to render changes to this setting * as opposed to reloading the whole page. * * @link https://developer.wordpress.org/themes/customize-api diff --git a/wp-includes/class-wp-site.php b/wp-includes/class-wp-site.php index 8698ac5b92..b0459be2d4 100644 --- a/wp-includes/class-wp-site.php +++ b/wp-includes/class-wp-site.php @@ -315,7 +315,7 @@ final class WP_Site { if ( false === $details ) { switch_to_blog( $this->blog_id ); - // Create a raw copy of the object for backwards compatibility with the filter below. + // Create a raw copy of the object for backward compatibility with the filter below. $details = new stdClass(); foreach ( get_object_vars( $this ) as $key => $value ) { $details->$key = $value; diff --git a/wp-includes/media.php b/wp-includes/media.php index 40f8870d77..35ab3d8c4c 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -733,7 +733,7 @@ function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) { $data = array_shift( $candidates ); /* * When the size requested is smaller than the thumbnail dimensions, we - * fall back to the thumbnail size to maintain backwards compatibility with + * fall back to the thumbnail size to maintain backward compatibility with * pre 4.6 versions of WordPress. */ } elseif ( ! empty( $imagedata['sizes']['thumbnail'] ) && $imagedata['sizes']['thumbnail']['width'] >= $size[0] && $imagedata['sizes']['thumbnail']['width'] >= $size[1] ) { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 5a182a9a08..4c70515035 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -1083,7 +1083,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array( 'jquery', 'jquery-hotkeys' ), false, 1 ); $scripts->add( 'jquery-touch-punch', '/wp-includes/js/jquery/jquery.ui.touch-punch.js', array( 'jquery-ui-widget', 'jquery-ui-mouse' ), '0.2.2', 1 ); - // Not used any more, registered for backwards compatibility. + // Not used any more, registered for backward compatibility. $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array( 'jquery' ), '1.1-20110113', 1 ); // Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv. diff --git a/wp-includes/theme.php b/wp-includes/theme.php index eb960f8004..a6bf043f03 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -3285,7 +3285,7 @@ function _wp_keep_alive_customize_changeset_dependent_auto_drafts( $new_status, * it is now a persistent changeset, a long-lived draft, and so any * associated auto-draft posts should likewise transition into having a draft * status. These drafts will be treated differently than regular drafts in - * that they will be tied to the given changeset. The publish metabox is + * that they will be tied to the given changeset. The publish meta box is * replaced with a notice about how the post is part of a set of customized changes * which will be published when the changeset is published. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index aad7a1a4a2..2a78b90d20 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2-beta3-45231'; +$wp_version = '5.2-beta3-45232'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 4e80a1981d..39e9331692 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1335,7 +1335,7 @@ class wpdb { * If a %s placeholder already has quotes around it, removing the existing quotes and re-inserting them * ensures the quotes are consistent. * - * For backwards compatibility, this is only applied to %s, and not to placeholders like %1$s, which are frequently + * For backward compatibility, this is only applied to %s, and not to placeholders like %1$s, which are frequently * used in the middle of longer strings, or as table name placeholders. */ $query = str_replace( "'%s'", '%s', $query ); // Strip any existing single quotes.