Index: docs/email.txt
===================================================================
--- docs/email.txt	(revision 5100)
+++ docs/email.txt	(working copy)
@@ -27,6 +27,22 @@
     
 .. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET
 
+.. note::
+
+    Mail will be sent via the SMTP host and port specified in the `EMAIL_HOST`_
+    and `EMAIL_PORT`_ settings.  Additionally the `EMAIL_HOST_USER`_
+    and `EMAIL_HOST_PASSWORD`_ settings, if set, will be used to authenticate
+    to the SMTP server.
+
+.. _EMAIL_HOST: ../settings/#EMAIL_HOST
+
+.. _EMAIL_PORT: ../settings/#EMAIL_PORT
+
+.. _EMAIL_HOST_USER: ../settings/#EMAIL_HOST_USER
+
+.. _EMAIL_HOST_PASSWORD: ../settings/#EMAIL_HOST_PASSWORD
+
+
 send_mail()
 ===========
 
Index: docs/settings.txt
===================================================================
--- docs/settings.txt	(revision 5100)
+++ docs/settings.txt	(working copy)
@@ -395,8 +395,9 @@
 
 Default: ``''`` (Empty string)
 
-Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
-Django won't attempt authentication.
+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.
 
 See also ``EMAIL_HOST_USER``.