From 9970d9d32e858c74ba13f64a810effe60629e70e Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Fri, 25 Nov 2016 22:36:14 -0500 Subject: [PATCH 1/3] Release 4.6.5.1 Signed-off-by: Isaac Bennetch --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70fd6ad236b8..508f6795dbb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -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 diff --git a/README b/README index 0f8671254a80..0a89d47dc244 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.6-dev +Version 4.6.5.1 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 1b34b9babc3e..99d29eabdae1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '4.6.6-dev' +version = '4.6.5.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index d164c9da6443..a4e22c37d2d8 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ public function __construct($source = null) */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.6-dev'); + $this->set('PMA_VERSION', '4.6.5.1'); /** * @deprecated */ From c1acb3a212872fd235446efa446c3531653a5917 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Sat, 26 Nov 2016 08:01:00 -0500 Subject: [PATCH 2/3] Prepare for 4.6.6-dev Signed-off-by: Isaac Bennetch --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eefc22760003..af4baff8e5c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +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 diff --git a/README b/README index 0a89d47dc244..0f8671254a80 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.5.1 +Version 4.6.6-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 99d29eabdae1..1b34b9babc3e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '4.6.5.1' +version = '4.6.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index a4e22c37d2d8..d164c9da6443 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ public function __construct($source = null) */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.5.1'); + $this->set('PMA_VERSION', '4.6.6-dev'); /** * @deprecated */ 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 3/3] 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 0d8125422670..431abf1872f4 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.