Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/docs/authentication.txt

    r7979 r8215  
    518518 
    519519    * ``form``: A ``Form`` object representing the login form. See the 
    520       `newforms documentation`_ for more on ``Form`` objects. 
     520      `forms documentation`_ for more on ``FormWrapper`` objects. 
    521521    * ``next``: The URL to redirect to after successful login. This may contain 
    522522      a query string, too. 
    …… 
    558558    {% endblock %} 
    559559 
    560 .. _newforms documentation: ../newforms/ 
     560.. _forms documentation: ../forms/ 
    561561.. _site framework docs: ../sites/ 
    562562 
    …… 
    632632 
    633633Allows a user to reset their password, and sends them the new password 
    634 in an email. 
     634in an e-mail. 
    635635 
    636636**Optional arguments:** 
    …… 
    641641 
    642642    * ``email_template_name``: The full name of a template to use for 
    643       generating the email with the new password. This will default to 
     643      generating the e-mail with the new password. This will default to 
    644644      ``registration/password_reset_email.html`` if not supplied. 
    645645 
    …… 
    697697 
    698698    * ``django.contrib.auth.forms.PasswordResetForm``: A form for resetting a 
    699       user's password and emailing the new password to them. 
     699      user's password and e-mailing the new password to them. 
    700700 
    701701    * ``django.contrib.auth.forms.UserCreationForm``: A form for creating a