summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-30 08:06:49 -0400
committerTim Graham <timograham@gmail.com>2013-07-30 08:06:49 -0400
commitd4dd55e78ccc8d38de750313f75d6921137e71ab (patch)
tree640cc0cd5084ffa3d9ad060bc281be4977ce9dbd
parent53e9ab72e92f4fc8a11f95713ae16e217baf963a (diff)
Doc tweaks for html_message parameter to send_mail(); refs #20817
-rw-r--r--docs/releases/1.7.txt4
-rw-r--r--docs/topics/email.txt3
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index e104159443..8d863c849a 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -89,8 +89,8 @@ 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.
+* :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 ab3626f700..c007c2b856 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -72,7 +72,8 @@ are required.
:mimetype:`text/html` content type.
.. versionadded:: 1.7
-The html_message parameter was added
+
+ The ``html_message`` parameter was added.
send_mass_mail()
================