Commit 94af19c4 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

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

Changed e-mail to email throughout documentation and codebase. The one 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
parent 7099d465
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ LANGUAGE_COOKIE_NAME = 'django_language'
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 @@ FILE_CHARSET = 'utf-8'
# 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 @@ DATABASE_ROUTERS = []
# 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 @@ TEMPLATE_CONTEXT_PROCESSORS = (
# 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 @@ COMMENTS_BANNED_USERS_GROUP = None
# 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

+1 −1
Original line number Diff line number Diff line
@@ -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(
+3 −3
Original line number Diff line number Diff line
@@ -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 @@ class Group(models.Model):
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 @@ class User(models.Model):
        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])

+1 −1
Original line number Diff line number Diff line
@@ -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'
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from django.core.mail.message import \
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.
Loading