From 03b46fc8d0223bc884ff9f7728405367eae7e2fc Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sun, 22 Apr 2007 04:21:04 +0000
Subject: unicode: Added FILE_CHARSET setting and use it to decode files read
 from disk. Based on a patch from Ivan Sagalaev. Fixed #4021.

git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/settings.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs')

diff --git a/docs/settings.txt b/docs/settings.txt
index 45bdfa573d..ade94c9a18 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -426,6 +426,14 @@ Subject-line prefix for e-mail messages sent with ``django.core.mail.mail_admins
 or ``django.core.mail.mail_managers``. You'll probably want to include the
 trailing space.
 
+FILE_CHARSET
+------------
+
+Default: ``'utf-8'``
+
+The character encoding used to decode any files read from disk. This includes
+template files and initial SQL data files.
+
 FIXTURE_DIRS
 -------------
 
-- 
cgit v1.3