From 714fdbaa7048c2321f6238d9421137c33d9af7cc Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 11 Feb 2017 13:39:35 -0500
Subject: [PATCH] [1.10.x] Refs #27807 -- Removed docs for
 User.username_validator.

The new override functionality claimed in refs #21379 doesn't work.
---
 docs/ref/contrib/auth.txt | 24 +-----------------------
 docs/releases/1.10.txt    |  9 ++++-----
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt
index d68c062b68..5972e637f2 100644
--- a/docs/ref/contrib/auth.txt
+++ b/docs/ref/contrib/auth.txt
@@ -38,8 +38,7 @@ Fields
             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`.
+            on Python 2.
 
         .. versionchanged:: 1.10
 
@@ -155,27 +154,6 @@ Attributes
             In older versions, this was a method. Backwards-compatibility
             support for using it as a method will be removed in Django 2.0.
 
-    .. attribute:: username_validator
-
-        .. versionadded:: 1.10
-
-        Points to a validator instance used to validate usernames. Defaults to
-        :class:`validators.UnicodeUsernameValidator` on Python 3 and
-        :class:`validators.ASCIIUsernameValidator` on Python 2.
-
-        To change the default username validator, you can subclass the ``User``
-        model and set this attribute to a different validator instance. For
-        example, to use ASCII usernames on Python 3::
-
-            from django.contrib.auth.models import User
-            from django.contrib.auth.validators import ASCIIUsernameValidator
-
-            class CustomUser(User):
-                username_validator = ASCIIUsernameValidator()
-
-                class Meta:
-                    proxy = True  # If no new field is added.
-
 Methods
 -------
 
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index adca25e0ac..267640f99c 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -60,12 +60,11 @@ deliberate choice, Unicode characters have always been accepted when using
 Python 3.
 
 The username validator now explicitly accepts Unicode letters 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
+default on Python 3 only.
+
+Custom user models may use the new
 :class:`~django.contrib.auth.validators.ASCIIUsernameValidator` or
-:class:`~django.contrib.auth.validators.UnicodeUsernameValidator`. Custom user
-models may also use those validators.
+:class:`~django.contrib.auth.validators.UnicodeUsernameValidator`.
 
 Minor features
 --------------