From a9093dd3763df6b2045a08b0520f248bda708723 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Wed, 6 Nov 2013 00:35:20 -0300
Subject: [PATCH] Fixed #21387 -- Merge two very similar help texts.

---
 django/contrib/auth/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
index 18757f9e620..5b89fe845c2 100644
--- a/django/contrib/auth/models.py
+++ b/django/contrib/auth/models.py
@@ -358,8 +358,8 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
     Username, password and email are required. Other fields are optional.
     """
     username = models.CharField(_('username'), max_length=30, unique=True,
-        help_text=_('Required. 30 characters or fewer. Letters, numbers and '
-                    '@/./+/-/_ characters'),
+        help_text=_('Required. 30 characters or fewer. Letters, digits and '
+                    '@/./+/-/_ only.'),
         validators=[
             validators.RegexValidator(r'^[\w.@+-]+$', _('Enter a valid username.'), 'invalid')
         ])