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

See #34257.

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


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

diff --git a/wp-includes/media.php b/wp-includes/media.php
index 7c9312e49d..9a502b98b2 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -755,8 +755,8 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
  * @since 2.5.0
  *
  * @param int          $attachment_id Image attachment ID.
- * @param string|array $size          Optional. Registered image size or flat array of height and width
- *                                    dimensions. Default 'thumbnail'.
+ * @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 'thumbnail'.
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @param string|array $attr          Optional. Attributes for the image markup. Default empty.
  * @return string HTML img element or empty string on failure.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5fd5699cf0..956ea049ae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35041';
+$wp_version = '4.4-alpha-35042';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.