diff --git a/Documentation.html b/Documentation.html index a788bfab4..98c6bea2e 100755 --- a/Documentation.html +++ b/Documentation.html @@ -165,9 +165,11 @@
  • Ensure that all the scripts have the appropriate owner (if PHP is running in safe mode, having some scripts with an owner different from the owner of other scripts will be a - problem). See FAQ 4.2 for suggestions.
    • -
  • Create the file config.inc.php. You can use setup script - provided in distribution (FAQ 4.2 and + FAQ 1.26 for suggestions.
    • +
  • Create the file config.inc.php in the main (top-level) + directory (the one that contains index.php). + You can use setup script provided in distribution (scripts/setup.php) to create basics of config file. See Setup chapter for details. If you don't like setup or want to fine tune resulting @@ -180,7 +182,7 @@ for an explanation of all values. Please also read the remaining of this Installation section for information about authentication modes and the linked-tables infrastructure.
  • If you are using the - config auth_type, it is suggested that you protect the phpMyAdmin + auth_type configuration directive, it is suggested that you protect the phpMyAdmin installation directory, for example with HTTP–AUTH in a .htaccess file. See the multi–user sub–section of this FAQ for additional @@ -190,10 +192,10 @@ in your browser. phpMyAdmin should now display a welcome screen and your databases, or a login dialog if using HTTP or cookie authentication mode.
    • -
  • You should deny access to libraries subfolder in your webserver +
  • You should deny access to the libraries subfolder in your webserver configuration. For Apache you can use supplied .htaccess file in that folder, for other webservers, you should configure this yourself. - Such configuration prevents from possible path expossure and cross + Such configuration prevents from possible path exposure and cross side scripting vulnerabilities that might happen to be found in that code.
    • @@ -203,12 +205,25 @@ Since 2.8.0 phpMyAdmin comes with a setup script that can help you with creating configuration. This script is located in scripts folder: scripts/setup.php. Its usage is quite - simple. In case you just want to download configuration, you don't have to - perform any additional actions. For saving file on webserver, or loading - previous configuration you have to create config directory in +simple. You follow the dialogs and this script prepares in memory the +configuration directives. You then have two choices for saving the +configuration file: +
      +
    1. Download it to your local workstation, then upload (for example + with ftp) to your main phpMyAdmin directory. In this case, you + don't have to prepare a special config directory, so + no further actions are necessary.
      2. +
    2. Save the file to your webserver into config directory. +
      3. +
    +

    +

    + For saving file on webserver, or loading + previous configuration you have to create config directory in phpMyAdmin's top level directory and make it writable to web server. For loading previous configuration, place it there (and make sure it has write - permissions for webserver). You can use following commands: + permissions for webserver). On a Linux/UNIX server you can use the + following commands: 

         cd phpMyAdmin
@@ -218,11 +233,17 @@
     cp config.inc.php config/           # copy current configuration
     chmod o+w config/config.inc.php     # give it world writable permissions
    +

    On a Windows system, create a config in the main phpMyAdmin + directory and ensure that your web server has read/write access to it. + FAQ 1.26 can help you about this. If you already have + an existing config.inc.php in your main directory, copy it to the + newly created config directory. +

    - Then you can open setup.php in your browser and perform + Then you can open scripts/setup.php in your browser and perform setup. After saving your configuration move generated configuration to top - level directory and delete created config directory. Do not - forget to remove world write permissions on config.inc.php! + level directory and delete created config directory. Do not + forget to remove world write permissions on config.inc.php!

    Please note that it does not allow to configure everything, so for some