From 4d26bec55acd47cc2b5298802269284b3d16b374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 28 Nov 2016 10:25:05 +0100 Subject: [PATCH] Adjust docs to latest Docker image changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/setup.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 0d81254226..431abf1872 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -157,11 +157,11 @@ By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and documentation for `MariaDB container `_ or `MySQL container `_. -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:: @@ -172,7 +172,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.