From ccef2fc743f12d79b69b4455d91e5e6dc50a0301 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 27 Sep 2015 18:13:48 +0000
Subject: [PATCH] Docs: Add documentation for the `$browse`, `$user`,
 `$search`, `$author`, `$tag`, `$installed_plugins`, and `$page` parameters in
 `plugins_api()`.

Props ocean90.
Fixes #34035.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin-install.php | 20 ++++++++++++++------
 wp-includes/version.php              |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 52129a86bc..62799c3390 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -27,12 +27,20 @@
  * @param array|object $args   {
  *     Optional. Array or object of arguments to serialize for the Plugin Info API.
  *
- *     @type string  $slug     The plugin slug.
- *     @type int     $per_page Number of plugins per page. Default 24.
- *     @type int     $number   Number of tags or categories to be queried.
- *     @type string  $locale   Locale to provide context-sensitive results. Default is the value of get_locale().
- *     @type bool    $is_ssl   Whether links should be returned with https or not. Default false.
- *     @type array   $fields   {
+ *     @type string  $slug              The plugin slug. Default empty.
+ *     @type int     $per_page          Number of plugins per page. Default 24.
+ *     @type int     $page              Number of current page. Default 1.
+ *     @type int     $number            Number of tags or categories to be queried.
+ *     @type string  $search            A search term. Default empty.
+ *     @type string  $tag               Tag to filter plugins. Default empty.
+ *     @type string  $author            Username of an plugin author to filter plugins. Default empty.
+ *     @type string  $user              Username to query for their favorites. Default empty.
+ *     @type string  $browse            Browse view: 'popular', 'new', 'beta', 'recommended'.
+ *     @type string  $locale            Locale to provide context-sensitive results. Default is the value
+ *                                      of get_locale().
+ *     @type string  $installed_plugins Installed plugins to provide context-sensitive results.
+ *     @type bool    $is_ssl            Whether links should be returned with https or not. Default false.
+ *     @type array   $fields            {
  *         Array of fields which should or should not be returned.
  *
  *         @type bool $short_description Whether to return the plugin short description. Default true.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bf00ced83f..6c964c89ca 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34630';
+$wp_version = '4.4-alpha-34631';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.