diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.7.txt | 3 | ||||
| -rw-r--r-- | docs/topics/email.txt | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 6837af9a59..0097d7ca96 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -89,6 +89,9 @@ Minor features * The admin changelist cells now have a ``field-<field_name>`` class in the HTML to enable style customizations. +* The :func:`~django.core.mail.send_mail` now accepts an ``html_message`` + parameter for sending a multipart text/plain and text/html email. + Backwards incompatible changes in 1.7 ===================================== diff --git a/docs/topics/email.txt b/docs/topics/email.txt index 8bf501c62a..ab3626f700 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -38,7 +38,7 @@ a secure connection is used. send_mail() =========== -.. function:: send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None, connection=None) +.. function:: send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None, connection=None, html_message=None) The simplest way to send email is using ``django.core.mail.send_mail()``. @@ -66,6 +66,13 @@ are required. If unspecified, an instance of the default backend will be used. See the documentation on :ref:`Email backends <topic-email-backends>` for more details. +* ``html_message``: If ``html_message`` is provided, the resulting email will be a + :mimetype:`multipart/alternative` email with ``message`` as the + :mimetype:`text/plain` content type and ``html_message`` as the + :mimetype:`text/html` content type. + +.. versionadded:: 1.7 +The html_message parameter was added send_mass_mail() ================ |