From 19bcadf2a6974680ba032ae4e8224fc43b216167 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 16 Sep 2015 11:46:25 +0000
Subject: [PATCH] Reset Password: Move `<div>` out of `<p>` in `wp-login.php`.

Props ldinclaux.
Fixes #33892.
Built from https://develop.svn.wordpress.org/trunk@34232


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

diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0d6ced5b61..3f78a129cc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34231';
+$wp_version = '4.4-alpha-34232';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-login.php b/wp-login.php
index 9167bf8ef9..e267928eeb 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -653,16 +653,18 @@ case 'rp' :
 	<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
 	<p class="user-pass1-wrap">
-		<label for="pass1"><?php _e('New password') ?></label><br />
-		<div class="wp-pwd">
-			<span class="password-input-wrapper">
-				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-			</span>
-			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
-		</div>
+		<label for="pass1"><?php _e( 'New password' ) ?></label>
 	</p>
+
+	<div class="wp-pwd">
+		<span class="password-input-wrapper">
+			<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+		</span>
+		<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+	</div>
+
 	<p class="user-pass2-wrap">
-		<label for="pass2"><?php _e('Confirm new password') ?></label><br />
+		<label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br />
 		<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
 	</p>