diff --git a/Documentation.html b/Documentation.html index 0900166ddd..36560046a5 100755 --- a/Documentation.html +++ b/Documentation.html @@ -369,18 +369,22 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
- Warning for Mac users: PHP seems not to like + Warning for Mac users: PHP does not seem to like Mac end of lines character ("\r"). So ensure you choose the option that allows to use the *nix end of line character - ("\n") in your text editor before registering a script + ("\n") in your text editor before saving a script you have modified.
Configuration note:
- Almost all configurable data is placed in config.inc.php. The
- parameters which relate to design (like colors) are placed in
- themes/themename/layout.inc.php. You
+ Almost all configurable data is placed in config.inc.php. If this file
+ does not exist, please refer to the Quick install
+ section to create one. This file only needs to contain the parameters you want to
+ change from their default value in config.default.php.
+
+ The parameters which relate to design (like colors)
+ are placed in themes/themename/layout.inc.php. You
might also want to modify config.footer.inc.php and
config.header.inc.php files to add your site specific code to be
included on start and end of each page.
@@ -442,9 +446,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
$cfg['Servers'][$i]['host'] contains the hostname of the first
server, the second $cfg['Servers'][$i]['host'] the hostname of
the second server, etc.
- In configuration defaults file, there is just one section for server
- definition, howerver you can have as much as you need, just copy that
- block or needed parts (you don't have to define all settings, just
+ In config.default.php, there is just one section for server
+ definition, however you can put as many as you need in config.inc.php,
+ just copy that block or needed parts (you don't have to define all settings, just
those you need to change).