From cb802a2b7e80654764163da4e1acbf210c13a085 Mon Sep 17 00:00:00 2001 From: medmunds Date: Sat, 19 Oct 2013 13:32:09 -0700 Subject: [PATCH] Docs: note added in 0.7 for new send options. --- docs/usage/sending_mail.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/usage/sending_mail.rst b/docs/usage/sending_mail.rst index cf7d157..50a3d21 100644 --- a/docs/usage/sending_mail.rst +++ b/docs/usage/sending_mail.rst @@ -115,6 +115,8 @@ Most of the options from the Mandrill ``Boolean``: whether Mandrill should send this message ahead of non-important ones. + .. versionadded:: 0.7 + .. attribute:: track_opens ``Boolean``: whether Mandrill should enable open-tracking for this message. @@ -164,6 +166,8 @@ Most of the options from the Mandrill ``Boolean``: set False on sensitive messages to instruct Mandrill not to log the content. + .. versionadded:: 0.7 + .. attribute:: tracking_domain ``str``: domain Mandrill should use to rewrite tracked links and host tracking pixels @@ -180,6 +184,8 @@ Most of the options from the Mandrill ``str``: domain Mandrill should use for the message's return-path. + .. versionadded:: 0.7 + .. attribute:: global_merge_vars ``dict``: merge variables to use for all recipients (most useful with :ref:`mandrill-templates`). :: @@ -209,6 +215,8 @@ Most of the options from the Mandrill ``str``: the ID of one of your subaccounts to use for sending this message. + .. versionadded:: 0.7 + .. attribute:: google_analytics_domains ``list`` of ``str``: domain names for links where Mandrill should add Google Analytics @@ -239,16 +247,22 @@ Most of the options from the Mandrill ``Boolean``: whether Mandrill should use an async mode optimized for bulk sending. + .. versionadded:: 0.7 + .. attribute:: ip_pool ``str``: name of one of your Mandrill dedicated IP pools to use for sending this message. + .. versionadded:: 0.7 + .. attribute:: send_at ``datetime`` or ``date`` or ``str``: instructs Mandrill to delay sending this message until the specified time. (Djrill allows timezone-aware Python datetimes, and converts them to UTC for Mandrill. Timezone-naive datetimes are assumed to be UTC.) + .. versionadded:: 0.7 + These Mandrill-specific properties work with *any* :class:`~django.core.mail.EmailMessage`-derived object, so you can use them with