From 538eb01e6f44bbd8d371ce78a0a4dce00b2f34de Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 28 Jun 2016 06:42:28 +0000
Subject: [PATCH] Docs: Add a more complete `$labels` parameter description to
 the DocBlock for `register_post_type()`.

Directly references `get_post_type_labels()` for the full list of supported labels.

See #32246.

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


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

diff --git a/wp-includes/post.php b/wp-includes/post.php
index 9778634a40..7edde4e42d 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -914,7 +914,8 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
  *                                             Default is value of $labels['name'].
  *     @type array       $labels               An array of labels for this post type. If not set, post
  *                                             labels are inherited for non-hierarchical types and page
- *                                             labels for hierarchical ones. get_post_type_labels().
+ *                                             labels for hierarchical ones. See get_post_type_labels() for a full
+ *                                             list of supported labels.
  *     @type string      $description          A short descriptive summary of what the post type is.
  *                                             Default empty.
  *     @type bool        $public               Whether a post type is intended for use publicly either via
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 110f2128db..a9ef09594a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37884';
+$wp_version = '4.6-alpha-37885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.