From 73892c112c938e9092e0a666a292a3a2eab62a3c Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 10 May 2015 16:58:27 +0000
Subject: [PATCH] Update the DocBlock description for `update_option()` to
 account for the ability to define the `$autoload` parameter, added in 4.2.

Props Clorith for the initial patch.
Fixes #32331.

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


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

diff --git a/wp-includes/option.php b/wp-includes/option.php
index b7725fc472..5149f4c598 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -216,9 +216,8 @@ function wp_load_core_site_options( $site_id = null ) {
  * it will be serialized before it is inserted into the database. Remember,
  * resources can not be serialized or added as an option.
  *
- * If the option does not exist, then the option will be added with the option
- * value, but you will not be able to set whether it is autoloaded. If you want
- * to set whether an option is autoloaded, then you need to use the add_option().
+ * If the option does not exist, then the option will be added with the option value,
+ * with an `$autoload` value of 'yes'.
  *
  * @since 1.0.0
  * @since 4.2.0 The `$autoload` parameter was added.
@@ -227,8 +226,8 @@ function wp_load_core_site_options( $site_id = null ) {
  * @param mixed       $value    Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options,
  *                              `$autoload` can only be updated using `update_option()` if `$value` is also changed.
- *                              Accepts 'yes' or true to enable, 'no' or false to disable. For non-existent options,
- *                              the default value is 'yes'.
+ *                              Accepts 'yes'|true to enable or 'no'|false to disable. For non-existent options,
+ *                              the default value is 'yes'. Default null.
  * @return bool False if value was not updated and true if value was updated.
  */
 function update_option( $option, $value, $autoload = null ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5ab7efdc73..9888f7f9a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32480';
+$wp_version = '4.3-alpha-32481';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.