Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Backport of 862a04a from master
  • Loading branch information...
commit 1a4233eef1e61f32fa66a719d16c405f38f6f8ad 1 parent d1a002a
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
@@ -296,9 +299,9 @@ dictionary syntax::
296 299
     >>> c['newvariable']
297 300
     'hello'
298 301
 
299  
-.. method:: pop()
300  
-.. method:: push()
301  
-.. exception:: django.template.ContextPopException
  302
+.. method:: Context.pop()
  303
+.. method:: Context.push()
  304
+.. exception:: ContextPopException
302 305
 
303 306
 A ``Context`` object is a stack. That is, you can ``push()`` and ``pop()`` it.
304 307
 If you ``pop()`` too much, it'll raise
@@ -347,7 +350,7 @@ you'll see below.
347 350
 Subclassing Context: RequestContext
348 351
 -----------------------------------
349 352
 
350  
-.. class:: django.template.RequestContext
  353
+.. class:: RequestContext
351 354
 
352 355
 Django comes with a special ``Context`` class,
353 356
 ``django.template.RequestContext``, that acts slightly differently than the
@@ -443,6 +446,8 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
443 446
   ``django.contrib.auth.context_processors.PermWrapper``, representing the
444 447
   permissions that the currently logged-in user has.
445 448
 
  449
+.. currentmodule:: django.core.context_processors
  450
+
446 451
 django.core.context_processors.debug
447 452
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
448 453
 
@@ -479,7 +484,7 @@ value of the :setting:`MEDIA_URL` setting.
479 484
 django.core.context_processors.static
480 485
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
481 486
 
482  
-.. function:: django.core.context_processors.static
  487
+.. function:: static
483 488
 
484 489
 If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
485 490
 ``RequestContext`` will contain a variable ``STATIC_URL``, providing the

0 notes on commit 1a4233e

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