Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'QA_4_6'
  • Loading branch information
nijel committed Nov 28, 2016
2 parents 73f1007 + 4d26bec commit 4e81f88
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Expand Up @@ -36,6 +36,8 @@ phpMyAdmin - ChangeLog
- issue #12352 Added password strength indicator

4.6.6 (not yet released)

4.6.5.1 (2016-11-25)
- issue #12735 Incorrect parameters to escapeString in Node.php
- issue #12734 Fix PHP error when mbstring is not installed
- issue #12736 Don't force partition count to be specified when creating a new table
Expand Down
6 changes: 3 additions & 3 deletions doc/setup.rst
Expand Up @@ -213,11 +213,11 @@ By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
documentation for `MariaDB container <https://hub.docker.com/r/_/mariadb/>`_
or `MySQL container <https://hub.docker.com/r/_/mysql/>`_.

Additionally configuration can be tweaked by :file:`/www/config.user.inc.php`. If
Additionally configuration can be tweaked by :file:`/etc/phpmyadmin/config.user.inc.php`. If
this file exists, it will be loaded after configuration generated from above
environment variables, so you can override any configuration variable. This
configuraiton can be added as a volume when invoking docker using
`-v /some/local/directory/config.user.inc.php:/www/config.user.inc.php` parameters.
`-v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php` parameters.

.. seealso::

Expand All @@ -228,7 +228,7 @@ Docker Volumes

You can use following volumes to customise image behavior:

:file:`/www/config.user.inc.php`
:file:`/etc/phpmyadmin/config.user.inc.php`

Can be used for additional settings, see previous chapter for more details.

Expand Down

0 comments on commit 4e81f88

Please sign in to comment.