Loading docs/api_stability.txt +2 −2 Original line number Diff line number Diff line Loading @@ -59,7 +59,7 @@ These APIs are stable: - `Request/response objects`_. - `Sending email`_. - `Sending e-mail`_. - `Sessions`_. Loading Loading @@ -108,7 +108,7 @@ change: .. _mod_python integration: ../modpython/ .. _redirects: ../redirects/ .. _request/response objects: ../request_response/ .. _sending email: ../email/ .. _sending e-mail: ../email/ .. _sessions: ../sessions/ .. _settings: ../settings/ .. _syndication: ../syndication_feeds/ Loading docs/authentication.txt +3 −3 Original line number Diff line number Diff line Loading @@ -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:** Loading @@ -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:** Loading Loading @@ -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. Loading docs/csrf.txt +5 −5 Original line number Diff line number Diff line Loading @@ -4,8 +4,8 @@ Cross Site Request Forgery protection The CsrfMiddleware class provides easy-to-use protection against `Cross Site Request Forgeries`_. This type of attack occurs when a malicious web site creates a link or form button that is intended to perform some action on your web site, using the credentials of a logged-in user who is tricked Web site creates a link or form button that is intended to perform some action on your Web site, using the credentials of a logged-in user who is tricked into clicking on the link in their browser. The first defense against CSRF attacks is to ensure that GET requests Loading Loading @@ -38,7 +38,7 @@ CsrfMiddleware does two things: checks that the 'csrfmiddlewaretoken' is present and correct. If it isn't, the user will get a 403 error. This ensures that only forms that have originated from your web site This ensures that only forms that have originated from your Web site can be used to POST data back. It deliberately only targets HTTP POST requests (and the corresponding POST Loading @@ -47,7 +47,7 @@ effects (see `9.1.1 Safe Methods, HTTP 1.1, RFC 2616`_), and so a CSRF attack with a GET request ought to be harmless. POST requests that are not accompanied by a session cookie are not protected, but they do not need to be protected, since the 'attacking' web site but they do not need to be protected, since the 'attacking' Web site could make these kind of requests anyway. The Content-Type is checked before modifying the response, and only Loading docs/db-api.txt +1 −1 Original line number Diff line number Diff line Loading @@ -463,7 +463,7 @@ Be careful, if you are using ``extra()`` to add custom handling to your may or may not make sense. If you are using custom SQL fragments in your ``extra()`` calls, Django will not inspect these fragments to see if they need to be rewritten because of changes in the merged query. So test the effects carefully. Also realise that if you are combining two ``QuerySets`` with carefully. Also realize that if you are combining two ``QuerySets`` with ``|``, you cannot use ``extra(select=...)`` or ``extra(where=...)`` on *both* ``QuerySets``. You can only use those calls on one or the other (Django will raise a ``ValueError`` if you try to use this incorrectly). Loading docs/django-admin.txt +1 −1 Original line number Diff line number Diff line Loading @@ -395,7 +395,7 @@ makemessages Runs over the entire source tree of the current directory and pulls out all strings marked for translation. It creates (or updates) a message file in the conf/locale (in the django tree) or locale (for project and application) conf/locale (in the Django tree) or locale (for project and application) directory. After making changes to the messages files you need to compile them with ``compilemessages`` for use with the builtin gettext support. See the `i18n documentation`_ for details. Loading Loading
docs/api_stability.txt +2 −2 Original line number Diff line number Diff line Loading @@ -59,7 +59,7 @@ These APIs are stable: - `Request/response objects`_. - `Sending email`_. - `Sending e-mail`_. - `Sessions`_. Loading Loading @@ -108,7 +108,7 @@ change: .. _mod_python integration: ../modpython/ .. _redirects: ../redirects/ .. _request/response objects: ../request_response/ .. _sending email: ../email/ .. _sending e-mail: ../email/ .. _sessions: ../sessions/ .. _settings: ../settings/ .. _syndication: ../syndication_feeds/ Loading
docs/authentication.txt +3 −3 Original line number Diff line number Diff line Loading @@ -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:** Loading @@ -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:** Loading Loading @@ -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. Loading
docs/csrf.txt +5 −5 Original line number Diff line number Diff line Loading @@ -4,8 +4,8 @@ Cross Site Request Forgery protection The CsrfMiddleware class provides easy-to-use protection against `Cross Site Request Forgeries`_. This type of attack occurs when a malicious web site creates a link or form button that is intended to perform some action on your web site, using the credentials of a logged-in user who is tricked Web site creates a link or form button that is intended to perform some action on your Web site, using the credentials of a logged-in user who is tricked into clicking on the link in their browser. The first defense against CSRF attacks is to ensure that GET requests Loading Loading @@ -38,7 +38,7 @@ CsrfMiddleware does two things: checks that the 'csrfmiddlewaretoken' is present and correct. If it isn't, the user will get a 403 error. This ensures that only forms that have originated from your web site This ensures that only forms that have originated from your Web site can be used to POST data back. It deliberately only targets HTTP POST requests (and the corresponding POST Loading @@ -47,7 +47,7 @@ effects (see `9.1.1 Safe Methods, HTTP 1.1, RFC 2616`_), and so a CSRF attack with a GET request ought to be harmless. POST requests that are not accompanied by a session cookie are not protected, but they do not need to be protected, since the 'attacking' web site but they do not need to be protected, since the 'attacking' Web site could make these kind of requests anyway. The Content-Type is checked before modifying the response, and only Loading
docs/db-api.txt +1 −1 Original line number Diff line number Diff line Loading @@ -463,7 +463,7 @@ Be careful, if you are using ``extra()`` to add custom handling to your may or may not make sense. If you are using custom SQL fragments in your ``extra()`` calls, Django will not inspect these fragments to see if they need to be rewritten because of changes in the merged query. So test the effects carefully. Also realise that if you are combining two ``QuerySets`` with carefully. Also realize that if you are combining two ``QuerySets`` with ``|``, you cannot use ``extra(select=...)`` or ``extra(where=...)`` on *both* ``QuerySets``. You can only use those calls on one or the other (Django will raise a ``ValueError`` if you try to use this incorrectly). Loading
docs/django-admin.txt +1 −1 Original line number Diff line number Diff line Loading @@ -395,7 +395,7 @@ makemessages Runs over the entire source tree of the current directory and pulls out all strings marked for translation. It creates (or updates) a message file in the conf/locale (in the django tree) or locale (for project and application) conf/locale (in the Django tree) or locale (for project and application) directory. After making changes to the messages files you need to compile them with ``compilemessages`` for use with the builtin gettext support. See the `i18n documentation`_ for details. Loading