From 56cc4bc79caa97a02ac2eccfac4697eed3d54acf Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 15 Apr 2016 01:43:28 +0000
Subject: [PATCH] Docs: Clarify possible types passed to the
 `themes_api_result` filter.

See #32246

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


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

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 52bf5745c3..53c7ccbf72 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -479,10 +479,10 @@ function themes_api( $action, $args = array() ) {
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param array|object $res    WordPress.org Themes API response.
-	 * @param string       $action Requested action. Likely values are 'theme_information',
-	 *                             'feature_list', or 'query_themes'.
-	 * @param object       $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+	 * @param array|object|WP_Error $res    WordPress.org Themes API response.
+	 * @param string                $action Requested action. Likely values are 'theme_information',
+	 *                                      'feature_list', or 'query_themes'.
+	 * @param object                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
 	return apply_filters( 'themes_api_result', $res, $action, $args );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7497de9b3c..bd4755fee5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37208';
+$wp_version = '4.6-alpha-37209';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.