diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 9140aed234..39db8d27d1 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -89,6 +89,9 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
 
+# Port for sending e-mail.
+EMAIL_PORT = 25
+
 # Optional SMTP authentication information for EMAIL_HOST.
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo
index 8f94e0d350..e45f681c52 100644
Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po
index afb407bba0..26fbd77631 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@@ -200,11 +200,11 @@ msgstr "סוגי תוכן"
 
 #: models/core.py:67
 msgid "session key"
-msgstr "מפתח התחברות"
+msgstr "מפתח התחברות (session key)"
 
 #: models/core.py:68
 msgid "session data"
-msgstr "מידע התחברות"
+msgstr "מידע התחברות (session data)"
 
 #: models/core.py:69
 msgid "expire date"
@@ -291,7 +291,7 @@ msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
 msgstr ""
-"בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש/ת גםכל ההרשאות של כל קבוצה "
+"בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש/ת גם כל ההרשאות של כל קבוצה "
 "המשוייכת אליו/ה."
 
 #: models/auth.py:47 contrib/admin/templates/admin/object_history.html:19
@@ -849,7 +849,7 @@ msgstr "בחר/י %s לשינוי"
 #: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "ה%(name)s \"%(obj)s\" נוסף בהצלחה."
+msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה."
 
 #: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
 msgid "You may edit it again below."
@@ -892,13 +892,13 @@ msgstr "אף שדה לא השתנה."
 #: contrib/admin/views/main.py:489
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "ה-%(name)s \"%(obj)s\" שונה בהצלחה."
+msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה."
 
 #: contrib/admin/views/main.py:498
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "ה-%(name)s \"%(obj)s\" שונה בהצלחה ניתן לערוך אותו שוב מתחת."
+msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת."
 
 #: contrib/admin/views/main.py:536
 #, python-format
@@ -918,7 +918,7 @@ msgstr "אחד או יותר %(fieldname)s ב%(name)s:"
 #: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" נמחק בהצלחה."
+msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה."
 
 #: contrib/admin/views/main.py:652
 msgid "Are you sure?"
diff --git a/django/core/mail.py b/django/core/mail.py
index d304b2e1b4..3baf191b5c 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -30,7 +30,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST
     If auth_user and auth_password are set, they're used to log in.
     """
     try:
-        server = smtplib.SMTP(settings.EMAIL_HOST)
+        server = smtplib.SMTP(settings.EMAIL_HOST, settings.EMAIL_PORT)
         if auth_user and auth_password:
             server.login(auth_user, auth_password)
     except:
diff --git a/docs/settings.txt b/docs/settings.txt
index bb7b24db2f..c092e0e544 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -334,6 +334,8 @@ Default: ``'localhost'``
 
 The host to use for sending e-mail.
 
+See also ``EMAIL_PORT``.
+
 EMAIL_HOST_PASSWORD
 -------------------
 
@@ -358,6 +360,15 @@ Django won't attempt authentication.
 
 See also ``EMAIL_HOST_PASSWORD``.
 
+EMAIL_PORT
+----------
+
+Default: ``25``
+
+**New in Django development version.**
+
+Port to use for the SMTP server defined in ``EMAIL_HOST``.
+
 EMAIL_SUBJECT_PREFIX
 --------------------
 
diff --git a/docs/templates.txt b/docs/templates.txt
index 636132a5aa..22c10caf15 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -210,6 +210,9 @@ is possible and, indeed, quite useful.
 
 Here are some tips for working with inheritance:
 
+    * If you use ``{% extends %}`` in a template, it must be the first template
+      tag in that template.
+
     * More ``{% block %}`` tags in your base templates are better. Remember,
       child templates don't have to define all parent blocks, so you can fill
       in reasonable defaults in a number of blocks, then only define the ones