summaryrefslogtreecommitdiff
path: root/docs/testing.txt
diff options
context:
space:
mode:
authorRobin Munn <robin.munn@gmail.com>2006-12-08 15:10:09 +0000
committerRobin Munn <robin.munn@gmail.com>2006-12-08 15:10:09 +0000
commit122426e7453ed638a0c5be7e8b925adcddea3889 (patch)
treea095a661aca53e0ceee021d93a2a503783b71c14 /docs/testing.txt
parentdadfca08c0db567ce33284aaa8eb388cf667a836 (diff)
sqlalchemy: Merged revisions 4054 to 4185 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@4186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/testing.txt')
-rw-r--r--docs/testing.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/testing.txt b/docs/testing.txt
index 19eef9f071..a0b8a8a187 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -10,7 +10,7 @@ used to validate that code behaves as expected. When refactoring or
modifying code, tests serve as a guide to ensure that behavior hasn't
changed unexpectedly as a result of the refactor.
-Testing an web application is a complex task, as there are many
+Testing a web application is a complex task, as there are many
components of a web application that must be validated and tested. To
help you test your application, Django provides a test execution
framework, and range of utilities that can be used to stimulate and
@@ -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