summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-01 06:19:01 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-06-01 06:19:01 +0000
commit7a30b4e03ae8848792bd114741bc2fb175d280a4 (patch)
tree530a7af8a35e1e94bb14ac5884df09ef8c94b690 /docs
parent797c1d2a858bce0ae728c7bb2274e5b9a5b2423e (diff)
unicode: Merged from trunk up to [5398].
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/testing.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/testing.txt b/docs/testing.txt
index d36d5204e2..dedb1e15a8 100644
--- a/docs/testing.txt
+++ b/docs/testing.txt
@@ -147,7 +147,7 @@ doctests or unit tests are right for you.
If you've been using Python for a while, ``doctest`` will probably feel more
"pythonic". It's designed to make writing tests as easy as possible, so
there's no overhead of writing classes or methods; you simply put tests in
-docstrings. This gives the added advantage of given your modules automatic
+docstrings. This gives the added advantage of giving your modules automatic
documentation -- well-written doctests can kill both the documentation and the
testing bird with a single stone.
@@ -579,7 +579,7 @@ control the particular collation used by the test database with the
``TEST_DATABASE_COLLATION`` setting. Refer to the settings_ documentation for
details of these advanced settings.
-.. _settings: ../settings.txt
+.. _settings: ../settings/
The test database is created by the user in the ``DATABASE_USER`` setting.
This user needs to have sufficient privileges to create a new database on the