From 55bbcf0391054a64219d7d0781665471c05c78b2 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Thu, 14 Jan 2016 00:02:25 +0000
Subject: [PATCH] Networks and Sites: Clarify the docblock for
 `get_current_site()` so it's clear that it returns the current network
 object, not anything to do with the current site. As a further exercise, the
 reader is invited to fix the nomenclature surrounding blogs, sites, and
 networks in WordPress.

Props ericlewis
Fixes #35414

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


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

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index e3c15d7630..ecb6a1f3bd 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1581,10 +1581,10 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 }
 
 /**
- * Get the current site info.
+ * Get the current network.
  *
  * Returns an object containing the 'id', 'domain', 'path', and 'site_name'
- * properties of the site being viewed.
+ * properties of the network being viewed.
  *
  * @see wpmu_current_site()
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 68c4a81efb..1ff473c17d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36292';
+$wp_version = '4.5-alpha-36293';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.