From 3bbf79ba92df4e1905770d3bea26c6231c5dda7d Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 28 Nov 2014 09:20:23 +0000
Subject: [PATCH] 4.1 Docs Audit: Improve inline documentation for various
 properties and methods in the `WP_Customize_Control` and
 `WP_Customize_Upload_Control` classes.

See #30469.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-control.php | 13 +++++++------
 wp-includes/version.php                    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 4ffad97b02..dac04803a7 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -256,7 +256,7 @@ class WP_Customize_Control {
 	 *
 	 * @since 4.1.0
 	 *
-	 * @return array
+	 * @return array Array of parameters passed to the JavaScript.
 	 */
 	public function json() {
 		$this->to_json();
@@ -288,7 +288,7 @@ class WP_Customize_Control {
 	 *
 	 * @since 4.1.0
 	 *
-	 * @return string
+	 * @return string Contents of the control.
 	 */
 	public final function get_content() {
 		ob_start();
@@ -506,9 +506,11 @@ class WP_Customize_Control {
 	/**
 	 * Render the control's JS template.
 	 *
-	 * This function is only run for control types that have been registered with {@see WP_Customize_Manager::register_control_type()}.
+	 * This function is only run for control types that have been registered with
+	 * {@see WP_Customize_Manager::register_control_type()}.
 	 *
-	 * In the future, this will also print the template for the control's container element and be overridable.
+	 * In the future, this will also print the template for the control's container
+	 * element and be override-able.
 	 *
 	 * @since 4.1.0
 	 */
@@ -648,9 +650,8 @@ class WP_Customize_Upload_Control extends WP_Customize_Control {
 	 * Constructor.
 	 *
 	 * @since 4.1.0
-	 * @uses WP_Customize_Control::__construct()
 	 *
-	 * @param WP_Customize_Manager $manager
+	 * @param WP_Customize_Manager $manager {@see WP_Customize_Manager} instance.
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
 		parent::__construct( $manager, $id, $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3c202d26ee..17f8934337 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30604';
+$wp_version = '4.1-beta2-30605';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.