summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2011-10-07 08:35:20 +0000
committerAymeric Augustin <aymeric.augustin@m4x.org>2011-10-07 08:35:20 +0000
commit510ea906f7e3fcf7bf80b35302d90373b7dffb3d (patch)
treeed2990766d4b35e936a0c3981b837f6f4cca76c1
parentb1b1da1eac93297503c04b8394fb98e38f552f5f (diff)
Fixed #17012 - Removed references to the 'hasNoProfanities' validator. Refs #8794.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py4
-rw-r--r--docs/ref/settings.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 29c9812be5..2ee79b8eb0 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -455,8 +455,8 @@ CACHE_MIDDLEWARE_ALIAS = 'default'
COMMENTS_ALLOW_PROFANITIES = False
-# The profanities that will trigger a validation error in the
-# 'hasNoProfanities' validator. All of these should be in lowercase.
+# The profanities that will trigger a validation error in
+# CommentDetailsForm.clean_comment. All of these should be in lowercase.
PROFANITIES_LIST = ()
##################
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 8c7fe8f6d8..b988a47136 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1488,8 +1488,8 @@ PROFANITIES_LIST
Default: ``()`` (Empty tuple)
-A tuple of profanities, as strings, that will trigger a validation error when
-the ``hasNoProfanities`` validator is called.
+A tuple of profanities, as strings, that will be forbidden in comments when
+:setting:`COMMENTS_ALLOW_PROFANITIES` is ``True``.
.. setting:: RESTRUCTUREDTEXT_FILTER_SETTINGS