From 6683100d2cedbb6e38a05fbec93e12619d41313d Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 2 May 2016 04:53:27 +0000
Subject: [PATCH] Docs: Improve the class DocBlock for `WP_Widget` to clarify
 which methods "should" vs "must" be overridden by extending sub-classes.

Props Frank-Klein.
Fixes #36703.

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


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

diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php
index 9b9e4725b9..0653dee9d7 100644
--- a/wp-includes/class-wp-widget.php
+++ b/wp-includes/class-wp-widget.php
@@ -10,8 +10,9 @@
 /**
  * Core base class extended to register widgets.
  *
- * This class must be extended for each widget and WP_Widget::widget(), WP_Widget::update()
- * and WP_Widget::form() need to be overridden.
+ * This class must be extended for each widget, and WP_Widget::widget() must be overriden.
+ *
+ * If adding widget options, WP_Widget::update() and WP_Widget::form() should also be overridden.
  *
  * @since 2.8.0
  * @since 4.4.0 Moved to its own file from wp-includes/widgets.php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index add61239b9..a21f693d00 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37342';
+$wp_version = '4.6-alpha-37343';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.