summaryrefslogtreecommitdiff
path: root/docs/testing.txt
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-12-04 21:12:29 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-12-04 21:12:29 +0000
commit55d7f6519c8d13a685cff3f9873b5784fc511a87 (patch)
tree60fb20e60dbf1f2505cce84f6807f6cdde40e261 /docs/testing.txt
parent0162eac9e2cd317476dd4086c36caf138c96f6bc (diff)
[multi-db] Merged trunk to [4158]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/testing.txt')
-rw-r--r--docs/testing.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/testing.txt b/docs/testing.txt
index 68eff07788..a0b8a8a187 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -133,7 +133,7 @@ together, picking the test system to match the type of tests you need to
write.
For developers new to testing, however, this choice can seem
-confusing, so here are a few key differences to help you decide weather
+confusing, so here are a few key differences to help you decide whether
doctests or unit tests are right for you.
If you've been using Python for a while, ``doctest`` will probably feel more