diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2010-11-08 20:37:52 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2010-11-08 20:37:52 +0000 |
| commit | d30fe03e6bae5cc794be8c48a5867c3fb8aeceb2 (patch) | |
| tree | fc83adc9401626da53318d6cb30b22ce4da6b8b2 | |
| parent | d6e33795a90fe1cfd487acf230ddef1d9a28552a (diff) | |
Fixed #14641 - a handful of grammer/typo fixes.
Thanks, programmerq.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/index.txt | 2 | ||||
| -rw-r--r-- | docs/internals/committers.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/docs/index.txt b/docs/index.txt index f420b445f5..55e6cda983 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -21,7 +21,7 @@ Having trouble? We'd like to help! `post a question`_. * Ask a question in the `#django IRC channel`_, or search the `IRC logs`_ to see - if its been asked before. + if it's been asked before. * Report bugs with Django in our `ticket tracker`_. diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index ccb48fe4b0..c5eeeb9af9 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -101,7 +101,7 @@ and have free rein to hack on all parts of Django. Joseph Kocherhans Joseph is currently a developer at EveryBlock_, and previously worked for - the Lawrence Journal-World where he built most of the backend for the their + the Lawrence Journal-World where he built most of the backend for their Marketplace site. He often disappears for several days into the woods, attempts to teach himself computational linguistics, and annoys his neighbors with his Charango_ playing. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index abe4a443e5..78b5fd995e 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1241,14 +1241,11 @@ used if :class:`~django.middleware.common.CommonMiddleware` is installed PROFANITIES_LIST ---------------- +Default: ``()`` (Empty tuple) + 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`_. - -.. _django/conf/global_settings.py: http://code.djangoproject.com/browser/django/trunk/django/conf/global_settings.py - .. setting:: RESTRUCTUREDTEXT_FILTER_SETTINGS RESTRUCTUREDTEXT_FILTER_SETTINGS |