From 45174a89961dc7dfb93ae93e282da5852fdbe81f Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 12 Oct 2015 15:18:24 +0000
Subject: [PATCH] Docs: Adjust documentation for the `$size` parameter in
 `image_downsize()` to clarify the required order of width and height values
 when passing an array.

See #34257.

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


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

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 39bdd37b1e..a437926ae0 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -147,8 +147,9 @@ function image_hwstring( $width, $height ) {
  * @since 2.5.0
  *
  * @param int          $id   Attachment ID for image.
- * @param array|string $size Optional. Image size to scale to. Accepts a registered image size
- *                           or flat array of height and width values. Default 'medium'.
+ * @param array|string $size Optional. Image size to scale to. Accepts any valid image size,
+ *                           or an array of width and height values in pixels (in that order).
+ *                           Default 'medium'.
  * @return false|array Array containing the image URL, width, height, and boolean for whether
  *                     the image is an intermediate size. False on failure.
  */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5505920189..f26b94c10d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35033';
+$wp_version = '4.4-alpha-35034';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.