summaryrefslogtreecommitdiff
path: root/docs/settings.txt
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-11-29 20:02:43 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-11-29 20:02:43 +0000
commit71012a4be3830b1040815243ebb7c0d48dbd8e57 (patch)
treee66d2227298cc0bccc4ef874d023a4ef29c60c52 /docs/settings.txt
parentf6d48b5d02acc7cd8d71ffe895fbf41c7c9ae2b7 (diff)
[multi-db] Merge trunk to [3812]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
-rw-r--r--docs/settings.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index fe2c566aee..6764f01513 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -603,6 +603,12 @@ Whether to prepend the "www." subdomain to URLs that don't have it. This is
only used if ``CommonMiddleware`` is installed (see the `middleware docs`_).
See also ``APPEND_SLASH``.
+PROFANITIES_LIST
+----------------
+
+A list of profanities that will trigger a validation error when the
+``hasNoProfanities`` validator is called.
+
ROOT_URLCONF
------------