From 6af6bb95110aad0f81841102e27df7fb8f9b31e3 Mon Sep 17 00:00:00 2001 From: Michael B. Trausch Date: Sat, 25 Feb 2012 14:56:40 -0500 Subject: [PATCH 1/2] fixed #17764 -- bring docs up-to-date with authentication package --- docs/topics/auth.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index 3b6ad1b..a792069 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -760,10 +760,10 @@ Django provides two functions in :mod:`django.contrib.auth`: Manually managing a user's password ----------------------------------- -.. currentmodule:: django.contrib.auth.utils +.. currentmodule:: django.contrib.auth.hashers .. versionadded:: 1.4 - The :mod:`django.contrib.auth.utils` module provides a set of functions + The :mod:`django.contrib.auth.hashers` module provides a set of functions to create and validate hashed password. You can use them independently from the ``User`` model. @@ -771,7 +771,7 @@ Manually managing a user's password If you'd like to manually authenticate a user by comparing a plain-text password to the hashed password in the database, use the convenience - function :func:`django.contrib.auth.utils.check_password`. It takes two + function :func:`django.contrib.auth.hashers.check_password`. It takes two arguments: the plain-text password to check, and the full value of a user's ``password`` field in the database to check against, and returns ``True`` if they match, ``False`` otherwise. @@ -785,14 +785,14 @@ Manually managing a user's password Currently supported algorithms are: ``'sha1'``, ``'md5'`` and ``'crypt'`` if you have the ``crypt`` library installed. If the second argument is ``None``, an unusable password is returned (a one that will be never - accepted by :func:`django.contrib.auth.utils.check_password`). + accepted by :func:`django.contrib.auth.hashers.check_password`). .. function:: is_password_usable() .. versionadded:: 1.4 Checks if the given string is a hashed password that has a chance - of being verified against :func:`django.contrib.auth.utils.check_password`. + of being verified against :func:`django.contrib.auth.hashers.check_password`. How to log a user out -- 1.7.3.4