From e53b79b7264eaf5fcd0b2dbefcfbf1805fcfa441 Mon Sep 17 00:00:00 2001
From: Ryan McCue <me@ryanmccue.info>
Date: Thu, 29 Sep 2016 21:12:27 +0000
Subject: [PATCH] Options: Add missing since for register_setting argument.

[38635] added support for extra arguments on registration, but was not documented.

See #37885.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 1 +
 wp-includes/version.php      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 3f35172f2a..c4cdb845a4 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -1768,6 +1768,7 @@ function user_can_access_admin_page() {
  * Register a setting and its data.
  *
  * @since 2.7.0
+ * @since 4.7.0 `$args` can be passed to set flags on the setting, similar to `register_meta()`.
  *
  * @global array $new_whitelist_options
  * @global array $wp_registered_settings
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8e18a0b904..9d1e3dcf2f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38675';
+$wp_version = '4.7-alpha-38676';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.