From 7f898dd9c4305255da602a7a229c64318c4b9123 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 23 Jul 2020 19:06:03 +0000
Subject: [PATCH] Docs: Use more appropriate variable names in the inline docs
 for action and filter parameters.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-comments-list-table.php | 4 ++--
 wp-admin/includes/comment.php                      | 2 +-
 wp-includes/class-wp-rewrite.php                   | 2 +-
 wp-includes/feed-rss2-comments.php                 | 4 ++--
 wp-includes/user.php                               | 4 ++--
 wp-includes/version.php                            | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index b76ad9162a..8e90297891 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -1014,8 +1014,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 		 *
 		 * @since 2.8.0
 		 *
-		 * @param string $column_name         The custom column's name.
-		 * @param int    $comment->comment_ID The custom column's unique ID number.
+		 * @param string $column_name The custom column's name.
+		 * @param int    $comment_ID  The custom column's unique ID number.
 		 */
 		do_action( 'manage_comments_custom_column', $column_name, $comment->comment_ID );
 	}
diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 66c4556a55..89022949b1 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -122,7 +122,7 @@ function get_comment_to_edit( $id ) {
 	 *
 	 * @since 2.0.0
 	 *
-	 * @param string $comment->comment_content Comment content.
+	 * @param string $comment_content Comment content.
 	 */
 	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
 
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 7411277660..95a0386706 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1443,7 +1443,7 @@ class WP_Rewrite {
 		 *
 		 * @since 1.5.0
 		 *
-		 * @param string[] $this->rules The compiled array of rewrite rules, keyed by their regex pattern.
+		 * @param string[] $rules The compiled array of rewrite rules, keyed by their regex pattern.
 		 */
 		$this->rules = apply_filters( 'rewrite_rules_array', $this->rules );
 
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index 5cbd06c1f0..bf69a4d3ae 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -110,8 +110,8 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 		 *
 		 * @since 2.1.0
 		 *
-		 * @param int $comment->comment_ID The ID of the comment being displayed.
-		 * @param int $comment_post->ID    The ID of the post the comment is connected to.
+		 * @param int $comment_ID The ID of the comment being displayed.
+		 * @param int $ID         The ID of the post the comment is connected to.
 		 */
 		do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
 		?>
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 63047c7219..10c325587d 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2319,8 +2319,8 @@ function get_password_reset_key( $user ) {
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param bool $allow         Whether to allow the password to be reset. Default true.
-	 * @param int  $user_data->ID The ID of the user attempting to reset a password.
+	 * @param bool $allow Whether to allow the password to be reset. Default true.
+	 * @param int  $ID    The ID of the user attempting to reset a password.
 	 */
 	$allow = apply_filters( 'allow_password_reset', $allow, $user->ID );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4ff8d23c11..e78617e01c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta3-48584';
+$wp_version = '5.5-beta3-48585';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.