From 1a1a8235df0b241f042df59af10c3c1d1b9f2f43 Mon Sep 17 00:00:00 2001
From: Noenglish Professorbut <noenglishprofessorbut@gmail.com>
Date: Fri, 11 Mar 2016 17:17:01 -0800
Subject: [PATCH] [1.8.x] Fixed a few docstring typos.
Backport of f8d20da0479b88db5bb5a2a30fa769cbf6d0a5bf from master
---
django/contrib/gis/db/backends/postgis/operations.py | 2 +-
django/contrib/gis/db/backends/spatialite/operations.py | 2 +-
django/db/migrations/autodetector.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
index 6913533080..cfb7d19f7e 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -208,7 +208,7 @@ class PostGISOperations(BaseSpatialOperations, DatabaseOperations):
def convert_geom(self, hex, geo_field):
"""
- Converts the geometry returned from PostGIS aggretates.
+ Converts the geometry returned from PostGIS aggregates.
"""
if hex:
return Geometry(hex, srid=geo_field.srid)
diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
index 6c89849caf..18bcf96735 100644
--- a/django/contrib/gis/db/backends/spatialite/operations.py
+++ b/django/contrib/gis/db/backends/spatialite/operations.py
@@ -145,7 +145,7 @@ class SpatiaLiteOperations(BaseSpatialOperations, DatabaseOperations):
def geo_db_type(self, f):
"""
- Returns None because geometry columnas are added via the
+ Returns None because geometry columns are added via the
`AddGeometryColumn` stored procedure on SpatiaLite.
"""
return None
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
index 33a9e9e166..4f53825411 100644
--- a/django/db/migrations/autodetector.py
+++ b/django/db/migrations/autodetector.py
@@ -36,7 +36,7 @@ class MigrationAutodetector(object):
def changes(self, graph, trim_to_apps=None, convert_apps=None, migration_name=None):
"""
- Main entry point to produce a list of appliable changes.
+ Main entry point to produce a list of applicable changes.
Takes a graph to base names on and an optional set of apps
to try and restrict to (restriction is not guaranteed)
"""