Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.6.x] Fixed some markup in docs/ref/templates/api.txt

Backport of 862a04a from master
  • Loading branch information...
commit 3d25f592fe3d95df5ce0fc75f1580946d77950ef 1 parent f8fd38b
Tim Graham authored July 15, 2013

Showing 1 changed file with 12 additions and 7 deletions. Show diff stats Hide diff stats

  1. 19  docs/ref/templates/api.txt
19  docs/ref/templates/api.txt
@@ -2,6 +2,9 @@
2 2
 The Django template language: For Python programmers
3 3
 ====================================================
4 4
 
  5
+.. module:: django.template
  6
+    :synopsis: Django's template system
  7
+
5 8
 This document explains the Django template system from a technical
6 9
 perspective -- how it works and how to extend it. If you're just looking for
7 10
 reference on the language syntax, see :doc:`/topics/templates`.
@@ -52,7 +55,7 @@ from the context and executing all block tags.
52 55
 Using the template system
53 56
 =========================
54 57
 
55  
-.. class:: django.template.Template
  58
+.. class:: Template
56 59
 
57 60
 Using the template system in Python is a two-step process:
58 61
 
@@ -279,7 +282,7 @@ these variables resolve to the corresponding Python objects.
279 282
 Playing with Context objects
280 283
 ----------------------------
281 284
 
282  
-.. class:: django.template.Context
  285
+.. class:: Context
283 286
 
284 287
 Most of the time, you'll instantiate ``Context`` objects by passing in a
285 288
 fully-populated dictionary to ``Context()``. But you can add and delete items
@@ -297,9 +300,9 @@ dictionary syntax::
297 300
     >>> c['newvariable']
298 301
     'hello'
299 302
 
300  
-.. method:: pop()
301  
-.. method:: push()
302  
-.. exception:: django.template.ContextPopException
  303
+.. method:: Context.pop()
  304
+.. method:: Context.push()
  305
+.. exception:: ContextPopException
303 306
 
304 307
 A ``Context`` object is a stack. That is, you can ``push()`` and ``pop()`` it.
305 308
 If you ``pop()`` too much, it'll raise
@@ -348,7 +351,7 @@ you'll see below.
348 351
 Subclassing Context: RequestContext
349 352
 -----------------------------------
350 353
 
351  
-.. class:: django.template.RequestContext
  354
+.. class:: RequestContext
352 355
 
353 356
 Django comes with a special ``Context`` class,
354 357
 ``django.template.RequestContext``, that acts slightly differently than the
@@ -450,6 +453,8 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
450 453
   ``django.contrib.auth.context_processors.PermWrapper``, representing the
451 454
   permissions that the currently logged-in user has.
452 455
 
  456
+.. currentmodule:: django.core.context_processors
  457
+
453 458
 django.core.context_processors.debug
454 459
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
455 460
 
@@ -486,7 +491,7 @@ value of the :setting:`MEDIA_URL` setting.
486 491
 django.core.context_processors.static
487 492
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
488 493
 
489  
-.. function:: django.core.context_processors.static
  494
+.. function:: static
490 495
 
491 496
 If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
492 497
 ``RequestContext`` will contain a variable ``STATIC_URL``, providing the

0 notes on commit 3d25f59

Please sign in to comment.
Something went wrong with that request. Please try again.