    <django.contrib.admin.ModelAdmin.fields>`.
  
  Backwards incompatible changes in 1.7
  =====================================
  
  .. warning::
  
      In addition to the changes outlined in this section, be sure to review the
 
</s> remove .. function:: password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email, current_app, extra_context])
 </s> add .. function:: password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email, current_app, extra_context, html_email_template_name])
* :func:`django.contrib.auth.views.password_reset` takes an optional
  ``html_email_template_name`` parameter used to send a multipart HTML email
  for password resets.

    <django.contrib.admin.ModelAdmin.fields>`.
  
* :func:`django.contrib.auth.views.password_reset` takes an optional
  ``html_email_template_name`` parameter used to send a multipart HTML email
  for password resets.

  Backwards incompatible changes in 1.7
  =====================================
  
  .. warning::
  
      In addition to the changes outlined in this section, be sure to review the
keep add keep keep keep keep keep keep
 Fixed #20832 -- Enabled HTML password reset email

Added optional html_email_template_name parameter to password_reset view
and PasswordResetForm. 
docs/releases/1.7.txt