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

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

--HG--
extra : convert_revision : e4bd482cb288efa3bd78db213f8630f5d578227f

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