diff options
| author | Chris Beaven <smileychris@gmail.com> | 2011-01-14 08:31:14 +0000 |
|---|---|---|
| committer | Chris Beaven <smileychris@gmail.com> | 2011-01-14 08:31:14 +0000 |
| commit | faa4a98f27085e2f6e8e741fb641b084333abdca (patch) | |
| tree | c9facfcaf92324c4c851bf40b5b3281aea73494f | |
| parent | 92d43522839fd9ec945d8c018de78770bec04ee1 (diff) | |
Change the lack of supports_inactive_user on an auth backend to a
!PendingDeprecationWarning (refs #14249), fixing some bad links in the
1.3 release docs and a typo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/auth/__init__.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.3.txt | 8 | ||||
| -rw-r--r-- | docs/topics/auth.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index 7fb6370c32..173ce1eaf0 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -33,7 +33,7 @@ def load_backend(path): if not hasattr(cls, 'supports_inactive_user'): warn("Authentication backends without a `supports_inactive_user` attribute are deprecated. Please define it in %s." % cls, - DeprecationWarning) + PendingDeprecationWarning) cls.supports_inactive_user = False return cls() diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt index e05b502450..d41dc8630c 100644 --- a/docs/releases/1.3.txt +++ b/docs/releases/1.3.txt @@ -151,7 +151,7 @@ of the template and context that was provided by the view to compute the response. The final output of the response is not computed until it is needed, later in the response process. -For more details, see the :ref:`documentation </ref/template-response>` +For more details, see the :doc:`documentation </ref/template-response>` on the :class:`~django.template.TemplateResponse` class. Caching changes @@ -172,8 +172,8 @@ prefixing <cache_key_prefixing>` and :ref:`transformation Lastly, support for pylibmc_ has been added to the memcached cache backend. -For more details, see the :ref:`documentation on -caching in Django<topics/cache>`. +For more details, see the :doc:`documentation on +caching in Django</topics/cache>`. .. _pylibmc: http://sendapatch.se/projects/pylibmc/ @@ -183,7 +183,7 @@ Permissions for inactive users If you provide a custom auth backend with ``supports_inactive_user`` set to ``True``, an inactive user model will check the backend for permissions. This is useful for further centralizing the permission handling. See the -:ref:`authentication docs <topics-auth>` for more details. +:doc:`authentication docs </topics/auth>` for more details. GeoDjango ~~~~~~~~~ diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index e5f4bdb444..84e8ae8199 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -1644,7 +1644,7 @@ Authorization for inactive users An inactive user is a one that is authenticated but has its attribute ``is_active`` set to ``False``. However this does not mean they are not -authrozied to do anything. For example they are allowed to activate their +authorized to do anything. For example they are allowed to activate their account. The support for anonymous users in the permission system allows for |