mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell Keith-Magee
2012-09-24 07:49:46 +08:00
parent 8a527dda13 54c81a1c93
commit 29d1abbe35
29 changed files with 167 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/intro/tutorial03.txt
View File

@@ -555,7 +555,7 @@ with the :ttag:`url` template tag:
If ``{% url 'polls.views.detail' poll.id %}`` (with quotes) doesn't work,
but ``{% url polls.views.detail poll.id %}`` (without quotes) does, that
means you're using a version of Django ≤ 1.4. In this case, add the
means you're using a version of Django < 1.5. In this case, add the
following declaration at the top of your template:
.. code-block:: html+django