From a55c84380a4d4debac0a0ecf09ee414741174f51 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 26 Jun 2020 09:30:11 +0000
Subject: [PATCH] Docs: Spell "line breaks" in a consistent way.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@48175


git-svn-id: http://core.svn.wordpress.org/trunk@47944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/deprecated.php |  4 ++--
 wp-includes/formatting.php | 14 +++++++-------
 wp-includes/version.php    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index ad0af4c12e..0a3f609fc1 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -2947,13 +2947,13 @@ function get_current_theme() {
  * Accepts matches array from preg_replace_callback in wpautop() or a string.
  *
  * Ensures that the contents of a `<pre>...</pre>` HTML block are not
- * converted into paragraphs or line-breaks.
+ * converted into paragraphs or line breaks.
  *
  * @since 1.2.0
  * @deprecated 3.4.0
  *
  * @param array|string $matches The array or string
- * @return string The pre block without paragraph/line-break conversion.
+ * @return string The pre block without paragraph/line break conversion.
  */
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 738d205b3a..6b15beac67 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -425,16 +425,16 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
 }
 
 /**
- * Replaces double line-breaks with paragraph elements.
+ * Replaces double line breaks with paragraph elements.
  *
  * A group of regex replaces used to identify text formatted with newlines and
- * replace double line-breaks with HTML paragraph tags. The remaining line-breaks
+ * replace double line breaks with HTML paragraph tags. The remaining line breaks
  * after conversion become <<br />> tags, unless $br is set to '0' or 'false'.
  *
  * @since 0.71
  *
  * @param string $pee The text which has to be formatted.
- * @param bool   $br  Optional. If set, this will convert all remaining line-breaks
+ * @param bool   $br  Optional. If set, this will convert all remaining line breaks
  *                    after paragraphing. Line breaks within `<script>`, `<style>`,
  *                    and `<svg>` tags are not affected. Default true.
  * @return string Text which has been converted into correct paragraph tags.
@@ -927,8 +927,8 @@ function seems_utf8( $str ) {
  *                                    converting single quotes if set to 'single',
  *                                    double if set to 'double' or both if otherwise set.
  *                                    Default is ENT_NOQUOTES.
- * @param false|string $charset       Optional. The character encoding of the string. Default is false.
- * @param bool         $double_encode Optional. Whether to encode existing html entities. Default is false.
+ * @param false|string $charset       Optional. The character encoding of the string. Default false.
+ * @param bool         $double_encode Optional. Whether to encode existing html entities. Default false.
  * @return string The encoded text with HTML entities.
  */
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
@@ -1091,7 +1091,7 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
  * @since 2.8.0
  *
  * @param string  $string The text which is to be checked.
- * @param bool    $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
+ * @param bool    $strip  Optional. Whether to attempt to strip out invalid UTF8. Default false.
  * @return string The checked text.
  */
 function wp_check_invalid_utf8( $string, $strip = false ) {
@@ -3789,7 +3789,7 @@ function human_time_diff( $from, $to = 0 ) {
  * @since 5.2.0 Added the `$post` parameter.
  *
  * @param string             $text Optional. The excerpt. If set to empty, an excerpt is generated.
- * @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default is null.
+ * @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default null.
  * @return string The excerpt.
  */
 function wp_trim_excerpt( $text = '', $post = null ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 024c198d3c..eeddeb42f2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48174';
+$wp_version = '5.5-alpha-48175';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.