summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2007-09-20 07:13:32 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2007-09-20 07:13:32 +0000
commitbf6effdfafc06e03f285e24c7fb9c44e2798b096 (patch)
tree32da9d2b67d451d97ca6527f76c4a41b2fb6d9da
parent04a110836d5949aadbb7809264ecc60e7051ee98 (diff)
Fixed #5148 -- Added link to `DEFAULT_FROM_EMAIL` setting in email documentation. Thanks, mcroydon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/email.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/email.txt b/docs/email.txt
index 17c2b2115a..bad4057f6e 100644
--- a/docs/email.txt
+++ b/docs/email.txt
@@ -225,7 +225,7 @@ optional and can be set at any time prior to calling the ``send()`` method.
* ``from_email``: The sender's address. Both ``fred@example.com`` and
``Fred <fred@example.com>`` forms are legal. If omitted, the
- ``DEFAULT_FROM_EMAIL`` setting is used.
+ `DEFAULT_FROM_EMAIL`_ setting is used.
* ``to``: A list or tuple of recipient addresses.
@@ -297,6 +297,8 @@ The class has the following methods:
message.attach_file('/images/weather_map.png')
+.. _DEFAULT_FROM_EMAIL: ../settings/#default-from-email
+
Sending alternative content types
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~