Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.4.X] Removed documentation for SMTPConnection, which was removed a…

…t 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
  • Loading branch information...
commit 13822974dd063a094d46e4c928fb331a738e1d0b 1 parent 35124ae
@aaugustin aaugustin authored
Showing with 1 addition and 27 deletions.
  1. +0 −26 docs/topics/email.txt
  2. +1 −1  docs/topics/testing.txt
View
26 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.
View
2  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()
Please sign in to comment.
Something went wrong with that request. Please try again.