From 8ef2cd1537a3da01df0f8009583673fc7ff7055e Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 13 Jul 2015 22:15:24 +0000
Subject: [PATCH] Fix the inline documentation syntax in the hook docs for the
 `email_change_email` filter, introduced in 4.3.

Also update the filter summary to reflect that the file is for an "email" change, not a "password" change.

See [32820]. See #32891.

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


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

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 76f5df4d33..bea8462abf 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2275,21 +2275,21 @@ All at ###SITENAME###
 			);
 
 			/**
-			 * Filter the email sent when the user's password is changed.
+			 * Filter the contents of the email sent when the user's email is changed.
 			 *
 			 * @since 4.3.0
 			 *
 			 * @param array $email_change_email {
-			 *            Used to build wp_mail(). https://developer.wordpress.org/reference/functions/wp_mail/
+			 *            Used to build wp_mail().
 			 *            @type string $to      The intended recipients.
 			 *            @type string $subject The subject of the email.
 			 *            @type string $message The content of the email.
 			 *                The following strings have a special meaning and will get replaced dynamically:
-			 *                ###USERNAME###    The current user's username.
-			 *                ###ADMIN_EMAIL### The admin email in case this was unexpected.
-			 *                ###EMAIL###       The old email.
-			 *                ###SITENAME###    The name of the site.
-			 *                ###SITEURL###     The URL to the site.
+			 *                - ###USERNAME###    The current user's username.
+			 *                - ###ADMIN_EMAIL### The admin email in case this was unexpected.
+			 *                - ###EMAIL###       The old email.
+			 *                - ###SITENAME###    The name of the site.
+			 *                - ###SITEURL###     The URL to the site.
 			 *            @type string $headers Headers.
 			 *        }
 			 * @param array $user The original user array.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 88fe7f79d8..b438da750e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta2-33244';
+$wp_version = '4.3-beta2-33245';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.