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

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


Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -38002,8 +38002,8 @@ To get better control over the insertion process, it may be good to insert
 big tables in pieces:
 
 @example
-INSERT INTO newtable SELECT * FROM oldtable WHERE yourkey > something
-                                             AND yourkey <= somethingelse;
+INSERT INTO newtable SELECT * FROM oldtable
+   WHERE yourkey > something AND yourkey <= somethingelse;
 @end example
 
 After all data has been inserted you can rename the tables.
@@ -38036,10 +38036,11 @@ constraints to guard the integrity of your data.
 
 The syntax of a foreign key constraint definition in InnoDB:
 @example
-FOREIGN KEY (index_col_name, ...) REFERENCES table_name (index_col_name, ...)
+FOREIGN KEY (index_col_name, ...)
+  REFERENCES table_name (index_col_name, ...)
 @end example
 Starting from version 3.23.50 the InnoDB parser allows you to
-use also backquotes around table and column names in the above
+use backquotes (`) around table and column names in the above
 definition.
 
 An example:
@@ -38064,7 +38065,8 @@ formed for the altered table.
 Starting from version 3.23.50 InnoDB allows you to add a new
 foreign key constraint to a table through
 @example
-ALTER TABLE yourtablename ADD CONSTRAINT FOREIGN KEY (...) REFERENCES anothertablename(...)
+ALTER TABLE yourtablename
+  ADD CONSTRAINT FOREIGN KEY (...) REFERENCES anothertablename(...)
 @end example
 Remember to create the required indexes first, though.