summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCody Scott <cody.j.b.scott@gmail.com>2013-10-11 12:45:00 -0400
committerTim Graham <timograham@gmail.com>2013-10-11 15:34:11 -0400
commit8bfc7cc64c4b45ccf9ad69564a5abd6b8105e28f (patch)
tree7f914495ef117433dc5cdbc78cb10e3ca6d9d233 /docs
parent848101bf1736d1c01eb86968e85a14c7466bb376 (diff)
Minor edits to docs/topics/db/queries.txt.
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/queries.txt17
1 files changed, 9 insertions, 8 deletions
diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt
index 19c1af7c0f..1180022d6e 100644
--- a/docs/topics/db/queries.txt
+++ b/docs/topics/db/queries.txt
@@ -140,8 +140,8 @@ To retrieve objects from your database, construct a
:class:`~django.db.models.Manager` on your model class.
A :class:`~django.db.models.query.QuerySet` represents a collection of objects
-from your database. It can have zero, one or many *filters* -- criteria that
-narrow down the collection based on given parameters. In SQL terms, a
+from your database. It can have zero, one or many *filters*. Filters narrow
+down the query results based on the given parameters. In SQL terms, a
:class:`~django.db.models.query.QuerySet` equates to a ``SELECT`` statement,
and a filter is a limiting clause such as ``WHERE`` or ``LIMIT``.
@@ -257,10 +257,10 @@ Example::
These three ``QuerySets`` are separate. The first is a base
:class:`~django.db.models.query.QuerySet` containing all entries that contain a
headline starting with "What". The second is a subset of the first, with an
-additional criteria that excludes records whose ``pub_date`` is greater than
-now. The third is a subset of the first, with an additional criteria that
-selects only the records whose ``pub_date`` is greater than now. The initial
-:class:`~django.db.models.query.QuerySet` (``q1``) is unaffected by the
+additional criteria that excludes records whose ``pub_date`` is today or in the
+future. The third is a subset of the first, with an additional criteria that
+selects only the records whose ``pub_date`` is today or in the future. The
+initial :class:`~django.db.models.query.QuerySet` (``q1``) is unaffected by the
refinement process.
.. _querysets-are-lazy:
@@ -1079,8 +1079,9 @@ the foreign key aren't saved to the database until you call
>>> e.blog = some_blog
>>> e.save()
-If a :class:`~django.db.models.ForeignKey` field has ``null=True`` set (i.e., it allows ``NULL``
-values), you can assign ``None`` to it. Example::
+If a :class:`~django.db.models.ForeignKey` field has ``null=True`` set (i.e.,
+it allows ``NULL`` values), you can assign ``None`` to remove the relation.
+Example::
>>> e = Entry.objects.get(id=2)
>>> e.blog = None