summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.2.txt7
-rw-r--r--docs/topics/auth.txt3
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 703ded3437..38df3b120c 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -742,3 +742,10 @@ views in your :ref:`URLconf <topics-http-urls>`. This means that you can
maintain complete control over the URL structure of your feeds. Like any other view, feeds views are passed a ``request`` object, so you can
do anything you would normally do with a view, like user based access control,
or making a feed a named URL.
+
+Relaxed requirements for usernames
+----------------------------------
+
+The built-in :class:`~django.contrib.auth.models.User` model's
+:attr:`~django.contrib.auth.models.User.username` field now allows a wider range
+of characters, including ``@``, ``+``, ``.`` and ``-`` characters.
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 1c52ab674e..0ff2ee6f5e 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -71,6 +71,9 @@ Fields
Required. 30 characters or fewer. Alphanumeric characters only
(letters, digits and underscores).
+
+ .. versionchanged:: 1.2
+ Usernames may now contain ``@``, ``+``, ``.`` and ``-`` characters.
.. attribute:: models.User.first_name