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

django/contrib/localflavor/us/us_states.py

@@ -15,7 +15,7 @@ STATE_CHOICES = (
     ('CA', 'California'),
     ('CO', 'Colorado'),
     ('CT', 'Connecticut'),
-    ('DE', 'Deleware'),
+    ('DE', 'Delaware'),
     ('DC', 'District of Columbia'),
     ('FM', 'Federated States of Micronesia'),
     ('FL', 'Florida'),
@@ -97,6 +97,7 @@ STATES_NORMALIZED = {
     'de': 'DE',
     'del': 'DE',
     'delaware': 'DE',
+    'deleware': 'DE',
     'district of columbia': 'DC',
     'federated states of micronesia': 'FM',
     'fl': 'FL',

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
 =======================
 

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
 ~~~~~~~

tests/regressiontests/forms/localflavor.py

@@ -193,7 +193,7 @@ as its choices.
 <option value="CA">California</option>
 <option value="CO">Colorado</option>
 <option value="CT">Connecticut</option>
-<option value="DE">Deleware</option>
+<option value="DE">Delaware</option>
 <option value="DC">District of Columbia</option>
 <option value="FM">Federated States of Micronesia</option>
 <option value="FL">Florida</option>