diff options
| -rw-r--r-- | docs/ref/templates/builtins.txt | 34 | ||||
| -rw-r--r-- | docs/releases/1.6.txt | 10 |
2 files changed, 29 insertions, 15 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 6578a7ae3a..a0fcf11800 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -810,13 +810,18 @@ This complex tag is best illustrated by way of an example: say that "places" is ...and you'd like to display a hierarchical list that is ordered by country, like this: * India - * Mumbai: 19,000,000 - * Calcutta: 15,000,000 + + * Mumbai: 19,000,000 + * Calcutta: 15,000,000 + * USA - * New York: 20,000,000 - * Chicago: 7,000,000 + + * New York: 20,000,000 + * Chicago: 7,000,000 + * Japan - * Tokyo: 33,000,000 + + * Tokyo: 33,000,000 You can use the ``{% regroup %}`` tag to group the list of cities by country. @@ -870,15 +875,24 @@ With this input for ``cities``, the example ``{% regroup %}`` template code above would result in the following output: * India - * Mumbai: 19,000,000 + + * Mumbai: 19,000,000 + * USA - * New York: 20,000,000 + + * New York: 20,000,000 + * India - * Calcutta: 15,000,000 + + * Calcutta: 15,000,000 + * USA - * Chicago: 7,000,000 + + * Chicago: 7,000,000 + * Japan - * Tokyo: 33,000,000 + + * Tokyo: 33,000,000 The easiest solution to this gotcha is to make sure in your view code that the data is ordered according to how you want to display it. diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index b473bcec65..68dde2a14f 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -838,11 +838,11 @@ Object Relational Mapper changes Django 1.6 contains many changes to the ORM. These changes fall mostly in three categories: - 1. Bug fixes (e.g. proper join clauses for generic relations, query - combining, join promotion, and join trimming fixes) - 2. Preparation for new features. For example the ORM is now internally ready - for multicolumn foreign keys. - 3. General cleanup. +1. Bug fixes (e.g. proper join clauses for generic relations, query combining, + join promotion, and join trimming fixes) +2. Preparation for new features. For example the ORM is now internally ready + for multicolumn foreign keys. +3. General cleanup. These changes can result in some compatibility problems. For example, some queries will now generate different table aliases. This can affect |