From 6486a233c0b00a1fb966d1c74f12391e801dc3e9 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 7 Mar 2015 01:05:26 +0000
Subject: [PATCH] Remove a duplicate mention of the default value for the
 `$number` argument in `get_terms()`.

Props iandunn.
Fixes #31526.

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


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

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 3659627fab..f27b7b6aae 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -1593,7 +1593,6 @@ function get_term_to_edit( $id, $taxonomy ) {
  *                                           non-empty, $exclude_tree is ignored. Default empty array.
  *     @type int|string   $number            Maximum number of terms to return. Accepts ''|0 (all) or any
  *                                           positive number. Default ''|0 (all).
- *                                           Default ''|0 (all).
  *     @type int          $offset            The number by which to offset the terms query. Default empty.
  *     @type string       $fields            Term fields to query for. Accepts 'all' (returns an array of
  *                                           term objects), 'ids' or 'names' (returns an array of integers
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d01e571563..3ea601d922 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31651';
+$wp_version = '4.2-alpha-31652';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.