From bbc3cde9b04720df86378086a82483ca170eca56 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 4 Mar 2016 17:37:27 +0000
Subject: [PATCH] Docs: Improve DocBlock syntax and add a missing `@return`
 notation for `WP_Image_Editor_Imagick::strip_meta()`, introduced in [36700].

See: #33642, #30402, #28634. See #35986.

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


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

diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index b9a2f64a89..125ef0d99c 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -654,10 +654,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	}
 
 	/**
-	 * Strip all image meta except color profiles from an image.
+	 * Strips all image meta except color profiles from an image.
 	 *
-	 * @access protected
 	 * @since 4.5.0
+	 * @access protected
+	 *
+	 * @return true|WP_Error True if stripping metadata was successful. WP_Error object on error.
 	 */
 	protected function strip_meta() {
 		try {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b41a7698ee..405204be5d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta2-36846';
+$wp_version = '4.5-beta2-36847';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.