diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 4445dd52fd..c4cccfd990 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -16,7 +16,7 @@ def delete_selected(modeladmin, request, queryset): """ Default action which deletes the selected objects. - This action first displays a confirmation page whichs shows all the + This action first displays a confirmation page which shows all the deleteable objects, or, if the user has no permission one of the related childs (foreignkeys), a "permission denied" message. diff --git a/django/contrib/auth/context_processors.py b/django/contrib/auth/context_processors.py index 474002e550..ce1e42d574 100644 --- a/django/contrib/auth/context_processors.py +++ b/django/contrib/auth/context_processors.py @@ -13,7 +13,7 @@ class PermLookupDict(object): return self.user.has_perm("%s.%s" % (self.app_label, perm_name)) def __iter__(self): - # To fix 'item in perms.someapp' and __getitem__ iteraction we need to + # To fix 'item in perms.someapp' and __getitem__ interaction we need to # define __iter__. See #18979 for details. raise TypeError("PermLookupDict is not iterable.") diff --git a/django/contrib/gis/db/backends/postgis/models.py b/django/contrib/gis/db/backends/postgis/models.py index 83b254cb39..68d4c188d6 100644 --- a/django/contrib/gis/db/backends/postgis/models.py +++ b/django/contrib/gis/db/backends/postgis/models.py @@ -51,7 +51,7 @@ class PostGISGeometryColumns(models.Model): class PostGISSpatialRefSys(models.Model, SpatialRefSysMixin): """ The 'spatial_ref_sys' table from PostGIS. See the PostGIS - documentaiton at Ch. 4.2.1. + documentation at Ch. 4.2.1. """ srid = models.IntegerField(primary_key=True) auth_name = models.CharField(max_length=256) diff --git a/django/contrib/gis/db/models/query.py b/django/contrib/gis/db/models/query.py index 343610c90c..c60750a5ba 100644 --- a/django/contrib/gis/db/models/query.py +++ b/django/contrib/gis/db/models/query.py @@ -500,7 +500,7 @@ class GeoQuerySet(QuerySet): SQL function to call. settings: - Dictonary of internal settings to customize for the spatial procedure. + Dictionary of internal settings to customize for the spatial procedure. Public Keyword Arguments: diff --git a/django/contrib/gis/gdal/geomtype.py b/django/contrib/gis/gdal/geomtype.py index abb184e2f9..d0dc1c0359 100644 --- a/django/contrib/gis/gdal/geomtype.py +++ b/django/contrib/gis/gdal/geomtype.py @@ -3,7 +3,7 @@ from django.utils import six class OGRGeomType(object): - "Encapulates OGR Geometry Types." + "Encapsulates OGR Geometry Types." wkb25bit = -2147483648 diff --git a/django/contrib/gis/sitemaps/kml.py b/django/contrib/gis/sitemaps/kml.py index 4dcaa8f595..83e1edcb61 100644 --- a/django/contrib/gis/sitemaps/kml.py +++ b/django/contrib/gis/sitemaps/kml.py @@ -44,7 +44,7 @@ class KMLSitemap(Sitemap): def get_urls(self, page=1, site=None, protocol=None): """ - This method is overrridden so the appropriate `geo_format` attribute + This method is overridden so the appropriate `geo_format` attribute is placed on each URL element. """ urls = Sitemap.get_urls(self, page=page, site=site, protocol=protocol) diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 83121a9066..931a9d87d7 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -302,7 +302,7 @@ class BaseExpression(object): Does this expression contain a reference to some of the existing aggregates? If so, returns the aggregate and also the lookup parts that *weren't* found. So, if - exsiting_aggregates = {'max_id': Max('id')} + existing_aggregates = {'max_id': Max('id')} self.name = 'max_id' queryset.filter(max_id__range=[10,100]) then this method will return Max('id') and those parts of the diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 9324b7fb71..cd2457daf1 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -841,7 +841,7 @@ def default_if_none(value, arg): @register.filter(is_safe=False) def divisibleby(value, arg): - """Returns True if the value is devisible by the argument.""" + """Returns True if the value is divisible by the argument.""" return int(value) % int(arg) == 0 diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 09c0e72d3b..4526737ad3 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -824,7 +824,7 @@ def do_for(parser, token): than -- the following::