diff options
| author | Gary Wilson Jr <gary.wilson@gmail.com> | 2009-03-31 07:01:01 +0000 |
|---|---|---|
| committer | Gary Wilson Jr <gary.wilson@gmail.com> | 2009-03-31 07:01:01 +0000 |
| commit | 7372ea159aa192757cc5383e6857c29ca2fc53c6 (patch) | |
| tree | 0fac8211109e3e785cd72d9a660dd45c5b5c3041 /docs/topics | |
| parent | 184ea1c91f06d31d0e1d34b2c27c08b01d2d5033 (diff) | |
Fixed #10389, #10501, #10502, #10540, #10562, #10563, #10564, #10565, #10568, #10569, #10614, #10617, #10619 -- Fixed several typos as well as a couple minor issues in the docs, patches from timo, nih, bthomas, rduffield, UloPe, and sebleier@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/db/aggregation.txt | 11 | ||||
| -rw-r--r-- | docs/topics/db/models.txt | 5 | ||||
| -rw-r--r-- | docs/topics/forms/index.txt | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt index 9f7ba6fa22..ade2f505a7 100644 --- a/docs/topics/db/aggregation.txt +++ b/docs/topics/db/aggregation.txt @@ -146,12 +146,11 @@ So far, we have dealt with aggregates over fields that belong to the model being queried. However, sometimes the value you want to aggregate will belong to a model that is related to the model you are querying. -When specifying the field to be aggregated in an aggregate functions, -Django will allow you to use the same -:ref:`double underscore notation <field-lookups-intro>` that is used -when referring to related fields in filters. Django will then handle -any table joins that are required to retrieve and aggregate the -related value. +When specifying the field to be aggregated in an aggregate function, Django +will allow you to use the same :ref:`double underscore notation +<field-lookups-intro>` that is used when referring to related fields in +filters. Django will then handle any table joins that are required to retrieve +and aggregate the related value. For example, to find the price range of books offered in each store, you could use the annotation:: diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index eb61120fe3..797ebcb8c1 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -1019,10 +1019,11 @@ ordering or the default manager in the proxy, without having to alter the original. Proxy models are declared like normal models. You tell Django that it's a -proxy model by setting the :attr:`~django.db.models.Options.proxy` attribute to of the ``Meta`` class to ``True``. +proxy model by setting the :attr:`~django.db.models.Options.proxy` attribute of +the ``Meta`` class to ``True``. For example, suppose you want to add a method to the standard ``User`` model -that will make be used in your templates. You can do it like this:: +that will be used in your templates. You can do it like this:: from django.contrib.auth.models import User diff --git a/docs/topics/forms/index.txt b/docs/topics/forms/index.txt index 47a29f334e..cb47639345 100644 --- a/docs/topics/forms/index.txt +++ b/docs/topics/forms/index.txt @@ -293,7 +293,7 @@ templates: message. ``field.is_hidden`` - This attribute is ``True`` is the form field is a hidden field and + This attribute is ``True`` if the form field is a hidden field and ``False`` otherwise. It's not particularly useful as a template variable, but could be useful in conditional tests such as:: |