summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 09:13:13 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-24 09:13:13 +0000
commitdceac0a3847d606a12beadbe29b345e842028701 (patch)
tree40aaea9b4a0449134ab001a7dc8a71e96734ef52 /docs
parenta09cb2a9e57b7a8239a3197601427ec89f207910 (diff)
unicode: Added a "new in development version" marker to FILE_CHARSET.
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/settings.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index 0d5abe4a10..734a9ef383 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -440,6 +440,8 @@ Whether to use a TLS (secure) connection when talking to the SMTP server.
FILE_CHARSET
------------
+**New in Django development version**
+
Default: ``'utf-8'``
The character encoding used to decode any files read from disk. This includes