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

into george.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -5658,7 +5658,7 @@ Our main download mirror is located at:
 @uref{http://mirrors.sunsite.dk/mysql/}
 
 If you are interested in becoming a MySQL mirror site, you may
-anonymously rsync with: @code{rsync://sunsite.dk/ftp/mirrors/mysql/}.  Please
+anonymously rsync with: @code{rsync://sunsite.dk/mysql/}.  Please
 send e-mail to @email{webmaster@@mysql.com} notifying us of your mirror to be
 added to the following list.
 
@@ -13662,10 +13662,13 @@ The @code{AUTO_INCREMENT} attribute can be used to generate an unique
 identity for new rows:
 
 @example
-CREATE TABLE animals (id MEDIUMINT NOT NULL AUTO_INCREMENT,
-name CHAR(30) NOT NULL, PRIMARY KEY (id));
+CREATE TABLE animals (
+             id MEDIUMINT NOT NULL AUTO_INCREMENT,
+             name CHAR(30) NOT NULL,
+             PRIMARY KEY (id)
+             );
 INSERT INTO animals (name) VALUES ("dog"),("cat"),("penguin"),
-("lax"),("whale");
+                                  ("lax"),("whale");
 SELECT * FROM animals;
 
 Which returns:
@@ -13688,11 +13691,13 @@ value for the autoincrement column is calculated as
 useful when you want to put data into ordered groups.
 
 @example
-CREATE TABLE animals (grp ENUM('fish','mammal','bird') NOT NULL,
-             id MEDIUMINT NOT NULL AUTO_INCREMENT
-             PRIMARY KEY (grp,id));
+CREATE TABLE animals (
+             grp ENUM('fish','mammal','bird') NOT NULL,
+             id MEDIUMINT NOT NULL AUTO_INCREMENT,
+             PRIMARY KEY (grp,id)
+             );
 INSERT INTO animals (grp,name) VALUES("mammal","dog"),("mammal","cat"),
-            ("bird","penguin"),("fish","lax"),("mammal","whale");
+                  ("bird","penguin"),("fish","lax"),("mammal","whale");
 SELECT * FROM animals ORDER BY grp,id;
 
 Which returns:
@@ -48923,8 +48928,9 @@ By Steve Shreeve.
 Perl program to convert Oracle databases to MySQL. Has same
 output format as mysqldump. By Johan Andersson.
 
-@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql.pl}
-Perl program to import Excel spreadsheets into a MySQL database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
+@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql}
+Perl program to import Excel spreadsheets into a MySQL database.
+By Stephen Hurd @email{shurd@@sk.sympatico.ca}
 
 @item @uref{http://www.mysql.com/Downloads/Contrib/T2S_100.ZIP}.
 Windows program to convert text files to MySQL databases. By