Merge with 3.23

13 files changed, 15 insertions, 15 deletions

diff --git a/man/isamchk.1 b/man/isamchk.1
index 2552d9f80cd..bfc4ccd9c08 100644
--- a/man/isamchk.1
+++ b/man/isamchk.1
@@ -1,4 +1,4 @@
-.TH ISAMCHK 1 "19 December 2000"
+.TH isamchk 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 .BR isamchk
  \- Description, check and repair of ISAM tables.
diff --git a/man/isamlog.1 b/man/isamlog.1
index ef6ceaff8da..a386f11c010 100644
--- a/man/isamlog.1
+++ b/man/isamlog.1
@@ -1,4 +1,4 @@
-.TH ISAMLOG 1 "20 December 2000" 
+.TH isamlog 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME 
 isamlog - Write info about whats in a nisam log file. 
 .SH USAGE 
diff --git a/man/mysql.1 b/man/mysql.1
index e10fd589092..6664581072f 100644
--- a/man/mysql.1
+++ b/man/mysql.1
@@ -1,4 +1,4 @@
-.TH MYSQL 1 "13 June 1997"
+.TH mysql 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 mysql \- text-based client for mysqld, a SQL-based relational database daemon
 .SH SYNOPSIS
diff --git a/man/mysql_zap.1 b/man/mysql_zap.1
index e57eb7a4d07..144fc212372 100644
--- a/man/mysql_zap.1
+++ b/man/mysql_zap.1
@@ -1,4 +1,4 @@
-.TH ZAP 1 "20 December 2000" 
+.TH zap 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME 
 zap - a perl script used to kill processes 
 .SH USAGE 
diff --git a/man/mysqlaccess.1 b/man/mysqlaccess.1
index 0ae06dca137..c1c61d4a8a7 100644
--- a/man/mysqlaccess.1
+++ b/man/mysqlaccess.1
@@ -1,4 +1,4 @@
-.TH MYSQLACCESS 1 "19 December 2000"
+.TH mysqlaccess 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 .BR mysqlaccess
  \- Create new users to mysql.
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1
index 1e435006bb2..9d7d73aad21 100644
--- a/man/mysqladmin.1
+++ b/man/mysqladmin.1
@@ -1,4 +1,4 @@
-.TH MYSQLADMIN 1 "18 December 2000"
+.TH mysqladmin 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
  mysqladmin [OPTIONS] command command....  \- A utility for performing administrative operations
 .SH OPTION SYNOPSIS
diff --git a/man/mysqld.1 b/man/mysqld.1
index 1f87eb9cf32..0a6fcccbef2 100644
--- a/man/mysqld.1
+++ b/man/mysqld.1
@@ -1,4 +1,4 @@
-.TH MYSQLD 1 "19 December 2000"
+.TH mysqld 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 .BR mysqld
  \- Starts the MySQL server demon
diff --git a/man/mysqld_multi.1 b/man/mysqld_multi.1
index b7aa77f656d..68b9d1e876f 100644
--- a/man/mysqld_multi.1
+++ b/man/mysqld_multi.1
@@ -1,4 +1,4 @@
-.TH MYSQLD_MULTI  1 "20 December 2000" 
+.TH mysqld_multi 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME 
 mysqld_multi  - is meant for managing several mysqld processes running in different UNIX sockets and TCP/IP ports. 
 .SH USAGE 
diff --git a/man/mysqld_safe.1 b/man/mysqld_safe.1
index c900d193929..b8271c848cc 100644
--- a/man/mysqld_safe.1
+++ b/man/mysqld_safe.1
@@ -1,4 +1,4 @@
-.TH SAFE_MYSQLD	  1 "19 December 2000" "safe_mysqld (mysql)" mysql.com
+.TH safe_mysqld 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 mysqld_safe \- start the mysqld daemon on Unix.
 .SH SYNOPSIS
diff --git a/man/mysqldump.1 b/man/mysqldump.1
index b9e5aa33791..b4aba2ade13 100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -1,4 +1,4 @@
-.TH MYSQLDUMP 1 "19 December 2000"
+.TH mysqldump 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 mysqldump \- text-based client for dumping or backing up mysql databases , tables and or data.
 
@@ -123,7 +123,7 @@ Connect to host.
 Lock all tables for read.
 .TP  
 .BR    \-n | \-\-no\-create\-db 
-'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;'
+\&'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;'
 will not be put in the output. The above line will
 be added otherwise, if 
 .BR \-\-databases 
@@ -270,4 +270,4 @@ Manual page by L. (Kill-9) Pedersen
 (kill-9@kill-9.dk), Mercurmedia Data Model Architect /
 system developer (http://www.mercurmedia.com)
 
-.\" end of man page
\ No newline at end of file
+.\" end of man page
diff --git a/man/mysqlshow.1 b/man/mysqlshow.1
index 661b2cd02c8..b6aceec82e3 100644
--- a/man/mysqlshow.1
+++ b/man/mysqlshow.1
@@ -1,4 +1,4 @@
-.TH MYSQLSHOW 1 "19 December 2000"
+.TH mysqlshow 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 .BR mysqlshow
  \- Shows the structure of a mysql database (databases,tables and columns)
diff --git a/man/perror.1 b/man/perror.1
index 7adf99ea772..38a51593ba1 100644
--- a/man/perror.1
+++ b/man/perror.1
@@ -1,4 +1,4 @@
-.TH PERROR 1 "19 December 2000"
+.TH perror 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME
 .BR perror
 can be used to display a description for a system error code, or an MyISAM/ISAM table handler error code. The error messages are mostly system dependent. 
diff --git a/man/replace.1 b/man/replace.1
index 38ffe998027..7c3b79f605b 100644
--- a/man/replace.1
+++ b/man/replace.1
@@ -1,4 +1,4 @@
-.TH REPLACE 1 "20 December 2000" 
+.TH replace 1 "19 December 2000" "MySQL 3.23" "MySQL database"
 .SH NAME 
 .TP
 replace - A utility program that is used by msql2mysql, but that has more general applicability as well. replace changes strings in place in files or on the standard input. Uses a finite state machine to match longer strings first. Can be used to swap strings.