Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0

mysys/default.c

@@ -85,10 +85,10 @@ static char *remove_end_comment(char *ptr);
   Add/remove option to the option file section.
 
   SYNOPSYS
-    my_correct_file()
+    my_correct_defaults_file()
     file_location     The location of configuration file to edit
     option            option to look for
-    option value      The value of the option we would like to set
+    option_value      The value of the option we would like to set
     section_name      the name of the section
     remove_option     This is true if we want to remove the option.
                       False otherwise.

server-tools/instance-manager/commands.cc

@@ -548,7 +548,7 @@ int Show_instance_log_files::execute(struct st_net *net, ulong connection_id)
   path_field.name= (char*) "Path";
   path_field.length= DEFAULT_FIELD_LENGTH;
   path.data= &path_field;
-  size_field.name= (char*) "Filesize";
+  size_field.name= (char*) "File size";
   size_field.length= DEFAULT_FIELD_LENGTH;
   size.data= &size_field;
   field_list= list_add(NULL, &size);