From d66035c4a6629fd68a373448bf95b7818c0d72a2 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 31 Mar 2012 12:08:39 +0000 Subject: [PATCH] Removed documentation for SMTPConnection, which was removed at r15978. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17837 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/email.txt | 26 -------------------------- docs/topics/testing.txt | 2 +- 2 files changed, 1 insertion(+), 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 -`. New code should use -:meth:`~django.core.mail.get_connection` instead. diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index ad798dea2c..7287b04da4 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -2145,7 +2145,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()