From b1b3fc5deb774d218de253c7a1a2e65b923d147d Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 12 Oct 2015 16:34:23 +0000
Subject: [PATCH] Docs: Re-clarify the `$sizes[ $size ]` section of the hash
 notations for `WP_Image_Editor_GD::multi_resize()` and
 `WP_Image_Editor_Imagick::multi_resize()` as not fully-optional.

The `$width` value is optional if `$height` is specified, and vice versa. The `$crop` value is always optional and defaults to false.

Props dh-shredder.
See #32246. See [35061] and [35062].

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


git-svn-id: http://core.svn.wordpress.org/trunk@35028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-image-editor-gd.php      | 8 ++++----
 wp-includes/class-wp-image-editor-imagick.php | 8 ++++----
 wp-includes/version.php                       | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index 3d4e89b72a..9951dba0a5 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -219,11 +219,11 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 *     maintain aspect ratio according to the provided dimension.
 	 *
 	 *     @type array $size {
-	 *         Optional. Array of height, width values, and whether to crop.
+	 *         Array of height, width values, and whether to crop.
 	 *
-	 *         @type int  $width  Image width.
-	 *         @type int  $height Image height.
-	 *         @type bool $crop   Whether to crop the image. Default false.
+	 *         @type int  $width  Image width. Optional if `$height` is specified.
+	 *         @type int  $height Image height. Optional if `$width` is specified.
+	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
 	 *     }
 	 * }
 	 * @return array An array of resized images' metadata by size.
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 4479afc7ab..58338055e2 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -277,11 +277,11 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 *     maintain aspect ratio according to the provided dimension.
 	 *
 	 *     @type array $size {
-	 *         Optional. Array of height, width values, and whether to crop.
+	 *         Array of height, width values, and whether to crop.
 	 *
-	 *         @type int  $width  Image width.
-	 *         @type int  $height Image height.
-	 *         @type bool $crop   Whether to crop the image. Default false.
+	 *         @type int  $width  Image width. Optional if `$height` is specified.
+	 *         @type int  $height Image height. Optional if `$width` is specified.
+	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
 	 *     }
 	 * }
 	 * @return array An array of resized images' metadata by size.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ebc78d7054..42be57b215 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35062';
+$wp_version = '4.4-alpha-35063';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.