diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2011-04-01 16:18:23 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2011-04-01 16:18:23 +0000 |
| commit | 9a279edc1cedecc65249b061bcb2797fe509a85b (patch) | |
| tree | 3f89e20c2dc9eeda748732c008fe8c631903a574 /docs/topics | |
| parent | 94af19c43fad3e42d64981e22fe15b844f1f9eb6 (diff) | |
Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/email.txt | 16 | ||||
| -rw-r--r-- | docs/topics/testing.txt | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/topics/email.txt b/docs/topics/email.txt index 65c5c7daef..bbb2c1f431 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -1,6 +1,6 @@ -============== +============= Sending email -============== +============= .. module:: django.core.mail :synopsis: Helpers to easily send email. @@ -364,8 +364,8 @@ subtype. For example:: .. _topic-email-backends: -E-Mail Backends -=============== +Email backends +============== .. versionadded:: 1.2 @@ -384,7 +384,7 @@ The email backend class has the following methods: left open after mail has been sent. Obtaining an instance of an email backend ------------------------------------------- +----------------------------------------- The :meth:`get_connection` function in ``django.core.mail`` returns an instance of the email backend that you can use. @@ -506,7 +506,7 @@ convenience that can be used during development. .. _topic-custom-email-backend: Defining a custom email backend --------------------------------- +------------------------------- If you need to change how emails are sent you can write your own email backend. The ``EMAIL_BACKEND`` setting in your settings file is then the @@ -524,7 +524,7 @@ implementation. .. _topics-sending-multiple-emails: Sending multiple emails ------------------------- +----------------------- Establishing and closing an SMTP connection (or any other network connection, for that matter) is an expensive process. If you have a lot of emails to send, @@ -580,7 +580,7 @@ manually open the connection, you can control when it is closed. For example:: Testing email sending -====================== +===================== There are times when you do not want Django to send emails at all. For example, while developing a Web site, you probably don't want diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index 67e1cf2a1c..64e4707350 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -1464,7 +1464,7 @@ cause of an failure in your test suite. .. _topics-testing-email: Email services ---------------- +-------------- If any of your Django views send email using :doc:`Django's email functionality </topics/email>`, you probably don't want to send email each time |