From 97aef0e3368c8a36c71506fa2f81d0ae909be438 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Wed, 16 Jan 2019 05:29:49 +0000
Subject: [PATCH] Docs: Remove duplicate docblocks for the `pre_user_login` and
 `link_category` filters.

Props coffee2code.
Fixes #45308.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/user-new.php             | 8 +-------
 wp-includes/bookmark-template.php | 4 ++--
 wp-includes/version.php           | 2 +-
 wp-links-opml.php                 | 8 +-------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 48387b0373..7937fd8a3b 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -165,13 +165,7 @@ Please click the following link to confirm the invite:
 		if ( is_wp_error( $user_details['errors'] ) && $user_details['errors']->has_errors() ) {
 			$add_user_errors = $user_details['errors'];
 		} else {
-			/**
-			 * Filters the user_login, also known as the username, before it is added to the site.
-			 *
-			 * @since 2.0.3
-			 *
-			 * @param string $user_login The sanitized username.
-			 */
+			/** This filter is documented in wp-includes/user.php */
 			$new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
 			if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
 				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index 4b845190ad..78025b4550 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -266,11 +266,11 @@ function wp_list_bookmarks( $args = '' ) {
 				$r['category_before']
 			);
 			/**
-			 * Filters the bookmarks category name.
+			 * Filters the category name.
 			 *
 			 * @since 2.2.0
 			 *
-			 * @param string $cat_name The category name of bookmarks.
+			 * @param string $cat_name The category name.
 			 */
 			$catname = apply_filters( 'link_category', $cat->name );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 59207f564c..0b809f9c21 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-beta1-44611';
+$wp_version = '5.1-beta1-44612';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-links-opml.php b/wp-links-opml.php
index c64a5c036e..e0afb36257 100644
--- a/wp-links-opml.php
+++ b/wp-links-opml.php
@@ -63,13 +63,7 @@ if ( empty( $link_cat ) ) {
 }
 
 foreach ( (array) $cats as $cat ) :
-	/**
-	 * Filters the OPML outline link category name.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param string $catname The OPML outline category name.
-	 */
+	/** This filter is documented in wp-includes/bookmark-template.php */
 	$catname = apply_filters( 'link_category', $cat->name );
 
 	?>