diff options
| author | luz.paz <luzpaz@users.noreply.github.com> | 2018-08-01 12:55:53 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-08-01 16:13:18 -0400 |
| commit | adfd2614045518cc9221aef1f17fd3ffeac3d2cc (patch) | |
| tree | 799e1d04e03c62daafa4ea256e24d3ec0c9f47e1 /docs | |
| parent | 7da1e45dc58c54ed81815b2deb9bd84e6260b657 (diff) | |
[2.1.x] Fixed typos in comments and docs.
Backport of 97e637a87fb45c4de970cca6cb783d93473c9d15 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/intro/tutorial02.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/tutorial.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/instances.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt index 631536b515..c1f0aeef46 100644 --- a/docs/intro/tutorial02.txt +++ b/docs/intro/tutorial02.txt @@ -362,7 +362,7 @@ but for now, remember the three-step guide to making model changes: The reason that there are separate commands to make and apply migrations is because you'll commit migrations to your version control system and ship them with your app; they not only make your development easier, they're also -useable by other developers and in production. +usable by other developers and in production. Read the :doc:`django-admin documentation </ref/django-admin>` for full information on what the ``manage.py`` utility can do. diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index 7c730e41aa..23a4111aec 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -742,7 +742,7 @@ Next, start up the Django development server: Finally, browse to ``http://localhost:8000/admin/``, and log in with the user you just created. Browse to any of the ``WorldBorder`` entries -- the borders -may be edited by clicking on a polygon and dragging the vertexes to the desired +may be edited by clicking on a polygon and dragging the vertices to the desired position. .. _OpenLayers: https://openlayers.org/ diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index 23572f7362..35be4e5107 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -664,7 +664,7 @@ For example:: # Primary keys compared MyModel(id=1) == MyModel(id=1) MyModel(id=1) != MyModel(id=2) - # Primay keys are None + # Primary keys are None MyModel(id=None) != MyModel(id=None) # Same instance instance = MyModel(id=None) diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index e25feeba2f..8c7147ee5d 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -746,7 +746,6 @@ url urljoins urlpatterns urls -useable username usernames utc |