Commit Graph

9 Commits

Author SHA1 Message Date
Chris Beaven 3ae9117c46 Fixes #7817 and #9456.
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 02:50:26 +00:00
Gabriel Hurley 3abcd9d3e2 Fixed #14767 -- Reflowed paragraphs and cleaned up some markup/links in the topics/db/optimizations docs. Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 11:52:15 +00:00
Gabriel Hurley a56e47400f Fixed #14727 -- Corrected three minor issues in the docs. Thanks to OldTroll for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 10:49:42 +00:00
Russell Keith-Magee a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Malcolm Tredinnick 767cf13d76 The optimization docs were a little too enthusiastic in recommending
defer() and only() usage. Disk access patterns affect when this is a
good idea, so this patch adds a note about the trade-offs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:08:17 +00:00
Jacob Kaplan-Moss 728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:27:44 +00:00
Russell Keith-Magee 2dc2ed87e5 Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:26:07 +00:00
Luke Plant 2cf21d994d Small corrections/improvements to DB optimization docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 16:26:12 +00:00
Luke Plant 2e9518bb39 Created a 'DB optimization' topic, with cross-refs to relevant sections.
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 03:13:16 +00:00