Small formatting tweaks to named-end-blocks change from [4489]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4492 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 10 insertions, 5 deletions

diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py
index 0e11b12c21..4439e0b010 100644
--- a/django/template/loader_tags.py
+++ b/django/template/loader_tags.py
@@ -129,7 +129,7 @@ def do_block(parser, token):
         parser.__loaded_blocks.append(block_name)
     except AttributeError: # parser.__loaded_blocks isn't a list yet
         parser.__loaded_blocks = [block_name]
-    nodelist = parser.parse(('endblock','endblock %s' % block_name))
+    nodelist = parser.parse(('endblock', 'endblock %s' % block_name))
     parser.delete_first_token()
     return BlockNode(block_name, nodelist)
 
diff --git a/docs/templates.txt b/docs/templates.txt
index 9b3825f9f7..651866e52e 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -253,10 +253,15 @@ Here are some tips for working with inheritance:
       if you want to add to the contents of a parent block instead of
       completely overriding it.
 
-    * You can optionally name your ``{{ endblock }}`` tag with the same name
-      you gave the ``{{ block }}`` tag (for example, ``{{ endblock content }}``).
-      In larger templates this helps you see which ``{{ block }}`` tags are
-      being closed.
+    * **New in Django development version:** For extra readability, you can
+      optionally give a *name* to your ``{% endblock %}`` tag. For example::
+
+          {% block content %}
+          ...
+          {% endblock content %}
+
+      In larger templates, this technique helps you see which ``{% block %}``
+      tags are being closed.
 
 Finally, note that you can't define multiple ``{% block %}`` tags with the same
 name in the same template. This limitation exists because a block tag works in