summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-03-13 19:23:52 +0000
committerClaude Paroz <claude@2xlibre.net>2012-03-13 19:23:52 +0000
commit3dc946e49e479f1f7d783dd8915e5ad81d145ef7 (patch)
tree26b9a605777ca9de9fa50b4855d61d00afa5557e /docs
parent78638a9a5180eb373df0d4430a2169bd49fa9e42 (diff)
Fixed #17236 -- Clarified that anonymous session data are retained after login. Thanks krzysiumed for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/auth.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index cc1e34bb6f..528c7c8718 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -727,6 +727,9 @@ Django provides two functions in :mod:`django.contrib.auth`:
using Django's session framework, so, as mentioned above, you'll need to
make sure to have the session middleware installed.
+ Note that data set during the anonymous session is retained when the user
+ logs in.
+
This example shows how you might use both
:func:`~django.contrib.auth.authenticate()` and
:func:`~django.contrib.auth.login()`::