Added small bits to docs/email.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1785 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 0 deletions

diff --git a/docs/email.txt b/docs/email.txt
index 412aaa919c..b7450b8a14 100644
--- a/docs/email.txt
+++ b/docs/email.txt
@@ -80,14 +80,20 @@ site admins, as defined in the `ADMINS setting`_. Here's the definition::
 ``mail_admins()`` prefixes the subject with the value of the
 `EMAIL_SUBJECT_PREFIX setting`_, which is ``"[Django] "`` by default.
 
+The "From:" header of the e-mail will be the value of the `SERVER_EMAIL setting`_.
+
 .. _ADMINS setting: http://www.djangoproject.com/documentation/settings/#admins
 .. _EMAIL_SUBJECT_PREFIX setting: http://www.djangoproject.com/documentation/settings/#email-subject-prefix
+.. _SERVER_EMAIL setting: http://www.djangoproject.com/documentation/settings/#server-email
 
 The mail_managers function
 ==========================
 
 ``django.core.mail.mail_managers`` is just like ``mail_admins``, except it
 sends an e-mail to the site managers, as defined in the `MANAGERS setting`_.
+Here's the definition::
+
+    mail_managers(subject, message, fail_silently=False)
 
 .. _MANAGERS setting: http://www.djangoproject.com/documentation/settings/#managers