From 50369e1c980f18c0772df7c7a868dd6b81541a0e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 5 Jun 2015 20:39:26 +0000
Subject: [PATCH] Add `@since` for `check_password_reset_key()`,
 `reset_password()`, and `register_new_user()`.

see #20279.
Built from https://develop.svn.wordpress.org/trunk@32696


git-svn-id: http://core.svn.wordpress.org/trunk@32666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php    | 6 ++++++
 wp-includes/version.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 436a6640e9..2599ce01a9 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2278,6 +2278,8 @@ function wp_get_password_hint() {
  * hashing process. This field is now hashed; old values are no longer accepted
  * but have a different WP_Error code so good user feedback can be provided.
  *
+ * @since 3.1.0
+ *
  * @global wpdb         $wpdb      WordPress database object for queries.
  * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
  *
@@ -2331,6 +2333,8 @@ function check_password_reset_key($key, $login) {
 /**
  * Handles resetting the user's password.
  *
+ * @since 2.5.0
+ *
  * @param object $user     The user
  * @param string $new_pass New password for the user in plaintext
  */
@@ -2354,6 +2358,8 @@ function reset_password( $user, $new_pass ) {
 /**
  * Handles registering a new user.
  *
+ * @since 2.5.0
+ *
  * @param string $user_login User's username for logging in
  * @param string $user_email User's email address to send password and add
  * @return int|WP_Error Either user's ID or error on failure.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e96412a57e..32e2d86c4f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32695';
+$wp_version = '4.3-alpha-32696';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.