X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=docs%2FINSTALL;h=d40ddd2e7d072528728dbee47c4204a45b36e2ac;hb=e4f09a3605ea8f1efeeb6cae1fdf3bba9dbd412c;hp=5716ed231b59ac36dc6e4e3f68ad17e3011cb67e;hpb=b49c71899e27592eee03b3caefbce26a411c6099;p=patchwork

diff --git a/docs/INSTALL b/docs/INSTALL
index 5716ed2..d40ddd2 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -52,16 +52,20 @@ in brackets):
         settings, using local_settings.py (see below) to override the defaults
         in settings.py:
 
-        DATABASE_ENGINE = 'postgresql_psycopg2'
-        DATABASE_NAME = 'patchwork'
-        DATABASE_USER = 'patchwork'
-        DATABASE_PASSWORD = 'my_secret_password
-        DATABASE_HOST = 'localhost'
-        DATABASE_PORT = ''
+        DATABASES = {
+            'default': {
+                'ENGINE': 'django.db.backends.postgresql_psycopg2',
+                'HOST': 'localhost',
+                'PORT': '',
+                'USER': 'patchwork',
+                'PASSWORD': 'my_secret_password',
+                'NAME': 'patchwork',
+            },
+        }
 
     For MySQL:
         $ mysql
-        > CREATE DATABASE 'patchwork';
+        > CREATE DATABASE 'patchwork' CHARACTER SET utf8;
         > CREATE USER 'www-data'@'localhost' IDENTIFIED BY '<password>';
         > CREATE USER 'nobody'@'localhost' IDENTIFIED BY '<password>';
 
@@ -69,12 +73,21 @@ in brackets):
 	settings, using local_settings.py (see below) to override the defaults
 	in settings.py:
 
-	DATABASE_ENGINE = 'mysql'
-	DATABASE_NAME = 'patchwork'
-	DATABASE_USER = 'root'
-	DATABASE_PASSWORD = 'my_secret_root_password'
-	DATABSE_HOST = 'localhost'
-	DATABASE_PORT = ''
+        DATABASES = {
+            'default': {
+                'ENGINE': 'django.db.backends.mysql',
+                'HOST': 'localhost',
+                'PORT': '',
+                'USER': 'patchwork',
+                'PASSWORD': 'my_secret_password',
+                'NAME': 'patchwork',
+                'TEST_CHARSET': 'utf8',
+            },
+        }
+
+        TEST_CHARSET is used when creating tables for the test suite. Without
+        it, tests checking for the correct handling of non-ASCII characters
+        fail.
 
 2. Django setup