diff --git a/ChangeLog b/ChangeLog
index 93c78c868..e4ca1cfd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + patch #2665440 Detect mcrypt initialization failure
 
 3.1.6.0 (not yet released)
+- bug #2785912 [doc] no ON UPDATE CURRENT_TIMESTAMP in list of attributes
 
 3.1.5.0 (not yet released)
 - patch #2739001 [export] XML does not allow spaces in element names, 
diff --git a/Documentation.html b/Documentation.html
index 0a6619a8d..33f111922 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -348,8 +348,10 @@ rm -rf config                      # remove not needed directory
 <h3 id="upgrading">Upgrading from an older version</h3>
 
 <p> Simply copy <i>./config.inc.php</i> from your previous installation into the newly
-    unpacked one. Configuration files from very old versions (2.3.0 or before) may
-    require some tweaking as some options have been changed or removed.
+    unpacked one. Configuration files from old versions may
+    require some tweaking as some options have been changed or removed; in
+    particular, the definition of <tt>$cfg['AttributeTypes']</tt> has changed
+    so you better remove it from your file and just use the default one.
     For compatibility with PHP 6, remove a <tt>set_magic_quotes_runtime(0);</tt>
     statement that you might find near the end of your configuration file.</p>