Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

doc/setup.rst

@@ -157,16 +157,30 @@ 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:`/config.user.inc.php`. If
+Additionally configuration can be tweaked by :file:`/www/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:/config.user.inc.php` parameters.
+`-v /some/local/directory/config.user.inc.php:/www/config.user.inc.php` parameters.
 
 .. seealso:: 
    
     See :ref:`config` for detailed description of configuration options.
 
+Docker Volumes
+--------------
+
+You can use following volumes to customise image behavior:
+
+:file:`/www/config.user.inc.php`
+
+    Can be used for additional settings, see previous chapter for more details.
+
+:file:`/sessions/`
+
+    Directory where PHP sessions are stored. You might want to share this 
+    for example when uswing :ref:`auth_signon`.
+
 Docker Examples
 ---------------
 

libraries/Advisor.php

@@ -463,8 +463,9 @@ class Advisor
         $lines = array();
 
         if ($file === FALSE) {
-            $errors[] = __(
-                'Error in reading file: The file \'' . $filename .'\' does not exist or is not readable'
+            $errors[] = sprintf(
+                __('Error in reading file: The file \'%s\' does not exist or is not readable!'),
+                $filename
             );
             return array('rules' => $rules, 'lines' => $lines, 'errors' => $errors);
         }