Skip to content

Commit

Permalink
[1.4.X] Removed documentation for SMTPConnection, which was removed a…
Browse files Browse the repository at this point in the history
…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
aaugustin committed Mar 31, 2012
1 parent 35124ae commit 1382297
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
26 changes: 0 additions & 26 deletions docs/topics/email.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion docs/topics/testing.txt
Expand Up @@ -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()

Expand Down

0 comments on commit 1382297

Please sign in to comment.