From f83488a0583b63c5128ccd06b34d6ff2cf637472 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 10 Mar 2016 22:02:26 +0000
Subject: [PATCH] Docs: Improve the summary and return description in the
 DocBlock for `unregister_taxonomy()`, introduced in [36243].

See #35227. See #35986.

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


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

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index d9930e21e4..8f0b602c75 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -491,7 +491,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 }
 
 /**
- * Unregister a taxonomy.
+ * Unregisters a taxonomy.
  *
  * Can not be used to unregister built-in taxonomies.
  *
@@ -501,7 +501,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
  * @global array $wp_taxonomies List of taxonomies.
  *
  * @param string $taxonomy Taxonomy name.
- * @return bool|WP_Error True on success, WP_Error on failure.
+ * @return bool|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
  */
 function unregister_taxonomy( $taxonomy ) {
 	if ( ! taxonomy_exists( $taxonomy ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 52385d6ffa..0e55b470bb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta3-36960';
+$wp_version = '4.5-beta3-36961';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.