diff -r 28ddf67198b2 -r ffcceca7406d doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Thu Sep 23 01:23:16 2010 +0200
+++ b/doc/hgrc.5.txt	Thu Sep 23 00:27:04 2010 -0600
@@ -699,13 +699,12 @@
     Optional. Whether to connect to mail server using TLS. True or
     False. Default: False.
 ``username``
-    Optional. User name to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
+    Optional. User name for authenticating with the SMTP server.
     Default: none.
 ``password``
-    Optional. Password to authenticate to SMTP server with. If
-    username is specified, password must also be specified.
-    Default: none.
+    Optional. Password for authenticating with the SMTP server. If not
+    specified, interactive sessions will prompt the user for a
+    password; non-interactive sessions will fail. Default: none.
 ``local_hostname``
     Optional. It's the hostname that the sender can use to identify
     itself to the MTA.