test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed display of lists after website redesign 

Thanks Brian Jacobel for the report. refs django/djangoproject.com#197
This commit is contained in:
Markus Holtermann 2014-12-17 14:01:19 +01:00 committed by Tim Graham
parent 1c5cbf5e5d
commit c7786550c4
4 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/ref/templates/builtins.txt
View File

@ -833,12 +833,17 @@ 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: ...and you'd like to display a hierarchical list that is ordered by country, like this:
* India * India
* Mumbai: 19,000,000 * Mumbai: 19,000,000
* Calcutta: 15,000,000 * Calcutta: 15,000,000
* USA * USA
* New York: 20,000,000 * New York: 20,000,000
* Chicago: 7,000,000 * Chicago: 7,000,000
* Japan * Japan
* Tokyo: 33,000,000 * Tokyo: 33,000,000
@ -893,14 +898,23 @@ With this input for ``cities``, the example ``{% regroup %}`` template code
above would result in the following output: above would result in the following output:
* India * India
* Mumbai: 19,000,000 * Mumbai: 19,000,000
* USA * USA
* New York: 20,000,000 * New York: 20,000,000
* India * India
* Calcutta: 15,000,000 * Calcutta: 15,000,000
* USA * USA
* Chicago: 7,000,000 * Chicago: 7,000,000
* Japan * 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 The easiest solution to this gotcha is to make sure in your view code that the

4
docs/releases/1.6.txt
View File

@ -836,8 +836,8 @@ Object Relational Mapper changes
Django 1.6 contains many changes to the ORM. These changes fall mostly in Django 1.6 contains many changes to the ORM. These changes fall mostly in
three categories: three categories:
1. Bug fixes (e.g. proper join clauses for generic relations, query 1. Bug fixes (e.g. proper join clauses for generic relations, query combining,
combining, join promotion, and join trimming fixes) join promotion, and join trimming fixes)
2. Preparation for new features. For example the ORM is now internally ready 2. Preparation for new features. For example the ORM is now internally ready
for multicolumn foreign keys. for multicolumn foreign keys.
3. General cleanup. 3. General cleanup.

7
docs/topics/cache.txt
View File

@ -171,9 +171,10 @@ To use a database table as your cache backend:
* Set :setting:`BACKEND <CACHES-BACKEND>` to * Set :setting:`BACKEND <CACHES-BACKEND>` to
``django.core.cache.backends.db.DatabaseCache`` ``django.core.cache.backends.db.DatabaseCache``
* Set :setting:`LOCATION <CACHES-LOCATION>` to ``tablename``, the name of
the database table. This name can be whatever you want, as long as it's * Set :setting:`LOCATION <CACHES-LOCATION>` to ``tablename``, the name of the
a valid table name that's not already being used in your database. database table. This name can be whatever you want, as long as it's a valid
table name that's not already being used in your database.
In this example, the cache table's name is ``my_cache_table``:: In this example, the cache table's name is ``my_cache_table``::