diff options
| -rw-r--r-- | doc/config.rst | 3 | ||||
| -rw-r--r-- | doc/faq.rst | 2 | ||||
| -rw-r--r-- | doc/require.rst | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/doc/config.rst b/doc/config.rst index 47664bdb24..ead47baec4 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2112,8 +2112,7 @@ Languages Defines the default connection collation to use, if not user-defined. See the `MySQL documentation for charsets <http://dev.mysql.com/doc/mysql/en/charset-charsets.html>`_ - for list of possible values. This setting is - ignored when connected to Drizzle server. + for list of possible values. .. config:option:: $cfg['Lang'] diff --git a/doc/faq.rst b/doc/faq.rst index 80b12b7b90..f99a3114e2 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -195,8 +195,6 @@ For older MySQL versions, our `Downloads <https://www.phpmyadmin.net/downloads/> For `MariaDB <http://mariadb.org/>`_, versions 5.5 and newer are supported. -For `Drizzle <http://www.drizzle.org>`_, versions 7.1 and newer are supported. - .. _faq1_17a: 1.17a I cannot connect to the MySQL server. It always returns the error message, "Client does not support authentication protocol requested by server; consider upgrading MySQL client" diff --git a/doc/require.rst b/doc/require.rst index cb524632a3..db5730f12a 100644 --- a/doc/require.rst +++ b/doc/require.rst @@ -42,7 +42,6 @@ phpMyAdmin supports MySQL-compatible databases. * MySQL 5.5 or newer * MariaDB 5.5 or newer -* Drizzle .. seealso:: :ref:`faq1_17` |