Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck

1 files changed, 7 insertions, 3 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index d408e8a5423..1c4fbf8f06f 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1813,9 +1813,13 @@ com_help(String *buffer __attribute__((unused)),
   if (help_arg)
     return com_server_help(buffer,line,help_arg+1);
 
-  put_info("\nFor the complete MySQL Manual online, visit:\n   http://www.mysql.com/documentation\n", INFO_INFO);
-  put_info("For info on technical support from MySQL developers, visit:\n   http://www.mysql.com/support\n", INFO_INFO);
-  put_info("For info on MySQL books, utilities, consultants, etc., visit:\n   http://www.mysql.com/portal\n", INFO_INFO);
+  put_info("\nFor information about MySQL products and services, visit:\n"
+           "   http://www.mysql.com/\n"
+           "For developer information, including the MySQL Reference Manual, "
+           "visit:\n"
+           "   http://dev.mysql.com/\n"
+           "To buy MySQL Network Support, training, or other products, visit:\n"
+           "   https://shop.mysql.com/\n", INFO_INFO);
   put_info("List of all MySQL commands:", INFO_INFO);
   if (!named_cmds)
     put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);