diff --git a/docs/usage/sending_mail.rst b/docs/usage/sending_mail.rst index e7233fd..cc57f6e 100644 --- a/docs/usage/sending_mail.rst +++ b/docs/usage/sending_mail.rst @@ -32,10 +32,6 @@ Some notes and limitations: to `!True` if you want recipients to be able to see who else was included in the "to" list. - .. versionchanged:: 0.9 - Previously, Djrill (and Mandrill) didn't distinguish "cc" from "to", - and allowed only a single "bcc" recipient. - .. _sending-html: @@ -70,12 +66,6 @@ Some notes and limitations: (For an example, see :meth:`~DjrillBackendTests.test_embedded_images` in :file:`tests/test_mandrill_send.py`.) - .. versionadded:: 0.3 - Attachments - - .. versionchanged:: 0.4 - Special handling for embedded images - .. _message-headers: **Headers** @@ -87,11 +77,8 @@ Some notes and limitations: headers={'Reply-To': "reply@example.com", 'List-Unsubscribe': "..."} ) - .. versionchanged:: 0.9 - In earlier versions, Djrill only allowed ``Reply-To`` and ``X-*`` headers, - matching previous Mandrill API restrictions. + .. note:: - .. versionchanged:: 1.4 Djrill also supports the `reply_to` param added to :class:`~django.core.mail.EmailMessage` in Django 1.8. (If you provide *both* a 'Reply-To' header and the `reply_to` param, @@ -121,8 +108,6 @@ 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. @@ -156,8 +141,6 @@ Most of the options from the Mandrill ``Boolean``: whether Mandrill should inline CSS styles in the HTML. Default from your Mandrill account settings. - .. versionadded:: 0.4 - .. attribute:: url_strip_qs ``Boolean``: whether Mandrill should ignore any query parameters when aggregating @@ -172,8 +155,6 @@ 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 @@ -190,15 +171,11 @@ Most of the options from the Mandrill ``str``: domain Mandrill should use for the message's return-path. - .. versionadded:: 0.7 - .. attribute:: merge_language ``str``: the merge tag language if using merge tags -- e.g., "mailchimp" or "handlebars". Default from your Mandrill account settings. - .. versionadded:: 1.3 - .. attribute:: global_merge_vars ``dict``: merge variables to use for all recipients (most useful with :ref:`mandrill-templates`). :: @@ -234,8 +211,6 @@ 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 @@ -272,14 +247,10 @@ 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 @@ -315,8 +286,6 @@ Most of the options from the Mandrill Scheduled sending is a paid Mandrill feature. If you are using a free Mandrill account, :attr:`!send_at` won't work. - .. versionadded:: 0.7 - All the Mandrill-specific attributes listed above work with *any* :class:`~django.core.mail.EmailMessage`-derived object, so you can use them with @@ -361,18 +330,12 @@ For this example, msg.mandrill_response might look like this:: If an error is returned by Mandrill while sending the message then :attr:`!mandrill_response` will be set to None. -.. versionadded:: 0.8 - mandrill_response available for sent messages - .. _djrill-exceptions: Exceptions ---------- -.. versionadded:: 0.3 - Djrill-specific exceptions - .. exception:: djrill.NotSupportedByMandrillError If the email tries to use features that aren't supported by Mandrill, the send diff --git a/docs/usage/templates.rst b/docs/usage/templates.rst index 71f76b0..ddc3f39 100644 --- a/docs/usage/templates.rst +++ b/docs/usage/templates.rst @@ -6,9 +6,6 @@ Sending Template Mail Mandrill Templates ------------------ -.. versionadded:: 0.3 - Mandrill template support - To use a *Mandrill* (MailChimp) template stored in your Mandrill account, set a :attr:`template_name` and (optionally) :attr:`template_content` on your :class:`~django.core.mail.EmailMessage` object:: @@ -96,16 +93,11 @@ your :class:`~django.core.mail.EmailMessage` object:: If `True`, Djrill will omit the subject, and Mandrill will use the default subject from the template. - .. versionadded:: 1.1 - .. attribute:: use_template_from If `True`, Djrill will omit the "from" field, and Mandrill will use the default "from" from the template. - .. versionadded:: 1.1 - - .. _django-templates: diff --git a/docs/usage/webhooks.rst b/docs/usage/webhooks.rst index 3f3e94e..3e0f6bc 100644 --- a/docs/usage/webhooks.rst +++ b/docs/usage/webhooks.rst @@ -11,10 +11,6 @@ Djrill includes optional support for Mandrill's webhook notifications. If enabled, it will send a Django signal for each event in a webhook. Your code can connect to this signal for further processing. -.. versionadded:: 0.5 - Webhook support - - .. warning:: Webhook Security Webhooks are ordinary urls---they're wide open to the internet.