summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-01-23 04:32:34 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-01-23 04:32:34 +0000
commitdbad025637463c31ba9d99c47546b409b8190b4b (patch)
tree2db50b0b766ab24e9d04eaa741ec8152974fb792 /docs
parentc1584383fa7b83b9c00a40a1f0b367b91f2f7382 (diff)
Fixed #12668 -- Corrected some typos in the multi-db docs. Thanks to mattimustang for the eagle eyes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/db/multi-db.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/topics/db/multi-db.txt b/docs/topics/db/multi-db.txt
index 77f0b7a4d5..dde63f61ee 100644
--- a/docs/topics/db/multi-db.txt
+++ b/docs/topics/db/multi-db.txt
@@ -149,8 +149,8 @@ At present, the only hint that will be provided is ``instance``, an
object instance that is related to the read or write operation that is
underway. This might be the instance that is being saved, or it might
be an instance that is being added in a many-to-many relation. In some
-cases, no instance hint will be provided at all. The router check for
-the existence of an instance hint, and determine if hat hint should be
+cases, no instance hint will be provided at all. The router checks for
+the existence of an instance hint, and determine if that hint should be
used to alter routing behavior.
Using routers
@@ -192,11 +192,11 @@ An example
doesn't provide any solution for handling replication lag (i.e.,
query inconsistencies introduced because of the time taken for a
write to propagate to the slaves). It also doesn't consider the
- interaction of transactions with the database utiliztion strategy.
+ interaction of transactions with the database utilization strategy.
So - what does this mean in practice? Say you want ``contrib.auth`` to
exist on the 'credentials' database, and you want all other models in a
-master/slave relationship between the databses 'master', 'slave1' and
+master/slave relationship between the databases 'master', 'slave1' and
'slave2'. To implement this, you would need 2 routers::
class AuthRouter(object):