Permalink
Browse files

[multi-db] Merged trunk to [4100]. Some tests still failing.

  • Loading branch information...
1 parent 478ebad commit 0162eac9e2cd317476dd4086c36caf138c96f6bc @jpellerin jpellerin committed Dec 4, 2006
View
@@ -51,6 +51,7 @@ answer newbie questions, and generally made Django that much better:
Jiri Barton
Ned Batchelder <http://www.nedbatchelder.com/>
Shannon -jj Behrens <http://jjinux.blogspot.com/>
+ Esdras Beleza <linux@esdrasbeleza.com>
James Bennett
Paul Bissex <http://e-scribe.com/>
Simon Blanchard
@@ -101,7 +101,7 @@
DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
-DATABASE_OPTIONS = {} # Set to empy dictionary for default.
+DATABASE_OPTIONS = {} # Set to empty dictionary for default.
# Optional named database connections in addition to the default.
OTHER_DATABASES = {}
Binary file not shown.
Oops, something went wrong.

0 comments on commit 0162eac

Please sign in to comment.