From 05965d87e4d33cd67fa16a2e70e0ef421c195768 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <mark@wordpress.org>
Date: Wed, 29 Jul 2015 19:04:25 +0000
Subject: [PATCH] Make the multisite new user messages reflect that reset links
 are sent, not passwords.

fixes #33175
Built from https://develop.svn.wordpress.org/trunk@33494


git-svn-id: http://core.svn.wordpress.org/trunk@33461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-users.php | 2 +-
 wp-admin/network/user-new.php   | 2 +-
 wp-includes/version.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index e722b264d0..3e4fd5fe1b 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -308,7 +308,7 @@ if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use
 			</select></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
+			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
 		</tr>
 	</table>
 	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index 6a0d02cd02..ba8969788b 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -96,7 +96,7 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
+			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
 		</tr>
 	</table>
 	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2b7a826ca1..6c9f971d1e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33493';
+$wp_version = '4.3-beta4-33494';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.