From 975870337b02b19e4afcbf4c9467c21e6c7a387f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 25 Nov 2013 08:06:54 -0500 Subject: [PATCH] - bug #4163 Setup script does not recognize manually-configured server - Improve English --- ChangeLog | 1 + doc/setup.rst | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bd2cca543..52224dcf5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3939 PHP NavigationTree error when paging through list - bug #4075 Support A10 Networks load balancer - bug #4083 row deleting isn't binlogs friendly +- bug #4163 Setup script does not recognize manually-configured server 4.0.9.0 (2013-11-04) - bug #4104 Can't edit updatable view when searching diff --git a/doc/setup.rst b/doc/setup.rst index 850d67a2c9..6e4c6f1fe9 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -43,8 +43,8 @@ Quick Install some advanced features. -Manualy creating file ---------------------- +Manually creating the file +-------------------------- To manually create the file, simply use your text editor to create the file :file:`config.inc.php` (you can copy :file:`config.sample.inc.php` to get @@ -115,14 +115,15 @@ On other platforms, simply create the folder and ensure that your web server has read and write access to it. :ref:`faq1_26` can help with this. -Next, open ``setup/`` in your browser. Note that **changes are -not saved to disk until explicitly choose ``Save``** from the -*Configuration* area of the screen. Normally the script saves the new +Next, open ``setup/`` in your browser. If you have an existing configuration, +use the ``Load`` button to bring its content inside the setup panel. +Note that **changes are not saved to disk until explicitly choose ``Save``** +from the *Configuration* area of the screen. Normally the script saves the new :file:`config.inc.php` to the ``config/`` directory, but if the webserver does not have the proper permissions you may see the error "Cannot load or save configuration." Ensure that the ``config/`` directory exists and has the proper permissions - or use the ``Download`` link to save the -config file locally and upload (via FTP or some similar means) to the +config file locally and upload it (via FTP or some similar means) to the proper location. Once the file has been saved, it must be moved out of the ``config/``