Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2015-02-03 16:00:48 +0300
committerMarc Delisle <marc@infomarc.info>2015-02-03 16:00:48 +0300
commit50619593bd791aa27070fccbdd4d2d073228bc95 (patch)
tree76e7401a534e937372caccb1d78a599423f3e69a /doc
parente874cafeb1fde6debdc8a7630b142c3cb915fede (diff)
Bug Incorrect link in doc
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'doc')
-rw-r--r--doc/setup.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/setup.rst b/doc/setup.rst
index a66b0e5bf8..bfd001c102 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -162,8 +162,8 @@ For a full explanation of possible configuration values, see the
Using Setup script
------------------
-Instead of manually editing :file:`config.inc.php`, you can use the `Setup
-Script <setup/>`_. First you must manually create a folder ``config``
+Instead of manually editing :file:`config.inc.php`, you can use phpMyAdmin's
+setup feature. First you must manually create a folder ``config``
in the phpMyAdmin directory. This is a security measure. On a
Linux/Unix system you can use the following commands:
@@ -191,7 +191,7 @@ 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. If you have an existing configuration,
+Next, open your browser and visit the location where you installed phpMyAdmin, with the ``/setup`` suffix. 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 you explicitly choose ``Save``**
from the *Configuration* area of the screen. Normally the script saves the new