diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 20:16:50 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-11-29 20:16:50 +0000 |
| commit | f8217026f9618adb65ab2d517025e87b98ed2fbe (patch) | |
| tree | 2ab846582343dc9b0894b0bdffa3fe04f590365b /docs/settings.txt | |
| parent | 9a01534370a272e59f2bb64251d1f46218a32516 (diff) | |
[multi-db] Merge trunk to [3850]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
| -rw-r--r-- | docs/settings.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/settings.txt b/docs/settings.txt index 6764f01513..57483cbef3 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -606,8 +606,11 @@ See also ``APPEND_SLASH``. PROFANITIES_LIST ---------------- -A list of profanities that will trigger a validation error when the -``hasNoProfanities`` validator is called. +A tuple of profanities, as strings, that will trigger a validation error when +the ``hasNoProfanities`` validator is called. + +We don't list the default values here, because that would be profane. To see +the default values, see the file ``django/conf/global_settings.py``. ROOT_URLCONF ------------ |