Edited docs/settings.txt changes from [6545]
Edited docs/settings.txt changes from [6545]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6772 bcc190cf-cafb-0310-a4f2-bffc1f526a37

--HG--
extra : convert_revision : b1e0d6bc6628bca29f0d15de7f883bf3961aeb34

heracek/django-nonrel,adieu/django-nonrel,heracek/django-nonrel,heracek/django-nonrel,adieu/django-nonrel,adieu/django-nonrel