summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2007-04-28 04:08:31 +0000
committerAdrian Holovaty <adrian@holovaty.com>2007-04-28 04:08:31 +0000
commit812c261006da23fe10eeddac7c50a935a4182e1f (patch)
treedabfae4cb3025f0802d07794c94514215452ac8b /docs
parentec577d88eaf4093725fb78e50be7756f27b5d5d0 (diff)
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
Diffstat (limited to 'docs')
-rw-r--r--docs/email.txt5
-rw-r--r--docs/settings.txt5
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/email.txt b/docs/email.txt
index cbe909c03c..021d857c60 100644
--- a/docs/email.txt
+++ b/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::
diff --git a/docs/settings.txt b/docs/settings.txt
index 3b285ac46f..2bde135e15 100644
--- a/docs/settings.txt
+++ b/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``.