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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0

3 files changed, 6 insertions, 5 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9fc395e6813..4c1777f1434 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -80,6 +80,7 @@ nick@mysql.com
 nick@nick.leippe.com
 paul@central.snake.net
 paul@ice.local
+paul@ice.snake.net
 paul@teton.kitebird.com
 pem@mysql.com
 peter@linux.local
diff --git a/man/mysqlaccess.1 b/man/mysqlaccess.1
index fc7c185e050..95e392b1194 100644
--- a/man/mysqlaccess.1
+++ b/man/mysqlaccess.1
@@ -90,10 +90,10 @@ copy grant\-rules from temporary tables to grant\-tables
 .BR   \-\-rollback
 undo the last changes to the grant\-tables.
 .SH NOTE
-    + At least the user and the db must be given (even with wildcards)
-    + If no host is given, `localhost' is assumed
-    + Wilcards (*,?,%,_) are allowed for host, user and db, but be sure 
-      to escape them from your shell!! (ie type \* or '*')
+At least the user and the db must be given (even with wildcards)
+If no host is given, `localhost' is assumed
+Wildcards (*,?,%,_) are allowed for host, user and db, but be sure 
+to escape them from your shell!! (i.e., type \\* or '*')
 .SH "SEE ALSO"
 isamchk (1),
 isamlog (1),
diff --git a/man/mysqldump.1 b/man/mysqldump.1
index af50366f24c..6907fcc8777 100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -64,7 +64,7 @@ supports by executing
 .TP 
 .BR  \-A | \-\-all\-databases 
 Dump all the databases. This will be same as
-.BR\-\-databases 
+.BR \-\-databases 
 with all databases selected.
 .TP                        
 .BR    \-a | \-\-all