Browse Source

Fixed #28415 -- Clarified what characters ASCII/UnicodeUsernameValidator accept.

Tim Graham 7 years ago
parent
commit
14172cf442
2 changed files with 13 additions and 13 deletions
  1. 9 9
      docs/ref/contrib/auth.txt
  2. 4 4
      docs/releases/1.10.txt

+ 9 - 9
docs/ref/contrib/auth.txt

@@ -34,12 +34,12 @@ Fields
 
         .. admonition:: Usernames and Unicode
 
-            Django originally accepted only ASCII letters in usernames.
-            Although it wasn't a deliberate choice, Unicode characters have
-            always been accepted when using Python 3. Django 1.10 officially
-            added Unicode support in usernames, keeping the ASCII-only behavior
-            on Python 2, with the option to customize the behavior using
-            :attr:`.User.username_validator`.
+            Django originally accepted only ASCII letters and numbers in
+            usernames. Although it wasn't a deliberate choice, Unicode
+            characters have always been accepted when using Python 3. Django
+            1.10 officially added Unicode support in usernames, keeping the
+            ASCII-only behavior on Python 2, with the option to customize the
+            behavior using :attr:`.User.username_validator`.
 
     .. attribute:: first_name
 
@@ -395,12 +395,12 @@ Validators
 
 .. class:: validators.ASCIIUsernameValidator
 
-    A field validator allowing only ASCII letters, in addition to ``@``, ``.``,
-    ``+``, ``-``, and ``_``.
+    A field validator allowing only ASCII letters and numbers, in addition to
+    ``@``, ``.``, ``+``, ``-``, and ``_``.
 
 .. class:: validators.UnicodeUsernameValidator
 
-    A field validator allowing Unicode letters, in addition to ``@``, ``.``,
+    A field validator allowing Unicode characters, in addition to ``@``, ``.``,
     ``+``, ``-``, and ``_``. The default validator for ``User.username``.
 
 .. _topics-auth-signals:

+ 4 - 4
docs/releases/1.10.txt

@@ -55,11 +55,11 @@ Official support for Unicode usernames
 --------------------------------------
 
 The :class:`~django.contrib.auth.models.User` model in ``django.contrib.auth``
-originally only accepted ASCII letters in usernames. Although it wasn't a
-deliberate choice, Unicode characters have always been accepted when using
-Python 3.
+originally only accepted ASCII letters and numbers in usernames. Although it
+wasn't a deliberate choice, Unicode characters have always been accepted when
+using Python 3.
 
-The username validator now explicitly accepts Unicode letters by
+The username validator now explicitly accepts Unicode characters by
 default on Python 3 only. This default behavior can be overridden by changing
 the :attr:`~django.contrib.auth.models.User.username_validator` attribute of
 the ``User`` model, or to any proxy of that model, using either