From 586c1ac7bc96a57b746b0ff52d1c6ea26ce3e02a Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 31 Dec 2014 18:15:23 +0000
Subject: [PATCH] Fix docs for `WP_User::allcaps`:

The `allcaps` property of the `WP_User` class represents all of the caps of the user, not the caps of the user's role. Introduced in [26126].

Props dlh.
Fixes #30852.

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


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

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index e52f61817a..3c665f0bd4 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -985,7 +985,7 @@ class WP_User {
 		 * @since 2.0.0
 		 * @since 3.7.0 Added the user object.
 		 *
-		 * @param array   $allcaps An array of all the role's capabilities.
+		 * @param array   $allcaps An array of all the user's capabilities.
 		 * @param array   $caps    Actual capabilities for meta capability.
 		 * @param array   $args    Optional parameters passed to has_cap(), typically object ID.
 		 * @param WP_User $user    The user object.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a53f14cee3..9a29121424 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31012';
+$wp_version = '4.2-alpha-31013';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.