Skip to content

Commit

Permalink
Made small formatting tweaks to docs/settings.txt and docs/email.txt …
Browse files Browse the repository at this point in the history
…changes from [5111]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Apr 28, 2007
1 parent ec577d8 commit 812c261
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions docs/email.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ In two lines::
['to@example.com'], fail_silently=False) ['to@example.com'], fail_silently=False)


Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_
and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_
settings, if set, will be used to authenticate to the settings, if set, will be used to authenticate to the SMTP server.
SMTP server.


.. note:: .. note::


Expand Down
5 changes: 3 additions & 2 deletions docs/settings.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -396,8 +396,9 @@ EMAIL_HOST_PASSWORD
Default: ``''`` (Empty string) Default: ``''`` (Empty string)


Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is
used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server. used in conjunction with ``EMAIL_HOST_USER`` when authenticating to the SMTP
If either of these settings is empty, Django won't attempt authenticaion. server. If either of these settings is empty, Django won't attempt
authenticaion.


See also ``EMAIL_HOST_USER``. See also ``EMAIL_HOST_USER``.


Expand Down

0 comments on commit 812c261

Please sign in to comment.