diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-03-31 12:12:12 +0000 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-03-31 12:12:12 +0000 |
| commit | 13822974dd063a094d46e4c928fb331a738e1d0b (patch) | |
| tree | 6f82fe4880a0799f4c21e56c54b9e43462f55cb9 /docs | |
| parent | 35124ae3e22e590f0fd33cac75fc5ba92c0580e9 (diff) | |
[1.4.X] Removed documentation for SMTPConnection, which was removed at r15978. Backport of r17837 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/email.txt | 26 | ||||
| -rw-r--r-- | docs/topics/testing.txt | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/docs/topics/email.txt b/docs/topics/email.txt index 6bc30874ae..0c5f1adf8d 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -423,17 +423,6 @@ want to specify it explicitly, put the following in your settings:: EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -.. admonition:: SMTPConnection objects - - Prior to version 1.2, Django provided a - :class:`~django.core.mail.SMTPConnection` class. This class provided a way - to directly control the use of SMTP to send email. This class has been - deprecated in favor of the generic email backend API. - - For backwards compatibility :class:`~django.core.mail.SMTPConnection` is - still available in ``django.core.mail`` as an alias for the SMTP backend. - New code should use :meth:`~django.core.mail.get_connection` instead. - .. _topic-email-console-backend: Console backend @@ -607,18 +596,3 @@ the email body. You then only need to set the :setting:`EMAIL_HOST` and For a more detailed discussion of testing and processing of emails locally, see the Python documentation for the :mod:`smtpd` module. - -SMTPConnection -============== - -.. class:: SMTPConnection - -.. deprecated:: 1.2 - -The ``SMTPConnection`` class has been deprecated in favor of the generic email -backend API. - -For backwards compatibility ``SMTPConnection`` is still available in -``django.core.mail`` as an alias for the :ref:`SMTP backend -<topic-email-smtp-backend>`. New code should use -:meth:`~django.core.mail.get_connection` instead. diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index 829e059181..2d834d31bd 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -2168,7 +2168,7 @@ utility methods in the ``django.test.utils`` module. Performs any global pre-test setup, such as the installing the instrumentation of the template rendering system and setting up - the dummy ``SMTPConnection``. + the dummy email outbox. .. function:: teardown_test_environment() |