From 6bb600fe25f905cea6f27853c51bac45efd4d321 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 14 Jun 2016 18:14:27 +0000
Subject: [PATCH] Docs: Update the documentation for `get_site()` and the
 `get_site` filter following the removal of the `$output` parameter in
 [37652].

Props flixos90.
See #35791.

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


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

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 0516bfbed4..f0dcb9477d 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -479,8 +479,8 @@ function clean_blog_cache( $blog ) {
  *
  * @global WP_Site $current_blog The current site.
  *
- * @param WP_Site|int $site Site to retrieve.
- * @return WP_Site|array|null Depends on $output value.
+ * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
+ * @return WP_Site|null The site object or null if not found.
  */
 function get_site( &$site = null ) {
 	global $current_blog;
@@ -505,7 +505,7 @@ function get_site( &$site = null ) {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @param mixed $_site Site data.
+	 * @param WP_Site $_site Site data.
 	 */
 	$_site = apply_filters( 'get_site', $_site );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1c730f44c6..07cd9fd37c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37698';
+$wp_version = '4.6-alpha-37699';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.