summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob McDonald <github@t4ac.com>2016-03-04 10:24:23 +0900
committerTim Graham <timograham@gmail.com>2016-03-05 09:09:51 -0500
commite16a0b0998e456d011327a28ce68ba8afbddfa9a (patch)
tree33ff0410b52c19862d2b8ebcdd3e6cc460341c7f
parent9c195d45a64b0d2baee218e617ca3a762efc0bf5 (diff)
[1.9.x] Fixed #26312 -- Documented "create database" requirement in tutorial 2.
Backport of b388c294eb5745b3e01dedf0220636fae87ea9a2 from master
-rw-r--r--docs/intro/tutorial02.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
index fbf15e8d1b..53daae9135 100644
--- a/docs/intro/tutorial02.txt
+++ b/docs/intro/tutorial02.txt
@@ -41,11 +41,16 @@ If you are not using SQLite as your database, additional settings such as
:setting:`USER`, :setting:`PASSWORD`, and :setting:`HOST` must be added.
For more details, see the reference documentation for :setting:`DATABASES`.
-.. note::
+.. admonition:: For non-SQLite users
- If you're using PostgreSQL or MySQL, make sure you've created a database by
- this point. Do that with "``CREATE DATABASE database_name;``" within your
- database's interactive prompt.
+ If you're using a database besides SQLite, make sure you've created a
+ database by this point. Do that with "``CREATE DATABASE database_name;``"
+ within your database's interactive prompt.
+
+ Also make sure that the database user provided in :file:`mysite/settings.py`
+ has "create database" privileges. This allows automatic creation of a
+ :ref:`test database <the-test-database>` which will be needed in a later
+ tutorial.
If you're using SQLite, you don't need to create anything beforehand - the
database file will be created automatically when it is needed.