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

See #34257.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34998 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 e0ed8f4bd6..39bdd37b1e 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -31,8 +31,9 @@
  *
  * @param int          $width   Width of the image in pixels.
  * @param int          $height  Height of the image in pixels.
- * @param string|array $size    Optional. Size or array of sizes of what the result image
- *                              should be. Accepts any valid image size name. Default 'medium'.
+ * @param string|array $size    Optional. Image size. Accepts any valid image size, or an array
+ *                              of width and height values in pixels (in that order).
+ *                              Default 'medium'.
  * @param string       $context Optional. Could be 'display' (like in a theme) or 'edit'
  *                              (like inserting into an editor). Default null.
  * @return array Width and height of what the result image should resize to.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a55fc03fba..5505920189 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35032';
+$wp_version = '4.4-alpha-35033';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.