Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[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
Aymeric Augustin authored March 31, 2012
26  docs/topics/email.txt
@@ -423,17 +423,6 @@ want to specify it explicitly, put the following in your settings::
423 423
 
424 424
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
425 425
 
426  
-.. admonition:: SMTPConnection objects
427  
-
428  
-    Prior to version 1.2, Django provided a
429  
-    :class:`~django.core.mail.SMTPConnection` class. This class provided a way
430  
-    to directly control the use of SMTP to send email. This class has been
431  
-    deprecated in favor of the generic email backend API.
432  
-
433  
-    For backwards compatibility :class:`~django.core.mail.SMTPConnection` is
434  
-    still available in ``django.core.mail`` as an alias for the SMTP backend.
435  
-    New code should use :meth:`~django.core.mail.get_connection` instead.
436  
-
437 426
 .. _topic-email-console-backend:
438 427
 
439 428
 Console backend
@@ -607,18 +596,3 @@ the email body. You then only need to set the :setting:`EMAIL_HOST` and
607 596
 
608 597
 For a more detailed discussion of testing and processing of emails locally,
609 598
 see the Python documentation for the :mod:`smtpd` module.
610  
-
611  
-SMTPConnection
612  
-==============
613  
-
614  
-.. class:: SMTPConnection
615  
-
616  
-.. deprecated:: 1.2
617  
-
618  
-The ``SMTPConnection`` class has been deprecated in favor of the generic email
619  
-backend API.
620  
-
621  
-For backwards compatibility ``SMTPConnection`` is still available in
622  
-``django.core.mail`` as an alias for the :ref:`SMTP backend
623  
-<topic-email-smtp-backend>`. New code should use
624  
-:meth:`~django.core.mail.get_connection` instead.
2  docs/topics/testing.txt
@@ -2168,7 +2168,7 @@ utility methods in the ``django.test.utils`` module.
2168 2168
 
2169 2169
     Performs any global pre-test setup, such as the installing the
2170 2170
     instrumentation of the template rendering system and setting up
2171  
-    the dummy ``SMTPConnection``.
  2171
+    the dummy email outbox.
2172 2172
 
2173 2173
 .. function:: teardown_test_environment()
2174 2174
 

0 notes on commit 1382297

Please sign in to comment.
Something went wrong with that request. Please try again.