From 3def77672dd86568b168d5b86ee14b4acb66c42c Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 12 Nov 2019 22:42:02 +0000
Subject: [PATCH] Docs: Correct some invalid hook docblocks.

See #48303

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


git-svn-id: http://core.svn.wordpress.org/trunk@46529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-text-diff-renderer-table.php           | 6 +++---
 wp-includes/rest-api/class-wp-rest-server.php               | 4 ++--
 .../endpoints/class-wp-rest-revisions-controller.php        | 6 +++---
 wp-includes/version.php                                     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-includes/class-wp-text-diff-renderer-table.php b/wp-includes/class-wp-text-diff-renderer-table.php
index e2da03f4ed..5155e2b802 100644
--- a/wp-includes/class-wp-text-diff-renderer-table.php
+++ b/wp-includes/class-wp-text-diff-renderer-table.php
@@ -168,9 +168,9 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 				 *
 				 * @since 4.1.0
 				 *
-				 * @param String $processed_line The processed diffed line.
-				 * @param String $line           The unprocessed diffed line.
-				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string $processed_line The processed diffed line.
+				 * @param string $line           The unprocessed diffed line.
+				 * @param string $context        The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}
diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php
index 1caee5e793..e07e214d97 100644
--- a/wp-includes/rest-api/class-wp-rest-server.php
+++ b/wp-includes/rest-api/class-wp-rest-server.php
@@ -129,8 +129,8 @@ class WP_REST_Server {
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param WP_Error|null|true WP_Error if authentication error, null if authentication
-		 *                              method wasn't used, true if authentication succeeded.
+		 * @param WP_Error|null|true $errors WP_Error if authentication error, null if authentication
+		 *                                   method wasn't used, true if authentication succeeded.
 		 */
 		return apply_filters( 'rest_authentication_errors', null );
 	}
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 9edf6eced6..cffeda5e9a 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -431,9 +431,9 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 		 *
 		 * @since 4.7.0
 		 *
-		 * @param (mixed) $result The revision object (if it was deleted or moved to the trash successfully)
-		 *                        or false (failure). If the revision was moved to the trash, $result represents
-		 *                        its new state; if it was deleted, $result represents its state before deletion.
+		 * @param WP_Post|false|null $result The revision object (if it was deleted or moved to the trash successfully)
+		 *                                   or false or null (failure). If the revision was moved to the trash, $result represents
+		 *                                   its new state; if it was deleted, $result represents its state before deletion.
 		 * @param WP_REST_Request $request The request sent to the API.
 		 */
 		do_action( 'rest_delete_revision', $result, $request );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 94a0b07b87..465aad73ed 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46724';
+$wp_version = '5.4-alpha-46729';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.