Permalink
Browse files

Changed e-mail to email throughout documentation and codebase. The on…

…e exception is translation strings, which I didn't want to disrupt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 7099d46 commit 94af19c43fad3e42d64981e22fe15b844f1f9eb6 @adrianholovaty adrianholovaty committed Apr 1, 2011
@@ -124,7 +124,7 @@
USE_L10N = False
# Not-necessarily-technical managers of the site. They get broken link
-# notifications and other various e-mails.
+# notifications and other various emails.
MANAGERS = ADMINS
# Default content type and charset to use for all HttpResponse objects, if a
@@ -139,7 +139,7 @@
# E-mail address that error messages come from.
SERVER_EMAIL = 'root@localhost'
-# Whether to send broken-link e-mails.
+# Whether to send broken-link emails.
SEND_BROKEN_LINK_EMAILS = False
# Database connection info.
@@ -165,10 +165,10 @@
# to a module that defines an EmailBackend class.
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-# Host for sending e-mail.
+# Host for sending email.
EMAIL_HOST = 'localhost'
-# Port for sending e-mail.
+# Port for sending email.
EMAIL_PORT = 25
# Optional SMTP authentication information for EMAIL_HOST.
@@ -207,7 +207,7 @@
# Output to use in template system for invalid (e.g. misspelled) variables.
TEMPLATE_STRING_IF_INVALID = ''
-# Default e-mail address to use for various automated correspondence from
+# Default email address to use for various automated correspondence from
# the site managers.
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
@@ -462,11 +462,11 @@
# Set to None if you're not using it.
COMMENTS_MODERATORS_GROUP = None
-# The group ID that designates the users whose comments should be e-mailed to MANAGERS.
+# The group ID that designates the users whose comments should be emailed to MANAGERS.
# Set to None if you're not using it.
COMMENTS_SKETCHY_USERS_GROUP = None
-# The system will e-mail MANAGERS the first COMMENTS_FIRST_FEW comments by each
+# The system will email MANAGERS the first COMMENTS_FIRST_FEW comments by each
# user. Set this to 0 if you want to disable it.
COMMENTS_FIRST_FEW = 0
@@ -109,7 +109,7 @@ class PasswordResetForm(forms.Form):
def clean_email(self):
"""
- Validates that an active user exists with the given e-mail address.
+ Validates that an active user exists with the given email address.
"""
email = self.cleaned_data["email"]
self.users_cache = User.objects.filter(
@@ -100,7 +100,7 @@ class Group(models.Model):
A user in a group automatically has all the permissions granted to that group. For example, if the group Site editors has the permission can_edit_home_page, any user in that group will have that permission.
- Beyond permissions, groups are a convenient way to categorize users to apply some label, or extended functionality, to them. For example, you could create a group 'Special users', and you could write code that would do special things to those users -- such as giving them access to a members-only portion of your site, or sending them members-only e-mail messages.
+ Beyond permissions, groups are a convenient way to categorize users to apply some label, or extended functionality, to them. For example, you could create a group 'Special users', and you could write code that would do special things to those users -- such as giving them access to a members-only portion of your site, or sending them members-only email messages.
"""
name = models.CharField(_('name'), max_length=80, unique=True)
permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True)
@@ -115,7 +115,7 @@ def __unicode__(self):
class UserManager(models.Manager):
def create_user(self, username, email, password=None):
"""
- Creates and saves a User with the given username, e-mail and password.
+ Creates and saves a User with the given username, email and password.
"""
now = datetime.datetime.now()
@@ -353,7 +353,7 @@ def get_and_delete_messages(self):
return messages
def email_user(self, subject, message, from_email=None):
- "Sends an e-mail to this User."
+ "Sends an email to this User."
from django.core.mail import send_mail
send_mail(subject, message, from_email, [self.email])
@@ -147,7 +147,7 @@ class RemoteUserCustomTest(RemoteUserTest):
backend =\
'django.contrib.auth.tests.remote_user.CustomRemoteUserBackend'
- # REMOTE_USER strings with e-mail addresses for the custom backend to
+ # REMOTE_USER strings with email addresses for the custom backend to
# clean.
known_user = 'knownuser@example.com'
known_user2 = 'knownuser2@example.com'
@@ -19,7 +19,7 @@
from django.core.mail.backends.smtp import EmailBackend as _SMTPConnection
def get_connection(backend=None, fail_silently=False, **kwds):
- """Load an e-mail backend and return an instance of it.
+ """Load an email backend and return an instance of it.
If backend is None (default) settings.EMAIL_BACKEND is used.
@@ -65,7 +65,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=None,
auth_password=None, connection=None):
"""
Given a datatuple of (subject, message, from_email, recipient_list), sends
- each message to each recipient list. Returns the number of e-mails sent.
+ each message to each recipient list. Returns the number of emails sent.
If from_email is None, the DEFAULT_FROM_EMAIL setting is used.
If auth_user and auth_password are set, they're used to log in.
View
@@ -32,7 +32,7 @@ def __init__(self, include_html=False):
logging.Handler.__init__(self)
self.include_html = include_html
- """An exception log handler that e-mails log entries to site admins.
+ """An exception log handler that emails log entries to site admins.
If the request is passed as the first argument to the log record,
request data will be provided in the
View
@@ -44,7 +44,7 @@ the question on IRC -- visit the `#django IRC channel`_ on the Freenode IRC
network.
You might notice we have a second mailing list, called django-developers_ --
-but please don't e-mail support questions to this mailing list. This list is
+but please don't email support questions to this mailing list. This list is
for discussion of the development of Django itself. Asking a tech support
question there is considered quite impolite.
@@ -1,4 +1,4 @@
-Error reporting via e-mail
+Error reporting via email
==========================
When you're running a public site you should always turn off the
@@ -9,12 +9,12 @@ revealed by the error pages.
However, running with :setting:`DEBUG` set to ``False`` means you'll never see
errors generated by your site -- everyone will just see your public error pages.
You need to keep track of errors that occur in deployed sites, so Django can be
-configured to e-mail you details of those errors.
+configured to email you details of those errors.
Server errors
-------------
-When :setting:`DEBUG` is ``False``, Django will e-mail the users listed in the
+When :setting:`DEBUG` is ``False``, Django will email the users listed in the
:setting:`ADMINS` setting whenever your code raises an unhandled exception and
results in an internal server error (HTTP status code 500). This gives the
administrators immediate notification of any errors. The :setting:`ADMINS` will
@@ -23,7 +23,7 @@ the HTTP request that caused the error.
.. note::
- In order to send e-mail, Django requires a few settings telling it
+ In order to send email, Django requires a few settings telling it
how to connect to your mail server. At the very least, you'll need
to specify :setting:`EMAIL_HOST` and possibly
:setting:`EMAIL_HOST_USER` and :setting:`EMAIL_HOST_PASSWORD`,
@@ -32,8 +32,8 @@ the HTTP request that caused the error.
documentation </ref/settings>` for a full list of email-related
settings.
-By default, Django will send e-mail from root@localhost. However, some mail
-providers reject all e-mail from this address. To use a different sender
+By default, Django will send email from root@localhost. However, some mail
+providers reject all email from this address. To use a different sender
address, modify the :setting:`SERVER_EMAIL` setting.
To disable this behavior, just remove all entries from the :setting:`ADMINS`
@@ -43,15 +43,15 @@ setting.
.. versionadded:: 1.3
- Server error e-mails are sent using the logging framework, so you can
+ Server error emails are sent using the logging framework, so you can
customize this behaviour by :doc:`customizing your logging configuration
</topics/logging>`.
404 errors
----------
-Django can also be configured to e-mail errors about broken links (404 "page
-not found" errors). Django sends e-mails about 404 errors when:
+Django can also be configured to email errors about broken links (404 "page
+not found" errors). Django sends emails about 404 errors when:
* :setting:`DEBUG` is ``False``
@@ -60,9 +60,9 @@ not found" errors). Django sends e-mails about 404 errors when:
* Your :setting:`MIDDLEWARE_CLASSES` setting includes ``CommonMiddleware``
(which it does by default).
-If those conditions are met, Django will e-mail the users listed in the
+If those conditions are met, Django will email the users listed in the
:setting:`MANAGERS` setting whenever your code raises a 404 and the request has
-a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
+a referer. (It doesn't bother to email for 404s that don't have a referer --
those are usually just people typing in broken URLs or broken Web 'bots).
You can tell Django to stop reporting particular 404s by tweaking the
View
@@ -159,7 +159,7 @@ The development process
:doc:`FastCGI/SCGI/AJP <howto/deployment/fastcgi>` |
:doc:`Apache authentication <howto/apache-auth>` |
:doc:`Handling static files <howto/static-files>` |
- :doc:`Tracking code errors by e-mail <howto/error-reporting>`
+ :doc:`Tracking code errors by email <howto/error-reporting>`
Other batteries included
========================
@@ -151,7 +151,7 @@ Joseph Kocherhans
`Gary Wilson`_
Gary starting contributing patches to Django in 2006 while developing Web
applications for `The University of Texas`_ (UT). Since, he has made
- contributions to the e-mail and forms systems, as well as many other
+ contributions to the email and forms systems, as well as many other
improvements and code cleanups throughout the code base.
Gary is currently a developer and software engineering graduate student at
@@ -113,7 +113,7 @@ following actions:
security problems immediately.
* Pre-notify everyone we know to be running the affected version(s) of
- Django. We will send these notifications through private e-mail
+ Django. We will send these notifications through private email
which will include documentation of the vulnerability, links to the
relevant patch(es), and a request to keep the vulnerability
confidential until the official go-public date.
@@ -788,7 +788,7 @@ documentation:
* **Django** -- when referring to the framework, capitalize Django. It is
lowercase only in Python code and in the djangoproject.com logo.
- * **e-mail** -- it has a hyphen.
+ * **email** -- no hyphen.
* **MySQL**
@@ -45,7 +45,7 @@ of 1.0. This includes these APIs:
- :doc:`Model definition, managers, querying and transactions
</topics/db/index>`
- - :doc:`Sending e-mail </topics/email>`.
+ - :doc:`Sending email </topics/email>`.
- :doc:`File handling and storage </topics/files>`
@@ -35,7 +35,7 @@ Here's the basic workflow for how a user would use a wizard:
3. Step 1 and 2 repeat, for every subsequent form in the wizard.
4. Once the user has submitted all the forms and all the data has been
validated, the wizard processes the data -- saving it to the database,
- sending an e-mail, or whatever the application needs to do.
+ sending an email, or whatever the application needs to do.
Usage
=====
@@ -67,7 +67,7 @@ convention is to put them in a file called :file:`forms.py` in your
application.
For example, let's write a "contact form" wizard, where the first page's form
-collects the sender's e-mail address and subject, and the second page collects
+collects the sender's email address and subject, and the second page collects
the message itself. Here's what the :file:`forms.py` might look like::
from django import forms
@@ -181,9 +181,9 @@ fallback for cases where it is not installed.
Getting the current domain for display
--------------------------------------
-LJWorld.com and Lawrence.com both have e-mail alert functionality, which lets
+LJWorld.com and Lawrence.com both have email alert functionality, which lets
readers sign up to get notifications when news happens. It's pretty basic: A
-reader signs up on a Web form, and he immediately gets an e-mail saying,
+reader signs up on a Web form, and he immediately gets an email saying,
"Thanks for your subscription."
It'd be inefficient and redundant to implement this signup-processing code
@@ -211,9 +211,9 @@ Here's an example of what the form-handling view looks like::
# ...
-On Lawrence.com, this e-mail has the subject line "Thanks for subscribing to
-lawrence.com alerts." On LJWorld.com, the e-mail has the subject "Thanks for
-subscribing to LJWorld.com alerts." Same goes for the e-mail's message body.
+On Lawrence.com, this email has the subject line "Thanks for subscribing to
+lawrence.com alerts." On LJWorld.com, the email has the subject "Thanks for
+subscribing to LJWorld.com alerts." Same goes for the email's message body.
Note that an even more flexible (but more heavyweight) way of doing this would
be to use Django's template system. Assuming Lawrence.com and LJWorld.com have
@@ -455,15 +455,15 @@ This example illustrates all possible attributes and methods for a
def author_email(self, obj):
"""
Takes the object returned by get_object() and returns the feed's
- author's e-mail as a normal Python string.
+ author's email as a normal Python string.
"""
def author_email(self):
"""
- Returns the feed's author's e-mail as a normal Python string.
+ Returns the feed's author's email as a normal Python string.
"""
- author_email = 'test@example.com' # Hard-coded author e-mail.
+ author_email = 'test@example.com' # Hard-coded author email.
# AUTHOR LINK --One of the following three is optional. The framework
# looks for them in this order. In each case, the URL should include
@@ -637,15 +637,15 @@ This example illustrates all possible attributes and methods for a
def item_author_email(self, obj):
"""
Takes an item, as returned by items(), and returns the item's
- author's e-mail as a normal Python string.
+ author's email as a normal Python string.
"""
def item_author_email(self):
"""
- Returns the author e-mail for every item in the feed.
+ Returns the author email for every item in the feed.
"""
- item_author_email = 'test@example.com' # Hard-coded author e-mail.
+ item_author_email = 'test@example.com' # Hard-coded author email.
# ITEM AUTHOR LINK -- One of the following three is optional. The
# framework looks for them in this order. In each case, the URL should
@@ -1086,7 +1086,7 @@ a password has been manually set for it.
.. django-admin-option:: --username
.. django-admin-option:: --email
-The username and e-mail address for the new account can be supplied by
+The username and email address for the new account can be supplied by
using the ``--username`` and ``--email`` arguments on the command
line. If either of those is not supplied, ``createsuperuser`` will prompt for
it when running interactively.
Oops, something went wrong.

0 comments on commit 94af19c

Please sign in to comment.