From b3f6a0f5a1b88a9a96080531b7391f6a3a0ce5aa Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 19 Aug 2014 07:23:17 -0400
Subject: [PATCH] [1.7.x] Fixed #23314 -- Tempered recommendation of storing
 profile data on custom user.

Thanks gavinwahl for the report.

Backport of 3569536491 from master
---
 docs/topics/auth/customizing.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 0248d8048f..1e9d0ed5c9 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -447,6 +447,8 @@ different User model.
     :setting:`AUTH_USER_MODEL` setting in code that is executed at import
     time. ``get_user_model()`` only works once Django has imported all models.
 
+.. _specifying-custom-user-model:
+
 Specifying a custom User model
 ------------------------------
 
@@ -694,10 +696,12 @@ Extending Django's default User
 -------------------------------
 
 If you're entirely happy with Django's :class:`~django.contrib.auth.models.User`
-model and you just want to add some additional profile information, you can
+model and you just want to add some additional profile information, you could
 simply subclass ``django.contrib.auth.models.AbstractUser`` and add your
-custom profile fields. This class provides the full implementation of the
-default :class:`~django.contrib.auth.models.User` as an :ref:`abstract model
+custom profile fields, although we'd recommend a separate model as described in
+the "Model design considerations" note of :ref:`specifying-custom-user-model`.
+``AbstractUser`` provides the full implementation of the default
+:class:`~django.contrib.auth.models.User` as an :ref:`abstract model
 <abstract-base-classes>`.
 
 .. _custom-users-and-the-built-in-auth-forms: