diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-05-10 13:27:53 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-05-10 13:27:53 +0000 |
| commit | b7b0ebb3adf89b7abf8a66551077b6d110700ed6 (patch) | |
| tree | 2ee16984833f5f5d951955cdebe42116e2e7bebc | |
| parent | 5627b26377dff1bf53690279e6792748f33f9043 (diff) | |
[1.1.X] Fixed #12678 -- Corrected a few references to Queryset into QuerySet. Thanks to ChrisMorgan for the report, and timo for the patch.
Backport of r13211 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 | ||||
| -rw-r--r-- | docs/topics/db/aggregation.txt | 4 | ||||
| -rw-r--r-- | docs/topics/db/models.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index bf461583b2..3e539f39c6 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -88,7 +88,7 @@ time, defeating the purpose of caching). This means that when you unpickle a than the results that are currently in the database. If you only want to pickle the necessary information to recreate the -``Queryset`` from the database at a later time, pickle the ``query`` attribute +``QuerySet`` from the database at a later time, pickle the ``query`` attribute of the ``QuerySet``. You can then recreate the original ``QuerySet`` (without any results loaded) using some code like this:: diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt index 6660d1df42..fd7c5864b5 100644 --- a/docs/topics/db/aggregation.txt +++ b/docs/topics/db/aggregation.txt @@ -96,7 +96,7 @@ Generating aggregates for each item in a QuerySet ================================================= The second way to generate summary values is to generate an independent -summary for each object in a ``Queryset``. For example, if you are retrieving +summary for each object in a ``QuerySet``. For example, if you are retrieving a list of books, you may want to know how many authors contributed to each book. Each Book has a many-to-many relationship with the Author; we want to summarize this relationship for each book in the ``QuerySet``. @@ -257,7 +257,7 @@ that have contributed to the book, you could use the following query:: Ordinarily, annotations are generated on a per-object basis - an annotated ``QuerySet`` will return one result for each object in the original -``Queryset``. However, when a ``values()`` clause is used to constrain the +``QuerySet``. However, when a ``values()`` clause is used to constrain the columns that are returned in the result set, the method for evaluating annotations is slightly different. Instead of returning an annotated result for each result in the original ``QuerySet``, the original results are diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index 1e69009827..17a8e2d6bf 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -1062,7 +1062,7 @@ attribute when you use the proxy. This is easy:: Now normal ``User`` queries will be unorderd and ``OrderedUser`` queries will be ordered by ``username``. -Querysets still return the model that was requested +QuerySets still return the model that was requested ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ There is no way to have Django return, say, a ``MyUser`` object whenever you |