diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt index d73e8307474..dd120905dff 100644 --- a/docs/ref/applications.txt +++ b/docs/ref/applications.txt @@ -243,7 +243,7 @@ Methods In the usual initialization process, the ``ready`` method is only called once by Django. But in some corner cases, particularly in tests which are fiddling with installed applications, ``ready`` might be called more - than once. In that case, either write idempotents methods, or put a flag + than once. In that case, either write idempotent methods, or put a flag on your ``AppConfig`` classes to prevent re-running code which should be executed exactly one time. diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index 5757e2e39b2..b3d9f0eb0d9 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -70,7 +70,7 @@ Writing action functions ------------------------ First, we'll need to write a function that gets called when the action is -trigged from the admin. Action functions are just regular functions that take +triggered from the admin. Action functions are just regular functions that take three arguments: * The current :class:`ModelAdmin` diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt index 88e601523d6..365b6a99c91 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -6,7 +6,7 @@ GDAL API :synopsis: GeoDjango's high-level interface to the GDAL library. `GDAL`__ stands for **Geospatial Data Abstraction Library**, -and is a veritable "swiss army knife" of GIS data functionality. A subset +and is a veritable "Swiss army knife" of GIS data functionality. A subset of GDAL is the `OGR`__ Simple Features Library, which specializes in reading and writing vector geographic data in a variety of standard formats. diff --git a/docs/ref/files/uploads.txt b/docs/ref/files/uploads.txt index 5746985911e..b6b60d95759 100644 --- a/docs/ref/files/uploads.txt +++ b/docs/ref/files/uploads.txt @@ -111,8 +111,8 @@ Subclasses of ``UploadedFile`` include: A file uploaded into memory (i.e. stream-to-memory). This class is used by the :class:`~django.core.files.uploadhandler.MemoryFileUploadHandler`. -Built-in upload handers -======================= +Built-in upload handlers +======================== .. module:: django.core.files.uploadhandler :synopsis: Django's handlers for file uploads. diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt index a759ff50a7b..269c3d5c7ab 100644 --- a/docs/topics/db/sql.txt +++ b/docs/topics/db/sql.txt @@ -56,7 +56,7 @@ options that make it very powerful. .. admonition:: Model table names - Where'd the name of the ``Person`` table come from in that example? + Where did the name of the ``Person`` table come from in that example? By default, Django figures out a database table name by joining the model's "app label" -- the name you used in ``manage.py startapp`` -- to