summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-03 17:52:38 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-03 17:52:38 +0000
commite986e8aba4d301c2be2b3a2607ee57e7de2fb494 (patch)
treeb1545466035c66eb7a21c52f5011803274693e07
parent5ff1d96a523f681b15f679ba771d6c3e2e8e8c49 (diff)
Added "new in development version" markers to new email stuff.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/email.txt2
-rw-r--r--docs/settings.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/email.txt b/docs/email.txt
index 0196b50679..2793ee8ae3 100644
--- a/docs/email.txt
+++ b/docs/email.txt
@@ -189,6 +189,8 @@ from the request's POST data, sends that to admin@example.com and redirects to
The EmailMessage and SMTPConnection classes
===========================================
+**New in Django development version**
+
Django's ``send_mail()`` and ``send_mass_mail()`` functions are actually thin
wrappers that make use of the ``EmailMessage`` and ``SMTPConnection`` classes
in ``django.mail``. If you ever need to customize the way Django sends email,
diff --git a/docs/settings.txt b/docs/settings.txt
index 58d590f7c2..72c6e4ce54 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -431,6 +431,8 @@ trailing space.
EMAIL_USE_TLS
-------------
+**New in Django development version**
+
Default: ``False``
Whether to use a TLS (secure) connection when talking to the SMTP server.