瀏覽代碼

Cleaned up EmailMultiAlternatives docs.

Sarah Boyce 9 月之前
父節點
當前提交
7a0cd09f9f
共有 1 個文件被更改,包括 21 次插入23 次删除
  1. 21 23
      docs/topics/email.txt

+ 21 - 23
docs/topics/email.txt

@@ -397,11 +397,27 @@ Django's email library, you can do this using the
 
 .. class:: EmailMultiAlternatives
 
-    A subclass of :class:`~django.core.mail.EmailMessage` that allows
-    additional versions of the message body in the email via the
-    ``attach_alternative()`` method. This directly inherits all methods
-    (including the class initialization) from
-    :class:`~django.core.mail.EmailMessage`.
+    A subclass of :class:`EmailMessage` that allows additional versions of the
+    message body in the email via the :meth:`attach_alternative` method. This
+    directly inherits all methods (including the class initialization) from
+    :class:`EmailMessage`.
+
+    .. attribute:: alternatives
+
+        A list of named tuples with attributes ``(content, mimetype)``. This is
+        particularly useful in tests::
+
+            self.assertEqual(len(msg.alternatives), 1)
+            self.assertEqual(msg.alternatives[0].content, html_content)
+            self.assertEqual(msg.alternatives[0].mimetype, "text/html")
+
+        Alternatives should only be added using the :meth:`attach_alternative`
+        method.
+
+        .. versionchanged:: 5.2
+
+            In older versions, ``alternatives`` was a list of regular tuples,
+            as opposed to named tuples.
 
     .. method:: attach_alternative(content, mimetype)
 
@@ -420,24 +436,6 @@ Django's email library, you can do this using the
             msg.attach_alternative(html_content, "text/html")
             msg.send()
 
-    .. attribute:: alternatives
-
-        A list of named tuples with attributes ``(content, mimetype)``. This is
-        particularly useful in tests::
-
-            self.assertEqual(len(msg.alternatives), 1)
-            self.assertEqual(msg.alternatives[0].content, html_content)
-            self.assertEqual(msg.alternatives[0].mimetype, "text/html")
-
-        Alternatives should only be added using the
-        :meth:`~django.core.mail.EmailMultiAlternatives.attach_alternative`
-        method.
-
-        .. versionchanged:: 5.2
-
-            In older versions, ``alternatives`` was a list of regular tuples, as opposed
-            to named tuples.
-
 Updating the default content type
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~