From 041e3dd285eea0947f679e88fb284f900a688e32 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 12 Oct 2015 16:27:24 +0000
Subject: [PATCH] Docs: Fix hash notation syntax for the `$sizes[ $size ]`
 section in the DocBlock for `WP_Image_Editor_Imagick::multi_resize()`.

See #32246.

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


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

diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index f4d8f3b49f..4479afc7ab 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -277,9 +277,11 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 *     maintain aspect ratio according to the provided dimension.
 	 *
 	 *     @type array $size {
-	 *         @type int  ['width']  Optional. Image width.
-	 *         @type int  ['height'] Optional. Image height.
-	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
+	 *         Optional. 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.
 	 *     }
 	 * }
 	 * @return array An array of resized images' metadata by size.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b42177e5e6..ebc78d7054 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35061';
+$wp_version = '4.4-alpha-35062';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.