From 5b3e08020b1326a793fe2f4165e454e449a47a1f Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 8 Jan 2019 06:00:50 +0000
Subject: [PATCH] Docs: Improve the `@global` tags in `wp-includes/option.php`.

Props upadalavipul.
Fixes #45581.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44294 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/option.php  | 11 +++++++----
 wp-includes/version.php |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/wp-includes/option.php b/wp-includes/option.php
index f6e3eafcdf..1c0d88225e 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -1193,7 +1193,7 @@ function update_site_option( $option, $value ) {
  *
  * @see get_option()
  *
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
  * @param string   $option     Name of option to retrieve. Expected to not be SQL-escaped.
@@ -1326,7 +1326,7 @@ function get_network_option( $network_id, $option, $default = false ) {
  *
  * @see add_option()
  *
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
  * @param string $option     Name of option to add. Expected to not be SQL-escaped.
@@ -1448,7 +1448,7 @@ function add_network_option( $network_id, $option, $value ) {
  *
  * @see delete_option()
  *
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int    $network_id ID of the network. Can be null to default to the current network ID.
  * @param string $option     Name of option to remove. Expected to not be SQL-escaped.
@@ -1541,7 +1541,7 @@ function delete_network_option( $network_id, $option ) {
  *
  * @see update_option()
  *
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
  * @param string   $option     Name of option. Expected to not be SQL-escaped.
@@ -2162,6 +2162,7 @@ function register_setting( $option_group, $option_name, $args = array() ) {
  * @since 4.7.0 `$sanitize_callback` was deprecated. The callback from `register_setting()` is now used instead.
  *
  * @global array $new_whitelist_options
+ * @global array $wp_registered_settings
  *
  * @param string   $option_group      The settings group name used during registration.
  * @param string   $option_name       The name of the option to unregister.
@@ -2234,6 +2235,8 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
  *
  * @since 4.7.0
  *
+ * @global array $wp_registered_settings
+ *
  * @return array List of registered settings, keyed by option name.
  */
 function get_registered_settings() {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cbb58c78dd..3fa8c65892 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.1-alpha-44462';
+$wp_version = '5.1-alpha-44463';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.