Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kenneth Reitz 2012-05-30 01:23:55 -04:00
commit cf91cafcd3

View file

@ -11,11 +11,11 @@ Usage
Configure your database in ``settings.py`` from ``DATABASE_URL``::
DATABASES['default'] = dj_database_url.config()
DATABASES = {'default': dj_database_url.config()}
Parse an arbitrary Database URL::
DATABASES['default'] = dj_database_url.parse('postgres://...')
DATABASES = {'default': dj_database_url.parse('postgres://...')}
Supported databases
-------------------