From 2163ba94bfd8c1682dad4f28ba2aa6b7e9f67b12 Mon Sep 17 00:00:00 2001
Date: Thu, 22 Jun 2017 04:36:23 +0200
Subject: [PATCH] Fix deprecation info in various docblocks

* Fix incorrect deprecation comment naming the deprecated function as its own alternative
* Fix typo in docblock `@deprecated` tag which meant that deprecation is not indicated on the dev ref website
* Add missing `@deprecated` tags for two functions
* Add missing alternative in @deprecated comment for `wp_get_sites()`
---
 src/wp-admin/includes/deprecated.php    | 2 +-
 src/wp-admin/includes/image-edit.php    | 4 ++++
 src/wp-admin/includes/ms-deprecated.php | 4 ++--
 src/wp-includes/ms-deprecated.php       | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php
index a9e0e6f..4832812 100644
--- a/src/wp-admin/includes/deprecated.php
+++ b/src/wp-admin/includes/deprecated.php
@@ -1464,7 +1464,7 @@ function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $f
  * Replaced with wp_page_reload_on_back_button_js() that also fixes this problem.
  *
  * @since 4.0.0
- * $deprecated 4.6.0
+ * @deprecated 4.6.0
  *
  * @global bool $is_safari
  * @global bool $is_chrome
diff --git a/src/wp-admin/includes/image-edit.php b/src/wp-admin/includes/image-edit.php
index db11b56..d9cf604 100644
--- a/src/wp-admin/includes/image-edit.php
+++ b/src/wp-admin/includes/image-edit.php
@@ -380,6 +380,8 @@ function _image_get_preview_ratio($w, $h) {
  * Returns an image resource. Internal use only.
  *
  * @since 2.9.0
+ * @deprecated 3.5.0 Use WP_Image_Editor::rotate()
+ * @see WP_Image_Editor::rotate()
  *
  * @ignore
  * @param resource  $img   Image resource.
@@ -402,6 +404,8 @@ function _rotate_image_resource($img, $angle) {
  * Flips an image resource. Internal use only.
  *
  * @since 2.9.0
+ * @deprecated 3.5.0 Use WP_Image_Editor::flip()
+ * @see WP_Image_Editor::flip()
  *
  * @ignore
  * @param resource $img  Image resource.
diff --git a/src/wp-admin/includes/ms-deprecated.php b/src/wp-admin/includes/ms-deprecated.php
index 81546bd..4a06e66 100644
--- a/src/wp-admin/includes/ms-deprecated.php
+++ b/src/wp-admin/includes/ms-deprecated.php
@@ -57,8 +57,8 @@ function activate_sitewide_plugin() {
 /**
  * Deprecated functionality for deactivating a network-only plugin.
  *
- * @deprecated 3.0.0 Use deactivate_sitewide_plugin()
- * @see deactivate_sitewide_plugin()
+ * @deprecated 3.0.0 Use deactivate_plugin()
+ * @see deactivate_plugin()
  */
 function deactivate_sitewide_plugin( $plugin = false ) {
 	_deprecated_function(__FUNCTION__, '3.0.0', 'deactivate_plugin()' );
diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
index 3d06dab..aaee22e 100644
--- a/src/wp-includes/ms-deprecated.php
+++ b/src/wp-includes/ms-deprecated.php
@@ -444,7 +444,7 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
  * Return an array of sites for a network or networks.
  *
  * @since 3.7.0
- * @deprecated 4.6.0
+ * @deprecated 4.6.0 Use get_sites()
  * @see get_sites()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
-- 
2.10.1.windows.1