summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-28 09:44:08 -0400
committerTim Graham <timograham@gmail.com>2015-07-28 09:45:55 -0400
commitfc279ed29841c3bdabe99b45881373e42187d82a (patch)
treea2da1238d36f0ff0db728aa677aee0636c89539a /docs
parenta66d843eecca9f308fb5b4505546d28d7237757b (diff)
[1.8.x] Fixed #25178 -- Added DEFAULT_FROM_EMAIL to deployment checklist.
Backport of ae32f324981dd64d7c04fcbed9d99356914a61de from master
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/deployment/checklist.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt
index b6b0683d08..60047e9af7 100644
--- a/docs/howto/deployment/checklist.txt
+++ b/docs/howto/deployment/checklist.txt
@@ -131,9 +131,10 @@ If you haven't set up backups for your database, do it right now!
If your site sends emails, these values need to be set correctly.
-By default, Django will send email from root@localhost. However, some mail
-providers reject all email from this address. To use a different sender
-address, modify the :setting:`SERVER_EMAIL` setting.
+By default, Django sends email from webmaster@localhost and root@localhost.
+However, some mail providers reject email from these addresses. To use
+different sender addresses, modify the :setting:`DEFAULT_FROM_EMAIL` and
+:setting:`SERVER_EMAIL` settings.
:setting:`STATIC_ROOT` and :setting:`STATIC_URL`
------------------------------------------------