Subaccounts: Document setting; verify message option overrides global setting

This commit is contained in:
medmunds
2014-04-20 12:57:08 -07:00
parent 7e928dcaba
commit ba2302ae56
4 changed files with 37 additions and 0 deletions

View File

@@ -15,6 +15,8 @@ library from Kenneth Reitz.
Configuration
-------------
.. setting:: MANDRILL_API_KEY
In your project's :file:`settings.py`:
1. Add :mod:`djrill` to your :setting:`INSTALLED_APPS`::
@@ -40,6 +42,26 @@ Djrill includes optional support for Mandrill webhooks, including inbound email.
See the Djrill :ref:`webhooks <webhooks>` section for configuration details.
Mandrill Subaccounts (Optional)
-------------------------------
.. setting:: MANDRILL_SUBACCOUNT
If you are using Mandrill's `subaccounts`_ feature, you can globally set the
subaccount for all messages sent through Djrill::
MANDRILL_SUBACCOUNT = "client-347"
(You can also set or override the :attr:`subaccount` on each individual message,
with :ref:`Mandrill-specific sending options <mandrill-send-support>`.)
.. versionadded:: 1.0
MANDRILL_SUBACCOUNT global setting
.. _subaccounts: http://help.mandrill.com/entries/25523278-What-are-subaccounts-
Admin (Optional)
----------------