diff --git a/ChangeLog b/ChangeLog
index d56677849..de1d7a2e0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-18 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php: doc link for connection collation
+
 2004-07-17 Alexander M. Turek  <me@derrabus.de>
     * libraries/database_interface.lib.php, libraries/dbi/*.dbi.lib.php:
       moved redundant post-connect code into database_interface.lib.php.
diff --git a/main.php b/main.php
index a9b08ccff..e00ba187c 100644
--- a/main.php
+++ b/main.php
@@ -590,6 +590,8 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding']
        . '                </label>' . "\n"
        . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, TRUE, 4, TRUE)
        . '                <noscript><input type="submit" value="' . $strGo . '" style="vertical-align: middle" /></noscript>' . "\n"
+       // put the doc link in the form so that it appears on the same line
+       . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n"
        . '            </form>' . "\n"
        . '        </td>' . "\n"
        . '    </tr>' . "\n";