From 3d35d8bc5df74ba11e4588c767f4b94d6b5e0de0 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 28 Oct 2014 18:31:19 +0000
Subject: [PATCH] Add a missing Oxford comma to the install screen. Fixes
 #30107. Props Ankit K Gupta.

git-svn-id: https://develop.svn.wordpress.org/trunk@30054 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 65d1932b46..d869f2a2aa 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -118,7 +118,7 @@ function display_setup_form( $error = null ) {
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
 				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
-				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
+				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
 			<?php
 			} ?>
 			</td>