summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/admin/actions.txt2
-rw-r--r--docs/ref/contrib/admin/index.txt2
-rw-r--r--docs/ref/contrib/gis/tutorial.txt4
-rw-r--r--docs/ref/request-response.txt3
4 files changed, 5 insertions, 6 deletions
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 4b92b7654a..084caca69e 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -221,7 +221,7 @@ that the action was successful::
messages.SUCCESS,
)
-This make the action match what the admin itself does after successfully
+This makes the action match what the admin itself does after successfully
performing an action:
.. image:: _images/actions-as-modeladmin-methods.png
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 2e8a09e9b2..d52857d6ba 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -3097,7 +3097,7 @@ Templates can override or extend base admin templates as described in
as options to the admin class.
Raises :class:`~django.core.exceptions.ImproperlyConfigured` if a model is
- abstract. and ``django.contrib.admin.exceptions.AlreadyRegistered`` if a
+ abstract, and ``django.contrib.admin.exceptions.AlreadyRegistered`` if a
model is already registered.
.. method:: AdminSite.unregister(model_or_iterable)
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 6df108af43..cc554846ab 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -636,8 +636,8 @@ a ``contains`` lookup using the ``pnt_wkt`` as the parameter:
>>> WorldBorder.objects.filter(mpoly__contains=pnt_wkt)
<QuerySet [<WorldBorder: United States>]>
-Here, you retrieved a ``QuerySet`` with only one model: the border of the
-United States (exactly what you would expect).
+Here, you retrieved a ``QuerySet`` with only one model instance: the border of
+the United States (exactly what you would expect).
Similarly, you may also use a :doc:`GEOS geometry object
</ref/contrib/gis/geos>`. Here, you can combine the ``intersects`` spatial
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index dead7af813..ba6041593b 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -307,8 +307,7 @@ middleware class is listed in :setting:`MIDDLEWARE`.
else:
... # Do something for anonymous users.
- The :meth:`auser` method does the same thing but can be used from async
- contexts.
+ The :meth:`auser` can be used to access the user in async contexts.
Methods
-------