magic-removal: Merged to [2014]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2015 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/template/defaulttags.py

@@ -744,7 +744,7 @@ def spaceless(parser, token):
             <p>
                 <a href="foo/">Foo</a>
             </p>
-        {% spaceless %}
+        {% endspaceless %}
 
     This example would return this HTML::
 
@@ -757,7 +757,7 @@ def spaceless(parser, token):
             <strong>
                 Hello
             </strong>
-        {% spaceless %}
+        {% endspaceless %}
     """
     nodelist = parser.parse(('endspaceless',))
     parser.delete_first_token()

docs/templates.txt

@@ -677,7 +677,7 @@ Example usage::
         <p>
             <a href="foo/">Foo</a>
         </p>
-    {% spaceless %}
+    {% endspaceless %}
 
 This example would return this HTML::
 
@@ -690,7 +690,7 @@ this example, the space around ``Hello`` won't be stripped::
         <strong>
             Hello
         </strong>
-    {% spaceless %}
+    {% endspaceless %}
 
 ssi
 ~~~