summaryrefslogtreecommitdiff
path: root/docs/authentication.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/authentication.txt')
-rw-r--r--docs/authentication.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/authentication.txt b/docs/authentication.txt
index cd76731bc4..acd378fcab 100644
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@@ -517,7 +517,7 @@ It's your responsibility to provide the login form in a template called
template context variables:
* ``form``: A ``Form`` object representing the login form. See the
- `newforms documentation`_ for more on ``Form`` objects.
+ `forms documentation`_ for more on ``FormWrapper`` 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
@@ -557,7 +557,7 @@ block::
{% endblock %}
-.. _newforms documentation: ../newforms/
+.. _forms documentation: ../forms/
.. _site framework docs: ../sites/
Other built-in views
@@ -631,7 +631,7 @@ The page shown after a user has changed their password.
**Description:**
Allows a user to reset their password, and sends them the new password
-in an email.
+in an e-mail.
**Optional arguments:**
@@ -640,7 +640,7 @@ in an email.
``registration/password_reset_form.html`` if not supplied.
* ``email_template_name``: The full name of a template to use for
- generating the email with the new password. This will default to
+ generating the e-mail with the new password. This will default to
``registration/password_reset_email.html`` if not supplied.
**Template context:**
@@ -696,7 +696,7 @@ system provides several built-in forms:
user to change their password.
* ``django.contrib.auth.forms.PasswordResetForm``: A form for resetting a
- user's password and emailing the new password to them.
+ user's password and e-mailing the new password to them.
* ``django.contrib.auth.forms.UserCreationForm``: A form for creating a
new user.