diff --git a/ChangeLog b/ChangeLog
index 583deb692..e1f182c97 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-12-23  Marc Delisle  <lem9@users.sourceforge.net>
+	* links to new short doc pages are now completed
+
 2001-12-23  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_select.php3, lines 202-206: fixed bug #472728 - Many fields / IE 5.5
 	  or IE 6.
diff --git a/Documentation.html b/Documentation.html
index d8423f126..db47bb475 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -700,10 +700,10 @@
         <br /><br />
     </dd>
 
-    <dt><b>$cfgManualBase</b> string</dt>
+    <dt><b>$cfgManualBaseShort</b> string</dt>
     <dd>
-        If set to an URL which points to the MySQL documentation, appropriate
-        help links are generated.
+        If set to an URL which points to the MySQL documentation (on short
+        pages), appropriate help links are generated.
         <br /><br />
     </dd>
 
diff --git a/config.inc.php3 b/config.inc.php3
index c167df68b..116f924b2 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -140,7 +140,6 @@ $cfgBZipDump              = TRUE;   // dump files
  * Link to the official MySQL documentation
  * Be sure to include no trailing slash on the path
  */
-$cfgManualBase = 'http://www.mysql.com/documentation/mysql/bychapter';
 $cfgManualBaseShort = 'http://www.mysql.com/doc';
 
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 46d10b7d2..3b3e75580 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -875,23 +875,6 @@ window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
     } // end of the 'PMA_showMessage()' function
 
 
-    /**
-     * Displays a link to the official MySQL documentation
-     *
-     * @param   string  an anchor to move to
-     *
-     * @return  string  the html link
-     *
-     * @access  public
-     */
-    function PMA_showDocu($link)
-    {
-        if (!empty($GLOBALS['cfgManualBase'])) {
-            return '[<a href="' . $GLOBALS['cfgManualBase'] . '/' . $link .'" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
-        }
-    } // end of the 'PMA_showDocu()' function
-
-
     /**
      * Displays a link to the official MySQL documentation (short)
      *
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index a8d9eda63..2afdf5778 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -704,7 +704,7 @@ echo "\n";
             <input type="hidden" name="goto" value="tbl_properties.php3" />
             <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>" />
             <input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? urlencode($query_to_display) : ''); ?>" />
-            <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . ' ' . PMA_showDocu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
+            <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . ' ' . PMA_showDocuShort('S/E/SELECT.html'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
 <textarea name="sql_query" rows="<?php echo $cfgTextareaRows; ?>" cols="<?php echo $cfgTextareaCols; ?>" wrap="virtual" onfocus="this.select()">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE 1'); ?>
@@ -1040,7 +1040,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <td>
                 <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('CHECK TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strCheckTable; ?></a>&nbsp;
-                <?php echo PMA_showDocu('manual_Reference.html#CHECK_TABLE') . "\n"; ?>
+                <?php echo PMA_showDocuShort('C/H/CHECK_TABLE.html') . "\n"; ?>
             </td>
             <td>&nbsp;-&nbsp;</td>
             <?php
@@ -1051,7 +1051,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <td>
                 <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ANALYZE TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strAnalyzeTable; ?></a>&nbsp;
-                <?php echo PMA_showDocu('manual_Reference.html#ANALYZE_TABLE') . "\n";?>
+                <?php echo PMA_showDocuShort('A/N/ANALYZE_TABLE.html') . "\n";?>
             </td>
             <?php
         }
@@ -1067,7 +1067,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <td>
                 <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('REPAIR TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strRepairTable; ?></a>&nbsp;
-                <?php echo PMA_showDocu('manual_Reference.html#REPAIR_TABLE') . "\n"; ?>
+                <?php echo PMA_showDocuShort('R/E/REPAIR_TABLE.html') . "\n"; ?>
             </td>
             <td>&nbsp;-&nbsp;</td>
             <?php
@@ -1078,7 +1078,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <td>
                 <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strOptimizeTable; ?></a>&nbsp;
-                <?php echo PMA_showDocu('manual_Reference.html#OPTIMIZE_TABLE') . "\n"; ?>
+                <?php echo PMA_showDocuShort('O/P/OPTIMIZE_TABLE.html') . "\n"; ?>
             </td>
             <?php
         }
@@ -1161,7 +1161,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
                 <option value="MERGE"<?php if ($tbl_type == 'MRG_MYISAM') echo ' selected="selected"'; ?>>Merge</option>
             </select>&nbsp;
             <input type="submit" name="submittype" value="<?php echo $strGo; ?>" style="vertical-align: middle" />&nbsp;
-            <?php echo PMA_showDocu('manual_Table_types.html#Table_types') . "\n"; ?>
+            <?php echo PMA_showDocuShort('T/a/Table_types.html') . "\n"; ?>
         </form>
     </li>
     <?php
@@ -1179,7 +1179,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
         <?php echo $strTableMaintenance; ?>&nbsp;:&nbsp;
         <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
             <?php echo $strOptimizeTable; ?></a>&nbsp;
-        <?php echo PMA_showDocu('manual_Reference.html#OPTIMIZE_TABLE') . "\n"; ?>
+        <?php echo PMA_showDocuShort('O/P/OPTIMIZE_TABLE.html') . "\n"; ?>
         </div>
     </li>
     <?php
diff --git a/tbl_select.php3 b/tbl_select.php3
index c2966236a..3d831f3be 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -81,7 +81,7 @@ if (!isset($param) || $param[0] == '') {
         <li>
             <?php echo $strAddSearchConditions; ?><br />
             <input type="text" name="where" />&nbsp;
-            <?php print PMA_showDocu("manual_Reference.html#Functions") . "\n"; ?>
+            <?php print PMA_showDocuShort("F/u/Functions.html") . "\n"; ?>
             <br /><br />
             <?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?><br />
             <table border="<?php echo $cfgBorder; ?>">
diff --git a/user_details.php3 b/user_details.php3
index 178c2d713..a207e81cd 100644
--- a/user_details.php3
+++ b/user_details.php3
@@ -335,7 +335,7 @@ function PMA_normalOperations()
         <div style="margin-bottom: 10px">
         <a href="user_details.php3?lang=<?php echo $lang; ?>&amp;server=<?php echo $server; ?>&amp;db=mysql&amp;table=user&amp;mode=reload">
             <?php echo $GLOBALS['strReloadMySQL']; ?></a>&nbsp;
-        <?php print PMA_showDocu('manual_Reference.html#FLUSH'); ?>
+        <?php print PMA_showDocuShort('F/L/FLUSH.html'); ?>
         </div>
     </li>