From 4ce271ea86b84102c271bb04b9a2cd3ce522f122 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 26 Feb 2015 05:54:24 +0000
Subject: [PATCH] Cleanup the `@property` annotations for `WP_User`.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/capabilities.php | 12 ++++++++----
 wp-includes/version.php      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 641fd05dda..0289fc32e7 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -419,17 +419,21 @@ class WP_Role {
  * @package WordPress
  * @subpackage User
  *
- * @property string $display_name
  * @property string $nickname
  * @property string $user_description
- * @property string $user_email
  * @property string $user_firstname
  * @property string $user_lastname
- * @property string $user_nicename
+ * @property string $user_login
  * @property string $user_pass
- * @property string $user_registered
+ * @property string $user_nicename
+ * @property string $user_email
  * @property string $user_url
+ * @property string $user_registered
+ * @property string $user_activation_key
+ * @property string $user_status
+ * @property string $display_name
  * @property string $spam
+ * @property string $deleted
  */
 class WP_User {
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0bab0c29ae..6d71c44656 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31554';
+$wp_version = '4.2-alpha-31555';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.