Permalink
Browse files

Move TEST_CHARSET/TEST_COLLATION text up

  • Loading branch information...
1 parent fe0ac36 commit 4a5fc2f07987a33c3822ff63b06fd58019861366 @willkg willkg committed Mar 26, 2013
Showing with 7 additions and 8 deletions.
  1. +7 −8 docs/hacking_howto.rst
View
@@ -222,22 +222,21 @@ Start with this::
Don't forget to change ``<YOUR_PASSWORD>`` and update ``LESS_BIN``
based on your setup.
+Note the two settings ``TEST_CHARSET`` and ``TEST_COLLATION``. Without
+these, the test suite will use MySQL's (moronic) defaults when
+creating the test database (see below) and lots of tests will
+fail. Hundreds.
+
Now you can copy and modify any settings from ``settings.py`` into
``settings_local.py`` and the value will override the default.
Database
--------
-At a minimum, you will need to define a database connection. See above
-for a sample database configuration.
-
-Note the two settings ``TEST_CHARSET`` and ``TEST_COLLATION``. Without
-these, the test suite will use MySQL's (moronic) defaults when
-creating the test database (see below) and lots of tests will
-fail. Hundreds.
+You defined a database connection in ``kitsune/settings_local.py``.
-Create the database and grant permissions to the user, based on your
+Now create the database and grant permissions to the user, based on your
database settings. For example, using the settings above::
$ mysql -u root -p

0 comments on commit 4a5fc2f

Please sign in to comment.