Merge remote-tracking branch 'django/master' into t3011

This commit is contained in:
Russell Keith-Magee 2012-08-20 13:12:57 +08:00
commit e29c010beb
1 changed files with 5 additions and 3 deletions

View File

@ -104,9 +104,11 @@ to know about views via the links below:
:doc:`Custom storage <howto/custom-file-storage>` :doc:`Custom storage <howto/custom-file-storage>`
* **Class-based views:** * **Class-based views:**
:doc:`Overview<topics/class-based-views/index>` | :doc:`Overview <topics/class-based-views/index>` |
:doc:`Built-in class-based views<ref/class-based-views/index>` | :doc:`Built-in display views <topics/class-based-views/generic-display>` |
:doc:`Built-in view mixins<ref/class-based-views/mixins>` :doc:`Built-in editing views <topics/class-based-views/generic-editing>` |
:doc:`Using mixins <topics/class-based-views/mixins>` |
:doc:`API reference <ref/class-based-views/index>`
* **Advanced:** * **Advanced:**
:doc:`Generating CSV <howto/outputting-csv>` | :doc:`Generating CSV <howto/outputting-csv>` |