diff --git a/ChangeLog b/ChangeLog
index 199037475..dd1225dcc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ $Id$
 $Source$
 
 2002-07-29 Marc Delisle  <lem9@users.sourceforge.net>
-    * Documentation.html: auto-detect
+    * Documentation.html: auto-detect, dot in dbname, CGI and cookie auth
     * lang/turkish update, thanks to Bora Alioglu
     
 2002-07-29 Robin Johnson  <robbat2@users.sourceforge.net>
diff --git a/Documentation.html b/Documentation.html
index 3a4d20c7f..f0ed07807 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1584,6 +1584,12 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     &quot;PHP-MySQL&quot; or something similar.
 </p>
 
+<p>
+    <b>[1.21] I am running the CGI version of PHP under Unix, and I cannot
+    login using cookie auth.</b><br />
+    In php.ini, set mysql.max_links higher than 1.<br />
+</p>
+
 <a name="faqconfig"></a>
 <h3>[2. Configuration]</h3>
 
@@ -2119,6 +2125,14 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     field and table names formed with special characters are protected.<br />
 </p>
 
+<p>
+    <b>[6.13] I would like to create a database with a dot in its name.</b><br />
+    This is a bad idea, because in MySQL the syntax &quot;database.table&quot;
+    is the normal way to reference a database and table name. Worse, MySQL
+    will usually let you create a database with a dot, but then you cannot
+    work with it, nor delete it.<br />
+</p>
+
 <a name="faqproject"></a>
 <h3>[7. phpMyAdmin project]</h3>
 <p>