diff options
| author | Floris den Hengst <florisdenhengst@gmail.com> | 2015-03-07 17:34:33 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-14 12:29:54 -0400 |
| commit | 08f38d19f8a13d9976a41e5b422d8e248e1841e2 (patch) | |
| tree | e5a98a86e7682cf86db68a0138dcb20275a0e230 | |
| parent | f8ed647435e13d62d4df0bbc76d37b91d0ad81fb (diff) | |
[1.7.x] Fixed doc typos.
Backport of e42a720ba22a51c68d2316d425234a197eaff467 from master
| -rw-r--r-- | docs/ref/applications.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/admin/actions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/gdal.txt | 2 | ||||
| -rw-r--r-- | docs/ref/files/uploads.txt | 4 | ||||
| -rw-r--r-- | docs/topics/db/sql.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt index ab52e8b3e6..1b790ee512 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 5757e2e39b..b3d9f0eb0d 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 e01833546b..852f431be9 100644 --- a/docs/ref/contrib/gis/gdal.txt +++ b/docs/ref/contrib/gis/gdal.txt @@ -8,7 +8,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 1b9103bb3b..96e3dd0154 100644 --- a/docs/ref/files/uploads.txt +++ b/docs/ref/files/uploads.txt @@ -106,8 +106,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 c57ccbcacd..6ca7097b72 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 |