Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Added small bits to docs/email.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit de72616ac09b1d3b1da32e53ea02809e9bde5428 1 parent 0891e7b
Adrian Holovaty authored December 27, 2005

Showing 1 changed file with 6 additions and 0 deletions. Show diff stats Hide diff stats

  1. 6  docs/email.txt
6  docs/email.txt
@@ -80,14 +80,20 @@ site admins, as defined in the `ADMINS setting`_. Here's the definition::
80 80
 ``mail_admins()`` prefixes the subject with the value of the
81 81
 `EMAIL_SUBJECT_PREFIX setting`_, which is ``"[Django] "`` by default.
82 82
 
  83
+The "From:" header of the e-mail will be the value of the `SERVER_EMAIL setting`_.
  84
+
83 85
 .. _ADMINS setting: http://www.djangoproject.com/documentation/settings/#admins
84 86
 .. _EMAIL_SUBJECT_PREFIX setting: http://www.djangoproject.com/documentation/settings/#email-subject-prefix
  87
+.. _SERVER_EMAIL setting: http://www.djangoproject.com/documentation/settings/#server-email
85 88
 
86 89
 The mail_managers function
87 90
 ==========================
88 91
 
89 92
 ``django.core.mail.mail_managers`` is just like ``mail_admins``, except it
90 93
 sends an e-mail to the site managers, as defined in the `MANAGERS setting`_.
  94
+Here's the definition::
  95
+
  96
+    mail_managers(subject, message, fail_silently=False)
91 97
 
92 98
 .. _MANAGERS setting: http://www.djangoproject.com/documentation/settings/#managers
93 99
 

0 notes on commit de72616

Please sign in to comment.
Something went wrong with that request. Please try again.