summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-05-27 19:59:49 +0200
committerGitHub <noreply@github.com>2019-05-27 19:59:49 +0200
commitb6c4766f53cf00bcf63cc2aa8be977c8589d083e (patch)
tree7433fc163e14691496f4014ce7d27a2a11d43a31 /docs/ref
parent5ec44973dc2add8ced1ba50659344b52cec845e5 (diff)
Refs #29548 -- Updated docs for MariaDB support.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/databases.txt12
-rw-r--r--docs/ref/models/options.txt2
-rw-r--r--docs/ref/settings.txt2
3 files changed, 14 insertions, 2 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index cb55f680e3..3109146136 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -268,6 +268,18 @@ non-durable <https://www.postgresql.org/docs/current/non-durability.html>`_.
a development machine where you can easily restore the entire contents of
all databases in the cluster.
+.. _mariadb-notes:
+
+MariaDB notes
+=============
+
+.. versionadded:: 3.0
+
+Django supports MariaDB 10.1 and higher.
+
+To use MariaDB, use the MySQL backend, which is shared between the two. See the
+:ref:`MySQL notes <mysql-notes>` for more details.
+
.. _mysql-notes:
MySQL notes
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
index 6a50da5184..e09547ec23 100644
--- a/docs/ref/models/options.txt
+++ b/docs/ref/models/options.txt
@@ -72,7 +72,7 @@ If your database table name is an SQL reserved word, or contains characters that
aren't allowed in Python variable names -- notably, the hyphen -- that's OK.
Django quotes column and table names behind the scenes.
-.. admonition:: Use lowercase table names for MySQL
+.. admonition:: Use lowercase table names for MariaDB and MySQL
It is strongly advised that you use lowercase table names when you override
the table name via ``db_table``, particularly if you are using the MySQL
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index b6b6f20afe..31700d6088 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -487,7 +487,7 @@ SQLite. This can be configured using the following::
}
}
-When connecting to other database backends, such as MySQL, Oracle, or
+When connecting to other database backends, such as MariaDB, MySQL, Oracle, or
PostgreSQL, additional connection parameters will be required. See
the :setting:`ENGINE <DATABASE-ENGINE>` setting below on how to specify
other database types. This example is for PostgreSQL::