Django

Code

Ticket #4163: 4163.diff

File 4163.diff, 1.3 kB (added by Karen Tracey <kmtracey@gmail.com>, 2 years ago)

  • docs/email.txt

    old new  
    2727     
    2828.. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET 
    2929 
     30.. note:: 
     31 
     32    Mail will be sent via the SMTP host and port specified in the `EMAIL_HOST`_ 
     33    and `EMAIL_PORT`_ settings.  Additionally the `EMAIL_HOST_USER`_ 
     34    and `EMAIL_HOST_PASSWORD`_ settings, if set, will be used to authenticate 
     35    to the SMTP server. 
     36 
     37.. _EMAIL_HOST: ../settings/#EMAIL_HOST 
     38 
     39.. _EMAIL_PORT: ../settings/#EMAIL_PORT 
     40 
     41.. _EMAIL_HOST_USER: ../settings/#EMAIL_HOST_USER 
     42 
     43.. _EMAIL_HOST_PASSWORD: ../settings/#EMAIL_HOST_PASSWORD 
     44 
     45 
    3046send_mail() 
    3147=========== 
    3248 

  • docs/settings.txt

    old new  
    395395 
    396396Default: ``''`` (Empty string) 
    397397 
    398 Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty, 
    399 Django won't attempt authentication. 
     398Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is 
     399used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server. 
     400If either of these settings is empty, Django won't attempt authenticaion. 
    400401 
    401402See also ``EMAIL_HOST_USER``. 
    402403