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

Also adds the `array` type to the parameter documentation (already supported).

See #34257.

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


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

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 904cbb0ebb..e259766d8b 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -112,7 +112,8 @@ function the_media_upload_tabs() {
  * @param string  $align   image css alignment property
  * @param string  $url     image src url
  * @param string  $rel     image rel attribute
- * @param string  $size    image size (thumbnail, medium, large, full or added  with add_image_size() )
+ * @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).
  * @return string the html to insert into editor
  */
 function get_image_send_to_editor( $id, $caption, $title, $align, $url='', $rel = '', $size='medium', $alt = '' ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 56f244b01f..dddc152fa3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35054';
+$wp_version = '4.4-alpha-35055';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.