Merge remote branch 'origin/master'

taggit/forms.py

@@ -16,4 +16,4 @@ class TagField(forms.CharField):
         try:
         try:
             return parse_tags(value)
             return parse_tags(value)
         except ValueError:
         except ValueError:
-            raise forms.ValidationError("Please provide a comma seperate list of tags.")
+            raise forms.ValidationError("Please provide a comma-separated list of tags.")

taggit/managers.py

@@ -69,7 +69,7 @@ class TaggableManager(object):
             return value
             return value
         else:
         else:
             # Fucking flip-floppers.
             # Fucking flip-floppers.
-            raise ValueError("You can't combine Tag objects and strings.  '%s' was provided." % value)
+            raise ValueError("You can't combine Tag objects and strings. '%s' was provided." % value)
         if hasattr(models.Field, "get_prep_lookup"):
         if hasattr(models.Field, "get_prep_lookup"):
             return models.Field().get_prep_lookup(lookup_type, qs)
             return models.Field().get_prep_lookup(lookup_type, qs)
         return models.Field().get_db_prep_lookup(lookup_type, qs)
         return models.Field().get_db_prep_lookup(lookup_type, qs)
@@ -85,7 +85,7 @@ class TaggableManager(object):
     def formfield(self, form_class=TagField, **kwargs):
     def formfield(self, form_class=TagField, **kwargs):
         defaults = {
         defaults = {
             "label": "Tags",
             "label": "Tags",
-            "help_text": "A comma seperated list of tags."
+            "help_text": "A comma-separated list of tags."
         }
         }
         defaults.update(kwargs)
         defaults.update(kwargs)
         return form_class(**kwargs)
         return form_class(**kwargs)