diff --git a/ChangeLog b/ChangeLog index d58d8219a..0fbfbb52f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,15 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-08-15 Michal Cihar + * Documentation.html, config.inc.php3, db_details.php3, db_search.php3, + ldi_table.php3, main.php3, tbl_indexes.php3, tbl_properties.inc.php3, + tbl_properties_operations.php3, tbl_properties_options.php3, + tbl_properties_structure.php3, tbl_query_box.php3, tbl_select.php3, + user_details.php3, libraries/common.lib.php3: + Implemented feature #545379 - phpMyAdmin has now support for all MySQL + manuals available. + 2002-08-15 Alexander M. Turek * main.php3: Undefined variable. diff --git a/Documentation.html b/Documentation.html index 93b4c8e00..f2b43dd95 100755 --- a/Documentation.html +++ b/Documentation.html @@ -1,4 +1,4 @@ - @@ -1138,10 +1138,27 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'

-
$cfg['ManualBaseShort'] string
+
$cfg['MySQLManualBase'] string
- If set to an URL which points to the MySQL documentation (on short - pages), appropriate help links are generated. + If set to an URL which points to the MySQL documentation (type depends + on $cfg['MySQLManualType']), appropriate help links are generated. +
+ See MySQL + Documentation page for more information about MySQL manuals and + their types. +

+
+ +
$cfg['MySQLManualType'] string
+
+ Type of MySQL documentation: +
    +
  • old - old style used in phpMyAdmin 2.3.0 and sooner
    • +
  • searchable - "Searchable, with user comments"
    • +
  • chapters - "HTML, one page per chapter"
    • +
  • big - "HTML, all on one page"
    • +
  • none - do not show documentation links
    • +


diff --git a/config.inc.php3 b/config.inc.php3 index 0d7d231b0..4ef17a385 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -225,10 +225,22 @@ $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; /** - * Link to the official MySQL documentation - * Be sure to include no trailing slash on the path + * Link to the official MySQL documentation. + * Be sure to include no trailing slash on the path. + * See http://www.mysql.com/documentation/index.html for more information + * about MySQL manuals and their types. */ -$cfg['ManualBaseShort'] = 'http://www.mysql.com/doc'; +$cfg['MySQLManualBase'] = 'http://www.mysql.com/doc/en'; + +/** + * Type of MySQL documentation: + * old - old style used in phpMyAdmin 2.3.0 and sooner + * searchable - "Searchable, with user comments" + * chapters - "HTML, one page per chapter" + * big - "HTML, all on one page" + * none - do not show documentation links + */ +$cfg['MySQLManualType'] = 'searchable'; /** diff --git a/db_details.php3 b/db_details.php3 index 9893e8bcc..ea563e813 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -59,7 +59,7 @@ $is_upload = (PMA_PHP_INT_VERSION >= 40000 && function_exists('ini_get')) -  :
+  :