From 3a6985de964fe6ef4549b6d031f7e8ec06b83275 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Thu, 22 Jun 2017 17:48:45 +0000
Subject: [PATCH] Docs: Standardize and add missing deprecation notations in
 DocBlocks for the following functions:

* `post_form_autocomplete_off()`
* `_rotate_image_resource()`
* `_flip_image_resource()`
* `wp_get_sites()`
* `deactivate_sitewide_plugin()`

Props jrf.
See #41121.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/deprecated.php    | 4 +++-
 wp-admin/includes/image-edit.php    | 4 ++++
 wp-admin/includes/ms-deprecated.php | 4 ++--
 wp-includes/ms-deprecated.php       | 2 +-
 wp-includes/version.php             | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php
index a9e0e6f9d1..6a3b4b8ed5 100644
--- a/wp-admin/includes/deprecated.php
+++ b/wp-admin/includes/deprecated.php
@@ -1464,7 +1464,9 @@ 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
+ *
+ * @link https://core.trac.wordpress.org/ticket/35852
  *
  * @global bool $is_safari
  * @global bool $is_chrome
diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index db11b56690..d9cf6048f2 100644
--- a/wp-admin/includes/image-edit.php
+++ b/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/wp-admin/includes/ms-deprecated.php b/wp-admin/includes/ms-deprecated.php
index 81546bd147..4a06e66c6e 100644
--- a/wp-admin/includes/ms-deprecated.php
+++ b/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/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 3d06dab9fb..aaee22e72e 100644
--- a/wp-includes/ms-deprecated.php
+++ b/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.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cbf0b346ad..f78effa21d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40921';
+$wp_version = '4.9-alpha-40922';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.