diff --git a/ChangeLog b/ChangeLog
index 2928d8b58..75b8078c5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-03-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * left.php, db_details_structure.php, config.inc.php, Documentation.html,
+      libraries/common.lib.php, libraries/config_import.lib.php:
+      Sort database and table names in natural order,
+      thanks to Hoo Jia Xiong (hoojx)
+
 2004-03-25 Marcel Tschopp <marcel.tschopp@gmx.net>
     * libraries/display_tpl.lib.php, mysqli.dbi.lib.php:
       Mysql4.1 specific fix in function PMA_displayTableBody() (character set
diff --git a/Documentation.html b/Documentation.html
index 43f07afe0..be30273a6 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1801,6 +1801,14 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
         <br /><br />
     </dd>
 
+    <dt><b>$cfg['NaturalOrder'] </b>boolean</dt>
+    <dd>
+        Sorts database and table names according to natural order (for example,
+        t1, t2, t10). Currently implemented in the left panel (Light mode)
+        and in Database view, for the table list.
+    <br /><br />
+    </dd>
+
     <dt><b>$cfg['DefaultQueryTable'] </b>string</dt>
     <dt><b>$cfg['DefaultQueryDatabase'] </b>string</dt>
     <dd>