diff --git a/ChangeLog b/ChangeLog
index 7326f61409..76150ee49a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-10-12 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html: bug 821144: FAQ 6.21 needed clarification
+
 2003-10-11 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/grab_globals.lib.php3: bug 807047, better fix
     * tbl_select.php3: bug 821350: escape single quotes in table
diff --git a/Documentation.html b/Documentation.html
index c23473af28..74a78ec1e0 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -3417,7 +3417,15 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     You have to setup appropriate links between the tables, and also
     setup the &quot;display field&quot; in the foreign table. See FAQ
     6.6 for an example. Then, if there are 200 values or less in the
-    foreign table, a drop-down list of values will be available.
+    foreign table, a drop-down list of values will be available.  For 200
+    values or more, a distinct window will appear, to browse foreign
+    key values and choose one.
+    <br /><br />
+    You will see two lists of values, the first list containing the key
+    and the display field, the second list containing the display field
+    and the key. The reason for this is to be able to type the first
+    letter of either the key or the display field.
+
 </p>
 <a name="faqproject"></a><br />
 <h3>[7. phpMyAdmin project]</h3>