From 94fdeabe276121a17e4f8d504cfa0ed59ca59377 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 4 Feb 2016 14:50:26 +0000
Subject: [PATCH] Docs: Document the `$args` parameter for `get_categories()`
 as a hash notation.

The only specific default for `get_categories()` is `$taxonomy` with a value of 'category', all the other arguments are documented separately in `get_terms()`.

See #32246.

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


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

diff --git a/wp-includes/category.php b/wp-includes/category.php
index f4f3373ac9..cbef474490 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -16,8 +16,11 @@
  * @since 2.1.0
  * @see get_terms() Type of arguments that can be changed.
  *
- * @param string|array $args Optional. Arguments to retrieve categories. See {@see get_terms()} for available arguments.
- *                           Default empty.
+ * @param string|array $args {
+ *     Optional. Arguments to retrieve categories. See {@see get_terms()} for additional options.
+ *
+ *     @type string $taxonomy Taxonomy to retrieve terms for. In this case, default 'category'.
+ * }
  * @return array List of categories.
  */
 function get_categories( $args = '' ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4ea5c38c1b..20a7067a4b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36475';
+$wp_version = '4.5-alpha-36476';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.