boulder-oracle-sprint: Merged to [4993].

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

2 files changed, 29 insertions, 2 deletions

diff --git a/docs/install.txt b/docs/install.txt
index dbbde93f83..35f593477b 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -70,6 +70,33 @@ installed.
 .. _SQLite: http://www.sqlite.org/
 .. _pysqlite: http://initd.org/tracker/pysqlite
 
+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 installed Django using ``setup.py install``, uninstalling
+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``. 
+This file should also be located in your ``site-packages`` directory.
+
+.. admonition:: Where are my ``site-packages`` stored?
+
+    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``
+
+    * If you're using MacOSX: ``/Library/Python2.X/site-packages``
+
 Install the Django code
 =======================
 
diff --git a/docs/templates.txt b/docs/templates.txt
index d93ee49ac1..82250c1f16 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -702,11 +702,11 @@ Example::
 Note that you can backslash-escape a format string if you want to use the
 "raw" value. In this example, "f" is backslash-escaped, because otherwise
 "f" is a format string that displays the time. The "o" doesn't need to be
-escaped, because it's not a format character.::
+escaped, because it's not a format character::
 
     It is the {% now "jS o\f F" %}
 
-(Displays "It is the 4th of September" %}
+This would display as "It is the 4th of September".
 
 regroup
 ~~~~~~~