Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Made small formatting tweaks to docs/settings.txt and docs/email.txt …

…changes from [5111]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 812c261006da23fe10eeddac7c50a935a4182e1f 1 parent ec577d8
@adrianholovaty adrianholovaty authored
Showing with 5 additions and 5 deletions.
  1. +2 −3 docs/email.txt
  2. +3 −2 docs/settings.txt
View
5 docs/email.txt
@@ -21,9 +21,8 @@ In two lines::
['to@example.com'], fail_silently=False)
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`_
-settings, if set, will be used to authenticate to the
-SMTP server.
+and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_
+settings, if set, will be used to authenticate to the SMTP server.
.. note::
View
5 docs/settings.txt
@@ -396,8 +396,9 @@ EMAIL_HOST_PASSWORD
Default: ``''`` (Empty string)
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.
-If either of these settings is empty, Django won't attempt authenticaion.
+used in conjunction with ``EMAIL_HOST_USER`` when authenticating to the SMTP
+server. If either of these settings is empty, Django won't attempt
+authenticaion.
See also ``EMAIL_HOST_USER``.
Please sign in to comment.
Something went wrong with that request. Please try again.