From 2eaeae58ff0f4e7a5e31220830d6de060359322a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 25 Jan 2022 13:55:05 +0000 Subject: [PATCH] Docs: Update spelling for inline comments in a few files. Per the [https://make.wordpress.org/core/handbook/best-practices/spelling/ spelling] and [https://make.wordpress.org/docs/style-guide/language-grammar/word-choice/ word choice] documentation guidelines, American (US) spelling should be preferred. Props mohadeseghasemi, subrataemfluence, rehanali, SergeyBiryukov. Fixes #46837. Built from https://develop.svn.wordpress.org/trunk@52640 git-svn-id: http://core.svn.wordpress.org/trunk@52229 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-filesystem-ssh2.php | 2 +- wp-admin/includes/file.php | 5 ++++- wp-admin/includes/update-core.php | 2 +- wp-includes/class-wp-image-editor-imagick.php | 4 ++-- wp-includes/class-wp-rewrite.php | 2 +- wp-includes/formatting.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/pomo/po.php | 2 +- wp-includes/rest-api/class-wp-rest-response.php | 2 +- wp-includes/rest-api/class-wp-rest-server.php | 2 +- wp-includes/version.php | 2 +- 11 files changed, 15 insertions(+), 12 deletions(-) diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php index 7687d2d750..bd2f6ba951 100644 --- a/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -26,7 +26,7 @@ * Restart Apache! * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp exist. * - * Note: As of WordPress 2.8, this utilises the PHP5+ function `stream_get_contents()`. + * Note: As of WordPress 2.8, this utilizes the PHP5+ function `stream_get_contents()`. * * @since 2.7.0 * diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 6aa75a4c59..46e9ecc6bb 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -1395,7 +1395,10 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f // Allow for an old version of Sodium_Compat being loaded before the bundled WordPress one. if ( method_exists( 'ParagonIE_Sodium_Compat', 'runtime_speed_test' ) ) { - // Run `ParagonIE_Sodium_Compat::runtime_speed_test()` in optimized integer mode, as that's what WordPress utilises during signing verifications. + /* + * Run `ParagonIE_Sodium_Compat::runtime_speed_test()` in optimized integer mode, + * as that's what WordPress utilizes during signing verifications. + */ // phpcs:disable WordPress.NamingConventions.ValidVariableName $old_fastMult = ParagonIE_Sodium_Compat::$fastMult; ParagonIE_Sodium_Compat::$fastMult = true; diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index ee972e713a..2326bb6547 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -983,7 +983,7 @@ function update_core( $from, $to ) { /* * Import $wp_version, $required_php_version, and $required_mysql_version from the new version. - * DO NOT globalise any variables imported from `version-current.php` in this function. + * DO NOT globalize any variables imported from `version-current.php` in this function. * * BC Note: $wp_filesystem->wp_content_dir() returned unslashed pre-2.8. */ diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php index b7336fe5ae..d898db553a 100644 --- a/wp-includes/class-wp-image-editor-imagick.php +++ b/wp-includes/class-wp-image-editor-imagick.php @@ -589,7 +589,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { try { $this->image->rotateImage( new ImagickPixel( 'none' ), 360 - $angle ); - // Normalise EXIF orientation data so that display is consistent across devices. + // Normalize EXIF orientation data so that display is consistent across devices. if ( is_callable( array( $this->image, 'setImageOrientation' ) ) && defined( 'Imagick::ORIENTATION_TOPLEFT' ) ) { $this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT ); } @@ -627,7 +627,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { $this->image->flopImage(); } - // Normalise EXIF orientation data so that display is consistent across devices. + // Normalize EXIF orientation data so that display is consistent across devices. if ( is_callable( array( $this->image, 'setImageOrientation' ) ) && defined( 'Imagick::ORIENTATION_TOPLEFT' ) ) { $this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT ); } diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php index 531707884b..1a5c046e30 100644 --- a/wp-includes/class-wp-rewrite.php +++ b/wp-includes/class-wp-rewrite.php @@ -1173,7 +1173,7 @@ class WP_Rewrite { // Not matching a permalink so this is a lot simpler. } else { - // Close the match and finalise the query. + // Close the match and finalize the query. $match .= '?$'; $query = $index . '?' . $query; } diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index dac06eb571..118c8a8249 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -4695,7 +4695,7 @@ function wp_make_link_relative( $link ) { } /** - * Sanitises various option values based on the nature of the option. + * Sanitizes various option values based on the nature of the option. * * This is basically a switch statement which will pass $value through a number * of functions depending on the $option. diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 5b6881dec2..539194642d 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2140,7 +2140,7 @@ function wp_normalize_path( $path ) { $wrapper .= '://'; } - // Standardise all paths to use '/'. + // Standardize all paths to use '/'. $path = str_replace( '\\', '/', $path ); // Replace multiple slashes down to a singular, allowing for network shares having two slashes. diff --git a/wp-includes/pomo/po.php b/wp-includes/pomo/po.php index 667ff65567..cfd8084ac6 100644 --- a/wp-includes/pomo/po.php +++ b/wp-includes/pomo/po.php @@ -171,7 +171,7 @@ if ( ! class_exists( 'PO', false ) ) : } } - // Standardise the line endings on imported content, technically PO files shouldn't contain \r. + // Standardize the line endings on imported content, technically PO files shouldn't contain \r. $unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified ); return $unpoified; diff --git a/wp-includes/rest-api/class-wp-rest-response.php b/wp-includes/rest-api/class-wp-rest-response.php index 8222749a8f..cb890f5b0b 100644 --- a/wp-includes/rest-api/class-wp-rest-response.php +++ b/wp-includes/rest-api/class-wp-rest-response.php @@ -278,7 +278,7 @@ class WP_REST_Response extends WP_HTTP_Response { * `http://w.org/{rel}` would transform a `http://w.org/term` relation * into `example:term`. * - * Well-behaved clients should expand and normalise these back to their + * Well-behaved clients should expand and normalize these back to their * full URI relation, however some naive clients may not resolve these * correctly, so adding new CURIEs may break backward compatibility. * diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php index f7231712c1..a14c20cfa4 100644 --- a/wp-includes/rest-api/class-wp-rest-server.php +++ b/wp-includes/rest-api/class-wp-rest-server.php @@ -849,7 +849,7 @@ class WP_REST_Server { */ $endpoints = apply_filters( 'rest_endpoints', $endpoints ); - // Normalise the endpoints. + // Normalize the endpoints. $defaults = array( 'methods' => '', 'accept_json' => false, diff --git a/wp-includes/version.php b/wp-includes/version.php index 5cc49e079b..04d4be3963 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-52639'; +$wp_version = '6.0-alpha-52640'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.