# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2010-08-30 20:52:00
# Node ID 339bd18c772f545e624b74489dde50a63d74ce09
# Parent  70f4a0f4e9a33456f9792664c484625d19effc90
# Parent  ee601a6264e0e78caa36a43709494669214fccfe

merge with stable

diff --git a/mercurial/mail.py b/mercurial/mail.py
--- a/mercurial/mail.py
+++ b/mercurial/mail.py
@@ -36,7 +36,7 @@ def _smtp(ui):
     s = smtplib.SMTP(local_hostname=local_hostname)
     mailhost = ui.config('smtp', 'host')
     if not mailhost:
-        raise util.Abort(_('no [smtp]host in hgrc - cannot send mail'))
+        raise util.Abort(_('smtp.host not configured - cannot send mail'))
     mailport = util.getport(ui.config('smtp', 'port', 25))
     ui.note(_('sending mail: smtp host %s, port %s\n') %
             (mailhost, mailport))