boulder-oracle-sprint: Merged to [5193]

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5194 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 11 insertions, 11 deletions

diff --git a/docs/install.txt b/docs/install.txt
index defa3e38ad..c68179cba9 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -56,7 +56,7 @@ installed.
   either ``postgresql`` [for version 1] or ``postgresql_psycopg2`` [for version 2].)
 
   If you're on Windows, check out the unofficial `compiled Windows version`_.
-  
+
 * If you're using MySQL, you'll need MySQLdb_, version 1.2.1p2 or higher.
   You will also want to read the database-specific notes for the `MySQL backend`_.
 
@@ -78,16 +78,16 @@ installed.
 Remove any old versions of Django
 =================================
 
-If you are upgrading your installation of Django from a previous version, 
-you will need to uninstall the old Django version before installing the 
-new version. 
+If you are upgrading your installation of Django from a previous version,
+you will need to uninstall the old Django version before installing the
+new version.
 
 If you installed Django using ``setup.py install``, uninstalling
-is as simple as deleting the ``django`` directory from your Python 
+is as simple as deleting the ``django`` directory from your Python
 ``site-packages``.
 
-If you installed Django from a Python Egg, remove the Django ``.egg` file,
-and remove the reference to the egg in the file named ``easy-install.pth``. 
+If you installed Django from a Python Egg, remove the Django ``.egg`` file,
+and remove the reference to the egg in the file named ``easy-install.pth``.
 This file should also be located in your ``site-packages`` directory.
 
 .. admonition:: Where are my ``site-packages`` stored?
@@ -95,7 +95,7 @@ This file should also be located in your ``site-packages`` directory.
     The location of the ``site-packages`` directory depends on the operating
     system, and the location in which Python was installed. However, the
     following locations are common:
-    
+
     * If you're using Linux: ``/usr/lib/python2.X/site-packages``
 
     * If you're using Windows: ``C:\Python2.X\lib\site-packages``
diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 853707f58c..08a287f572 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -717,7 +717,7 @@ object::
             # split_contents() knows not to split quoted strings.
             tag_name, format_string = token.split_contents()
         except ValueError:
-            raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents[0]
+            raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents.split()[0]
         if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
             raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
         return CurrentTimeNode(format_string[1:-1])
@@ -846,7 +846,7 @@ Now your tag should begin to look like this::
             # split_contents() knows not to split quoted strings.
             tag_name, date_to_be_formatted, format_string = token.split_contents()
         except ValueError:
-            raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents[0]
+            raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
         if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
             raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
         return FormatTimeNode(date_to_be_formatted, format_string[1:-1])
@@ -1080,7 +1080,7 @@ class, like so::
             # Splitting by None == splitting by spaces.
             tag_name, arg = token.contents.split(None, 1)
         except ValueError:
-            raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents[0]
+            raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents.split()[0]
         m = re.search(r'(.*?) as (\w+)', arg)
         if not m:
             raise template.TemplateSyntaxError, "%r tag had invalid arguments" % tag_name