Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/bk/mysql-4.0

support-files/my-huge.cnf.sh

-# Example mysql config file for very large systems.
+# Example MySQL config file for very large systems.
 #
-# This is for large system with memory of 1G-2G where the system runs mainly
+# This is for a large system with memory of 1G-2G where the system runs mainly
 # MySQL.
 #
 # You can copy this file to
@@ -9,9 +9,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-innodb-heavy-4G.cnf.sh

@@ -13,8 +13,8 @@
 # (@localstatedir@ for this installation) or to
 # ~/.my.cnf to set user-specific options.
 #
-# In this file, you can use all long options that the program supports.
-# If you want to know the options a program supports, run the program
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
 # with the "--help" option.
 #
 # More detailed information about the individual options can also be

support-files/my-large.cnf.sh

-# Example mysql config file for large systems.
+# Example MySQL config file for large systems.
 #
-# This is for large system with memory = 512M where the system runs mainly
+# This is for a large system with memory = 512M where the system runs mainly
 # MySQL.
 #
 # You can copy this file to
@@ -9,9 +9,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-medium.cnf.sh

-# Example mysql config file for medium systems.
+# Example MySQL config file for medium systems.
 #
 # This is for a system with little memory (32M - 64M) where MySQL plays
 # an important part, or systems up to 128M where MySQL is used together with
@@ -10,9 +10,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]

support-files/my-small.cnf.sh

-# Example mysql config file for small systems.
+# Example MySQL config file for small systems.
 #
 # This is for a system with little memory (<= 64M) where MySQL is only used
 # from time to time and it's important that the mysqld daemon
@@ -10,9 +10,9 @@
 # installation this directory is @localstatedir@) or
 # ~/.my.cnf to set user-specific options.
 #
-# One can in this file use all long options that the program supports.
-# If you want to know which options a program support, run the program
-# with --help option.
+# In this file, you can use all long options that a program supports.
+# If you want to know which options a program supports, run the program
+# with the "--help" option.
 
 # The following options will be passed to all MySQL clients
 [client]