Django

Code

Changeset 5003

Show
Ignore:
Timestamp:
04/12/07 18:39:58 (2 years ago)
Author:
bouldersprinters
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/boulder-oracle-sprint/django/contrib/localflavor/us/us_states.py

    r4990 r5003  
    1616    ('CO', 'Colorado'), 
    1717    ('CT', 'Connecticut'), 
    18     ('DE', 'Deleware'), 
     18    ('DE', 'Delaware'), 
    1919    ('DC', 'District of Columbia'), 
    2020    ('FM', 'Federated States of Micronesia'), 
    …… 
    9898    'del': 'DE', 
    9999    'delaware': 'DE', 
     100    'deleware': 'DE', 
    100101    'district of columbia': 'DC', 
    101102    'federated states of micronesia': 'FM', 

  • django/branches/boulder-oracle-sprint/docs/install.txt

    r4842 r5003  
    7171.. _pysqlite: http://initd.org/tracker/pysqlite 
    7272 
     73Remove any old versions of Django 
     74================================= 
     75 
     76If you are upgrading your installation of Django from a previous version,  
     77you will need to uninstall the old Django version before installing the  
     78new version.  
     79 
     80If you installed Django using ``setup.py install``, uninstalling 
     81is as simple as deleting the ``django`` directory from your Python  
     82``site-packages``. 
     83 
     84If you installed Django from a Python Egg, remove the Django ``.egg` file, 
     85and remove the reference to the egg in the file named ``easy-install.pth``.  
     86This file should also be located in your ``site-packages`` directory. 
     87 
     88.. admonition:: Where are my ``site-packages`` stored? 
     89 
     90    The location of the ``site-packages`` directory depends on the operating 
     91    system, and the location in which Python was installed. However, the 
     92    following locations are common: 
     93     
     94    * If you're using Linux: ``/usr/lib/python2.X/site-packages`` 
     95 
     96    * If you're using Windows: ``C:\Python2.X\lib\site-packages`` 
     97 
     98    * If you're using MacOSX: ``/Library/Python2.X/site-packages`` 
     99 
    73100Install the Django code 
    74101======================= 

  • django/branches/boulder-oracle-sprint/docs/templates.txt

    r4906 r5003  
    703703"raw" value. In this example, "f" is backslash-escaped, because otherwise 
    704704"f" is a format string that displays the time. The "o" doesn't need to be 
    705 escaped, because it's not a format character.:: 
     705escaped, because it's not a format character:: 
    706706 
    707707    It is the {% now "jS o\f F" %} 
    708708 
    709 (Displays "It is the 4th of September" %} 
     709This would display as "It is the 4th of September". 
    710710 
    711711regroup 

  • django/branches/boulder-oracle-sprint/tests/regressiontests/forms/localflavor.py

    r4990 r5003  
    194194<option value="CO">Colorado</option> 
    195195<option value="CT">Connecticut</option> 
    196 <option value="DE">Deleware</option> 
     196<option value="DE">Delaware</option> 
    197197<option value="DC">District of Columbia</option> 
    198198<option value="FM">Federated States of Micronesia</option>