From d097e7cf832055f94f0b320801a2d38ea114a1b7 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sun, 30 Nov 2014 22:44:22 +0000
Subject: [PATCH] Improve the `@param` docs for `src/includes/theme.php` and
 `src/includes/update.php`.

See #30224.

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


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

diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 792c8c0f32..d31dbf7f58 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -871,7 +871,7 @@ function validate_current_theme() {
  *
  * @since 3.1.0
  *
- * @return array Theme modifications.
+ * @return array|null Theme modifications.
  */
 function get_theme_mods() {
 	$theme_slug = get_option( 'stylesheet' );
@@ -1364,7 +1364,7 @@ body.custom-background { <?php echo trim( $style ); ?> }
  *
  * @since 3.0.0
  *
- * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
@@ -1700,7 +1700,7 @@ function get_theme_support( $feature ) {
  * @since 3.0.0
  * @see add_theme_support()
  * @param string $feature the feature being added
- * @return bool Whether feature was removed.
+ * @return null|bool Whether feature was removed.
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
@@ -1715,6 +1715,7 @@ function remove_theme_support( $feature ) {
  *
  * @access private
  * @since 3.1.0
+ * @param string $feature
  */
 function _remove_theme_support( $feature ) {
 	global $_wp_theme_features;
diff --git a/wp-includes/update.php b/wp-includes/update.php
index 9a46823ce4..8cba8a7a83 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -18,7 +18,7 @@
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
  * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set.
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @return null|false Returns null if update is unsupported. Returns false if check is too soon.
  */
 function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	if ( defined('WP_INSTALLING') )
@@ -180,7 +180,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
  * @uses $wp_version Used to notify the WordPress version.
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @return false|null Returns null if update is unsupported. Returns false if check is too soon.
  */
 function wp_update_plugins( $extra_stats = array() ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
@@ -334,7 +334,7 @@ function wp_update_plugins( $extra_stats = array() ) {
  * @uses $wp_version Used to notify the WordPress version.
  *
  * @param array $extra_stats Extra statistics to report to the WordPress.org API.
- * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
+ * @return false|null Returns null if update is unsupported. Returns false if check is too soon.
  */
 function wp_update_themes( $extra_stats = array() ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eaa982c567..524283fcf8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30671';
+$wp_version = '4.1-beta2-30672';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.