man pages: mariadb* are primary pages, mysql* are generated

37 files changed, 14 insertions, 14 deletions

diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index e6d7ab32e88..e1ef4877b2f 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -53,11 +53,11 @@ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPage
 INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
 
 macro(MARIADB_SYMLINK_MANPAGE)
-  list(LENGTH MARIADB_SYMLINK_TOS _len)
+  list(LENGTH MARIADB_SYMLINK_FROMS _len)
   math(EXPR _listlen "${_len}-1")
 
   foreach(_index RANGE ${_listlen})
-    list(GET MARIADB_SYMLINK_TOS ${_index} _name)
+    list(GET MARIADB_SYMLINK_FROMS ${_index} _name)
 
     set(_manname "${_name}")
     list(FIND MAN1_SERVER ${_manname}.1 _iman1server)
@@ -67,31 +67,31 @@ macro(MARIADB_SYMLINK_MANPAGE)
     list(FIND MAN1_TEST ${_manname}.1 _iman1test)
 
     if (${_iman1client} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesClient)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Client)
     endif()
     if (${_iman1devel} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesDevelopment)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Development)
     endif()
     if (${_iman1test} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesTest)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Test)
     endif()
     if (WITHOUT_SERVER)
 	    continue()
     endif()
     if (${_iman1server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesServer)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Server)
     endif()
     if (${_iman8server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 "man8" ManPagesServer)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 Server)
     endif()
   endforeach(_index)
 endmacro(MARIADB_SYMLINK_MANPAGE)
 
-macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp)
-  LIST(GET MARIADB_SYMLINK_FROMS ${index} _mariadbname)
+macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr comp)
+  LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
   SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}")
-  FILE(WRITE ${dest} ".so ${dir}/${mysqlname}.${mannr}")
-  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp})
+  FILE(WRITE ${dest} ".so man${mannr}/${mysqlname}.${mannr}")
+  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/man${mannr} COMPONENT ManPages${comp})
 endmacro(MARIADB_SYMLINK_MANPAGE_CREATE)
 
 MARIADB_SYMLINK_MANPAGE()
diff --git a/man/mysqlaccess.1 b/man/mariadb-access.1
index 4d9e4902dae..4d9e4902dae 100644
--- a/man/mysqlaccess.1
+++ b/man/mariadb-access.1
diff --git a/man/mysqladmin.1 b/man/mariadb-admin.1
index da25123a219..da25123a219 100644
--- a/man/mysqladmin.1
+++ b/man/mariadb-admin.1
diff --git a/man/mariabackup.1 b/man/mariadb-backup.1
index 4ee0a2f09d4..4ee0a2f09d4 100644
--- a/man/mariabackup.1
+++ b/man/mariadb-backup.1
diff --git a/man/mysqlbinlog.1 b/man/mariadb-binlog.1
index 8dd814d34ab..8dd814d34ab 100644
--- a/man/mysqlbinlog.1
+++ b/man/mariadb-binlog.1
diff --git a/man/mysqlcheck.1 b/man/mariadb-check.1
index ae9937db4d3..ae9937db4d3 100644
--- a/man/mysqlcheck.1
+++ b/man/mariadb-check.1
diff --git a/man/mariadb-client-test-embedded.1 b/man/mariadb-client-test-embedded.1
new file mode 100644
index 00000000000..327a06c5af9
--- /dev/null
+++ b/man/mariadb-client-test-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb-client-test.1
diff --git a/man/mysql_client_test.1 b/man/mariadb-client-test.1
index 9d23903768c..9d23903768c 100644
--- a/man/mysql_client_test.1
+++ b/man/mariadb-client-test.1
diff --git a/man/mysql_convert_table_format.1 b/man/mariadb-convert-table-format.1
index e1deb7df54d..e1deb7df54d 100644
--- a/man/mysql_convert_table_format.1
+++ b/man/mariadb-convert-table-format.1
diff --git a/man/mysqldump.1 b/man/mariadb-dump.1
index 9bb6fdadca1..9bb6fdadca1 100644
--- a/man/mysqldump.1
+++ b/man/mariadb-dump.1
diff --git a/man/mysqldumpslow.1 b/man/mariadb-dumpslow.1
index 4f82544dc14..4f82544dc14 100644
--- a/man/mysqldumpslow.1
+++ b/man/mariadb-dumpslow.1
diff --git a/man/mariadb-embedded.1 b/man/mariadb-embedded.1
new file mode 100644
index 00000000000..78fc18b313f
--- /dev/null
+++ b/man/mariadb-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb.1
diff --git a/man/mysql_find_rows.1 b/man/mariadb-find-rows.1
index f0220250bf7..f0220250bf7 100644
--- a/man/mysql_find_rows.1
+++ b/man/mariadb-find-rows.1
diff --git a/man/mysql_fix_extensions.1 b/man/mariadb-fix-extensions.1
index b7bec412b36..b7bec412b36 100644
--- a/man/mysql_fix_extensions.1
+++ b/man/mariadb-fix-extensions.1
diff --git a/man/mysqlhotcopy.1 b/man/mariadb-hotcopy.1
index 9e545c784c0..9e545c784c0 100644
--- a/man/mysqlhotcopy.1
+++ b/man/mariadb-hotcopy.1
diff --git a/man/mysqlimport.1 b/man/mariadb-import.1
index bc84ed54179..bc84ed54179 100644
--- a/man/mysqlimport.1
+++ b/man/mariadb-import.1
diff --git a/man/mysql_install_db.1 b/man/mariadb-install-db.1
index 1046a77c7e0..1046a77c7e0 100644
--- a/man/mysql_install_db.1
+++ b/man/mariadb-install-db.1
diff --git a/man/mysql_ldb.1 b/man/mariadb-ldb.1
index e1c08bba995..e1c08bba995 100644
--- a/man/mysql_ldb.1
+++ b/man/mariadb-ldb.1
diff --git a/man/mysql_plugin.1 b/man/mariadb-plugin.1
index d01fd26634c..d01fd26634c 100644
--- a/man/mysql_plugin.1
+++ b/man/mariadb-plugin.1
diff --git a/man/mysql_secure_installation.1 b/man/mariadb-secure-installation.1
index 9c788238d9c..9c788238d9c 100644
--- a/man/mysql_secure_installation.1
+++ b/man/mariadb-secure-installation.1
diff --git a/man/mysql_setpermission.1 b/man/mariadb-setpermission.1
index 1510981ddeb..1510981ddeb 100644
--- a/man/mysql_setpermission.1
+++ b/man/mariadb-setpermission.1
diff --git a/man/mysqlshow.1 b/man/mariadb-show.1
index dd0f97ed407..dd0f97ed407 100644
--- a/man/mysqlshow.1
+++ b/man/mariadb-show.1
diff --git a/man/mysqlslap.1 b/man/mariadb-slap.1
index f14ab8fa3fa..f14ab8fa3fa 100644
--- a/man/mysqlslap.1
+++ b/man/mariadb-slap.1
diff --git a/man/mariadb-test-embedded.1 b/man/mariadb-test-embedded.1
new file mode 100644
index 00000000000..65bf13872da
--- /dev/null
+++ b/man/mariadb-test-embedded.1
@@ -0,0 +1 @@
+.so man1/mariadb-test.1
diff --git a/man/mysqltest.1 b/man/mariadb-test.1
index 0f1e138a448..0f1e138a448 100644
--- a/man/mysqltest.1
+++ b/man/mariadb-test.1
diff --git a/man/mysql_tzinfo_to_sql.1 b/man/mariadb-tzinfo-to-sql.1
index 08681335c47..08681335c47 100644
--- a/man/mysql_tzinfo_to_sql.1
+++ b/man/mariadb-tzinfo-to-sql.1
diff --git a/man/mysql_upgrade.1 b/man/mariadb-upgrade.1
index c4041f281a5..c4041f281a5 100644
--- a/man/mysql_upgrade.1
+++ b/man/mariadb-upgrade.1
diff --git a/man/mysql_waitpid.1 b/man/mariadb-waitpid.1
index 9153d246a03..9153d246a03 100644
--- a/man/mysql_waitpid.1
+++ b/man/mariadb-waitpid.1
diff --git a/man/mysql.1 b/man/mariadb.1
index dd62e92e879..dd62e92e879 100644
--- a/man/mysql.1
+++ b/man/mariadb.1
diff --git a/man/mysql_config.1 b/man/mariadb_config.1
index 334478ce32c..334478ce32c 100644
--- a/man/mysql_config.1
+++ b/man/mariadb_config.1
diff --git a/man/mysqld_multi.1 b/man/mariadbd-multi.1
index e195eb59e2e..e195eb59e2e 100644
--- a/man/mysqld_multi.1
+++ b/man/mariadbd-multi.1
diff --git a/man/mysqld_safe_helper.1 b/man/mariadbd-safe-helper.1
index e25447e2c11..e25447e2c11 100644
--- a/man/mysqld_safe_helper.1
+++ b/man/mariadbd-safe-helper.1
diff --git a/man/mysqld_safe.1 b/man/mariadbd-safe.1
index 2e58df90c69..2e58df90c69 100644
--- a/man/mysqld_safe.1
+++ b/man/mariadbd-safe.1
diff --git a/man/mysqld.8 b/man/mariadbd.8
index aee253fc220..aee253fc220 100644
--- a/man/mysqld.8
+++ b/man/mariadbd.8
diff --git a/man/mysql_client_test_embedded.1 b/man/mysql_client_test_embedded.1
deleted file mode 100644
index 41f528017b3..00000000000
--- a/man/mysql_client_test_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysql_client_test.1
diff --git a/man/mysql_embedded.1 b/man/mysql_embedded.1
deleted file mode 100644
index 735c4e05ae0..00000000000
--- a/man/mysql_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysql.1
diff --git a/man/mysqltest_embedded.1 b/man/mysqltest_embedded.1
deleted file mode 100644
index a00489327b3..00000000000
--- a/man/mysqltest_embedded.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/mysqltest.1