Merge pull request #376 from nikolas/fix-typos

Fix a few random docs typos

Author: joshblum

registration/models.py

@@ -264,7 +264,7 @@ def delete_expired_users(self):
         Regularly clearing out accounts which have never been
         activated serves two useful purposes:
 
-        1. It alleviates the ocasional need to reset a
+        1. It alleviates the occasional need to reset a
            ``RegistrationProfile`` and/or re-send an activation email
            when a user does not receive or does not act upon the
            initial activation email; since the account will be
@@ -380,7 +380,7 @@ def send_activation_email(self, site, request=None):
         ``RegistrationProfile``.
 
         The activation email will use the following templates,
-        which can be overriden by setting ACTIVATION_EMAIL_SUBJECT,
+        which can be overridden by setting ACTIVATION_EMAIL_SUBJECT,
         ACTIVATION_EMAIL_BODY, and ACTIVATION_EMAIL_HTML appropriately:
 
         ``registration/activation_email_subject.txt``
@@ -558,7 +558,7 @@ def send_admin_approve_email(self, user, site, request=None):
         approve this user.
 
         The approval email will use the following templates,
-        which can be overriden by setting APPROVAL_EMAIL_SUBJECT,
+        which can be overridden by setting APPROVAL_EMAIL_SUBJECT,
         APPROVAL_EMAIL_BODY, and APPROVAL_EMAIL_HTML appropriately:
 
         ``registration/admin_approve_email_subject.txt``
@@ -658,7 +658,7 @@ def send_admin_approve_complete_email(self, site, request=None):
         ``SupervisedRegistrationProfile``.
 
         The email will use the following templates,
-        which can be overriden by settings APPROVAL_COMPLETE_EMAIL_SUBJECT,
+        which can be overridden by settings APPROVAL_COMPLETE_EMAIL_SUBJECT,
         APPROVAL_COMPLETE_EMAIL_BODY, and APPROVAL_COMPLETE_EMAIL_HTML appropriately:
 
         ``registration/admin_approve_complete_email_subject.txt``

registration/tests/default_backend.py

@@ -99,7 +99,7 @@ def test_registration(self):
 
     def test_registration_no_email(self):
         """
-        Overriden Registration view does not send an activation email if the
+        Overridden Registration view does not send an activation email if the
         associated class variable is set to ``False``
 
         """