Django

Code

Changeset 5561

Show
Ignore:
Timestamp:
06/30/07 16:03:41 (1 year ago)
Author:
adrian
Message:

Edited docs/email.txt changes from [5547]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/docs/email.txt

    r5552 r5561  
    204204    This is a design feature. ``send_mail()`` and related functions were 
    205205    originally the only interface Django provided. However, the list of 
    206     parameters they accepted was slowly growing over time. It made sense to 
     206    parameters they accepted was slowly growing over time. It made sense to 
    207207    move to a more object-oriented design for e-mail messages and retain the 
    208208    original functions only for backwards compatibility. 
     
    214214 
    215215E-mail messages 
    216 ---------------- 
     216--------------- 
    217217 
    218218The ``EmailMessage`` class is initialized with the following parameters (in 
     
    275275      There are two ways to call ``attach()``: 
    276276 
    277        * You can pass it a single argument which is an 
     277       * You can pass it a single argument that is an 
    278278         ``email.MIMBase.MIMEBase`` instance. This will be inserted directly 
    279279         into the resulting message. 
     
    281281       * Alternatively, you can pass ``attach()`` three arguments: 
    282282         ``filename``, ``content`` and ``mimetype``. ``filename`` is the name 
    283          of the file attachment as it will appear in the email, ``content`` is 
     283         of the file attachment as it will appear in the e-mail, ``content`` is 
    284284         the data that will be contained inside the attachment and 
    285285         ``mimetype`` is the optional MIME type for the attachment. If you 
     
    299299 
    300300Sending alternative content types 
    301 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     301~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    302302 
    303303It is often useful to include multiple versions of the content in an e-mail. 
     
    333333 
    334334SMTP network connections 
    335 ------------------------- 
     335------------------------ 
    336336 
    337337The ``SMTPConnection`` class is initialized with the host, port, username and