mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Merge remote-tracking branch 'core/master' into schema-alteration

Browse Source 
Conflicts:
	docs/ref/django-admin.txt
This commit is contained in:
Andrew Godwin
2013-08-19 18:30:48 +01:00
parent 52edc16086 3c03004050
commit b6a957f0ba
167 changed files with 1861 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/intro/tutorial01.txt
View File

@@ -600,7 +600,7 @@ for your own sanity when dealing with the interactive prompt, but also because
objects' representations are used throughout Django's automatically-generated
admin.
.. admonition:: `__unicode__` or `__str__`?
.. admonition:: ``__unicode__`` or ``__str__``?
On Python 3, things are simpler, just use
:meth:`~django.db.models.Model.__str__` and forget about

9
docs/intro/tutorial02.txt
View File

@@ -385,15 +385,6 @@ search terms, Django will search the ``question`` field. You can use as many
fields as you'd like -- although because it uses a ``LIKE`` query behind the
scenes, keep it reasonable, to keep your database happy.
Finally, because ``Poll`` objects have dates, it'd be convenient to be able to
drill down by date. Add this line::
date_hierarchy = 'pub_date'
That adds hierarchical navigation, by date, to the top of the change list page.
At top level, it displays all available years. Then it drills down to months
and, ultimately, days.
Now's also a good time to note that change lists give you free pagination. The
default is to display 100 items per page. Change-list pagination, search boxes,
filters, date-hierarchies and column-header-ordering all work together like you