summaryrefslogtreecommitdiff
path: root/docs/authentication.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/authentication.txt')
-rw-r--r--docs/authentication.txt44
1 files changed, 22 insertions, 22 deletions
diff --git a/docs/authentication.txt b/docs/authentication.txt
index 4ec367a8b5..cd76731bc4 100644
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@@ -516,8 +516,8 @@ It's your responsibility to provide the login form in a template called
``registration/login.html`` by default. This template gets passed three
template context variables:
- * ``form``: A ``FormWrapper`` object representing the login form. See the
- `forms documentation`_ for more on ``FormWrapper`` objects.
+ * ``form``: A ``Form`` object representing the login form. See the
+ `newforms documentation`_ for more on ``Form`` objects.
* ``next``: The URL to redirect to after successful login. This may contain
a query string, too.
* ``site_name``: The name of the current ``Site``, according to the
@@ -541,14 +541,14 @@ block::
{% block content %}
- {% if form.has_errors %}
+ {% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
<form method="post" action=".">
<table>
- <tr><td><label for="id_username">Username:</label></td><td>{{ form.username }}</td></tr>
- <tr><td><label for="id_password">Password:</label></td><td>{{ form.password }}</td></tr>
+ <tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
+ <tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
</table>
<input type="submit" value="login" />
@@ -557,7 +557,7 @@ block::
{% endblock %}
-.. _forms documentation: ../forms/
+.. _newforms documentation: ../newforms/
.. _site framework docs: ../sites/
Other built-in views
@@ -677,29 +677,29 @@ successful login.
* ``login_url``: The URL of the login page to redirect to. This
will default to ``settings.LOGIN_URL`` if not supplied.
-Built-in manipulators
----------------------
+Built-in forms
+--------------
+
+**New in Django development version.**
If you don't want to use the built-in views, but want the convenience
-of not having to write manipulators for this functionality, the
-authentication system provides several built-in manipulators:
+of not having to write forms for this functionality, the authentication
+system provides several built-in forms:
- * ``django.contrib.auth.forms.AdminPasswordChangeForm``: A
- manipulator used in the admin interface to change a user's
- password.
+ * ``django.contrib.auth.forms.AdminPasswordChangeForm``: A form used in
+ the admin interface to change a user's password.
- * ``django.contrib.auth.forms.AuthenticationForm``: A manipulator
- for logging a user in.
+ * ``django.contrib.auth.forms.AuthenticationForm``: A form for logging a
+ user in.
- * ``django.contrib.auth.forms.PasswordChangeForm``: A manipulator
- for allowing a user to change their password.
+ * ``django.contrib.auth.forms.PasswordChangeForm``: A form for allowing a
+ user to change their password.
- * ``django.contrib.auth.forms.PasswordResetForm``: A manipulator
- for resetting a user's password and emailing the new password to
- them.
+ * ``django.contrib.auth.forms.PasswordResetForm``: A form for resetting a
+ user's password and emailing the new password to them.
- * ``django.contrib.auth.forms.UserCreationForm``: A manipulator
- for creating a new user.
+ * ``django.contrib.auth.forms.UserCreationForm``: A form for creating a
+ new user.
Limiting access to logged-in users that pass a test
---------------------------------------------------