List:Commits« Previous MessageNext Message »
From:mcbrown Date:January 9 2008 4:10pm
Subject:svn commit - mysqldoc@docsrva: r9530 - in trunk: it/refman-5.1 migration-toolkit mysqldoc-guide mysqltest ndbapi pt/refman-5.1 query-browser refman-4....
View as plain text  
Author: mcbrown
Date: 2008-01-09 17:10:01 +0100 (Wed, 09 Jan 2008)
New Revision: 9530

Log:
Fixing some issues in the Makefiles
Updating dependencies



Modified:
   trunk/it/refman-5.1/Makefile
   trunk/it/refman-5.1/Makefile.depends
   trunk/migration-toolkit/Makefile
   trunk/migration-toolkit/Makefile.depends
   trunk/mysqldoc-guide/Makefile.depends
   trunk/mysqltest/Makefile
   trunk/mysqltest/Makefile.depends
   trunk/ndbapi/Makefile.depends
   trunk/pt/refman-5.1/Makefile
   trunk/pt/refman-5.1/Makefile.depends
   trunk/query-browser/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-6.0/Makefile.depends


Modified: trunk/it/refman-5.1/Makefile
===================================================================
--- trunk/it/refman-5.1/Makefile	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/it/refman-5.1/Makefile	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 643 bytes

@@ -21,7 +21,8 @@
 IDMAP_VER = $(DOC_VER)
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-6.0 $(REPO_ROOT)/ndbapi $(REPO_ROOT)/quick-guides
+IDMAP_REFS = ../refman-5.1 $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-6.0  \
+		$(REPO_ROOT)/ndbapi $(REPO_ROOT)/quick-guides
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/it/refman-5.1/Makefile.depends
===================================================================
--- trunk/it/refman-5.1/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/it/refman-5.1/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 67, Lines Added: 744, Lines Deleted: 744; 84583 bytes

@@ -9,18 +9,18 @@
 apis_c_IDMAPS = \
 	../../refman-common/metadata/connector-j.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-libmysqld.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -75,9 +75,9 @@
 apis_libmysqld_IMAGES =
 apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES)
 apis_libmysqld_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
 apis-libmysqld.useless: $(apis_libmysqld_SOURCES)

@@ -97,7 +97,7 @@
 apis_perl_SOURCES = apis-perl.xml $(apis_perl_INCLUDES)
 apis_perl_IDMAPS = \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/installing-core.idmap
+	../refman-5.1/metadata/installing-core.idmap
 apis-perl.validpure: $(apis_perl_SOURCES)
 apis-perl.titles: $(apis_perl_SOURCES)
 apis-perl.useless: $(apis_perl_SOURCES)

@@ -116,8 +116,8 @@
 apis_php_IMAGES =
 apis_php_SOURCES = apis-php.xml $(apis_php_INCLUDES)
 apis_php_IDMAPS = \
-	metadata/apis-php.idmap \
-	metadata/errors-problems-core.idmap
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap
 apis-php.validpure: $(apis_php_SOURCES)
 apis-php.titles: $(apis_php_SOURCES)
 apis-php.useless: $(apis_php_SOURCES)

@@ -315,14 +315,14 @@
 	../../refman-common/metadata/news-cmxj-core.idmap \
 	../../refman-common/metadata/news-cnet-core.idmap \
 	../../refman-common/metadata/news-codbc-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-php.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -341,18 +341,18 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -515,42 +515,42 @@
 dynxml_local_dba_SOURCES = dynxml-local-dba.xml $(dynxml_local_dba_INCLUDES)
 dynxml_local_dba_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-perl.idmap \
-	metadata/apis-php.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-topology.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -575,20 +575,20 @@
 dynxml_local_errors_problems_SOURCES = dynxml-local-errors-problems.xml $(dynxml_local_errors_problems_INCLUDES)
 dynxml_local_errors_problems_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 dynxml-local-errors-problems.validpure: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.titles: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.useless: $(dynxml_local_errors_problems_SOURCES)

@@ -610,21 +610,21 @@
 dynxml_local_functions_SOURCES = dynxml-local-functions.xml $(dynxml_local_functions_INCLUDES)
 dynxml_local_functions_IDMAPS = \
 	../../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -647,30 +647,30 @@
 dynxml_local_installing_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)

@@ -690,16 +690,16 @@
 dynxml_local_language_structure_SOURCES = dynxml-local-language-structure.xml $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_language_structure_IDMAPS = \
 	../../quick-guides/metadata/reservedwords-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-perl.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-language-structure.validpure: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.titles: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.useless: $(dynxml_local_language_structure_SOURCES)

@@ -729,37 +729,37 @@
 	../../ndbapi/metadata/class-ndbtransaction.idmap \
 	../../ndbapi/metadata/mgm-api.idmap \
 	../../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-news-5.1.validpure: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.titles: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.useless: $(dynxml_local_news_5_1_SOURCES)

@@ -780,12 +780,12 @@
 dynxml_local_se_innodb_IMAGES =
 dynxml_local_se_innodb_SOURCES = dynxml-local-se-innodb.xml $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_innodb_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -806,14 +806,14 @@
 dynxml_local_se_myisam_IMAGES =
 dynxml_local_se_myisam_SOURCES = dynxml-local-se-myisam.xml $(dynxml_local_se_myisam_INCLUDES)
 dynxml_local_se_myisam_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-se-myisam.validpure: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.titles: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.useless: $(dynxml_local_se_myisam_SOURCES)

@@ -871,16 +871,16 @@
 events_IMAGES =
 events_SOURCES = events.xml $(events_INCLUDES)
 events_IDMAPS = \
-	metadata/events.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap
 events.validpure: $(events_SOURCES)
 events.titles: $(events_SOURCES)
 events.useless: $(events_SOURCES)

@@ -901,16 +901,16 @@
 extending_mysql_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -936,40 +936,40 @@
 	../../refman-common/metadata/connector-mxj.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-php.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-server.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/ha.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/views.idmap
 faqs.validpure: $(faqs_SOURCES)
 faqs.titles: $(faqs_SOURCES)
 faqs.useless: $(faqs_SOURCES)

@@ -1007,10 +1007,10 @@
 ha_SOURCES = ha.xml $(ha_INCLUDES)
 ha_IDMAPS = \
 	../../refman-common/metadata/replication-drbd.idmap \
-	metadata/faqs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap
 ha.validpure: $(ha_SOURCES)
 ha.titles: $(ha_SOURCES)
 ha.useless: $(ha_SOURCES)

@@ -1029,18 +1029,18 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/views.idmap
 information-schema.validpure: $(information_schema_SOURCES)
 information-schema.titles: $(information_schema_SOURCES)
 information-schema.useless: $(information_schema_SOURCES)

@@ -1073,16 +1073,16 @@
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 internationalization.validpure: $(internationalization_SOURCES)
 internationalization.titles: $(internationalization_SOURCES)
 internationalization.useless: $(internationalization_SOURCES)

@@ -1112,41 +1112,41 @@
 	../../refman-common/metadata/credits.idmap \
 	../../refman-common/metadata/information-sources.idmap \
 	../../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -1476,77 +1476,77 @@
 	../../refman-common/metadata/mysql-proxy.idmap \
 	../../refman-common/metadata/replication-drbd.idmap \
 	../../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/apis-perl.idmap \
-	metadata/apis-php.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-libmysqld.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/ha.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/programs.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/replication-topology.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1565,11 +1565,11 @@
 mysql_cluster_backup_IMAGES =
 mysql_cluster_backup_SOURCES = mysql-cluster-backup.xml $(mysql_cluster_backup_INCLUDES)
 mysql_cluster_backup_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-backup.validpure: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.titles: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.useless: $(mysql_cluster_backup_SOURCES)

@@ -1589,9 +1589,9 @@
 mysql_cluster_cge_SOURCES = mysql-cluster-cge.xml $(mysql_cluster_cge_INCLUDES)
 mysql_cluster_cge_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-cge.validpure: $(mysql_cluster_cge_SOURCES)
 mysql-cluster-cge.titles: $(mysql_cluster_cge_SOURCES)
 mysql-cluster-cge.useless: $(mysql_cluster_cge_SOURCES)

@@ -1612,13 +1612,13 @@
 mysql_cluster_configuration_IDMAPS = \
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap
 mysql-cluster-configuration.validpure: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.titles: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.useless: $(mysql_cluster_configuration_SOURCES)

@@ -1637,9 +1637,9 @@
 mysql_cluster_disk_data_IMAGES =
 mysql_cluster_disk_data_SOURCES = mysql-cluster-disk-data.xml $(mysql_cluster_disk_data_INCLUDES)
 mysql_cluster_disk_data_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/information-schema.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-disk-data.validpure: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.titles: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.useless: $(mysql_cluster_disk_data_SOURCES)

@@ -1658,12 +1658,12 @@
 mysql_cluster_glossary_IMAGES =
 mysql_cluster_glossary_SOURCES = mysql-cluster-glossary.xml $(mysql_cluster_glossary_INCLUDES)
 mysql_cluster_glossary_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap
 mysql-cluster-glossary.validpure: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.titles: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.useless: $(mysql_cluster_glossary_SOURCES)

@@ -1682,8 +1682,8 @@
 mysql_cluster_interconnects_IMAGES =
 mysql_cluster_interconnects_SOURCES = mysql-cluster-interconnects.xml $(mysql_cluster_interconnects_INCLUDES)
 mysql_cluster_interconnects_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap
 mysql-cluster-interconnects.validpure: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.titles: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.useless: $(mysql_cluster_interconnects_SOURCES)

@@ -1703,15 +1703,15 @@
 mysql_cluster_limitations_SOURCES = mysql-cluster-limitations.xml $(mysql_cluster_limitations_INCLUDES)
 mysql_cluster_limitations_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/partitioning.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-limitations.validpure: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.titles: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.useless: $(mysql_cluster_limitations_SOURCES)

@@ -1731,13 +1731,13 @@
 mysql_cluster_management_SOURCES = mysql-cluster-management.xml $(mysql_cluster_management_INCLUDES)
 mysql_cluster_management_IDMAPS = \
 	../../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-management.validpure: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.titles: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.useless: $(mysql_cluster_management_SOURCES)

@@ -1758,16 +1758,16 @@
 	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml $(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1793,8 +1793,8 @@
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml $(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-overview.idmap
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap
 mysql-cluster-overview.validpure: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.titles: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.useless: $(mysql_cluster_overview_SOURCES)

@@ -1814,13 +1814,13 @@
 mysql_cluster_process_management_SOURCES = mysql-cluster-process-management.xml $(mysql_cluster_process_management_INCLUDES)
 mysql_cluster_process_management_IDMAPS = \
 	../../ndbapi/metadata/ndb-errors.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1847,16 +1847,16 @@
 	../refman-common/images/published/cluster-replication-overview.png
 mysql_cluster_replication_SOURCES = mysql-cluster-replication.xml $(mysql_cluster_replication_INCLUDES)
 mysql_cluster_replication_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-replication.validpure: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.titles: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.useless: $(mysql_cluster_replication_SOURCES)

@@ -1875,11 +1875,11 @@
 mysql_cluster_roadmap_IMAGES =
 mysql_cluster_roadmap_SOURCES = mysql-cluster-roadmap.xml $(mysql_cluster_roadmap_INCLUDES)
 mysql_cluster_roadmap_IDMAPS = \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/partitioning.idmap
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/partitioning.idmap
 mysql-cluster-roadmap.validpure: $(mysql_cluster_roadmap_SOURCES)
 mysql-cluster-roadmap.titles: $(mysql_cluster_roadmap_SOURCES)
 mysql-cluster-roadmap.useless: $(mysql_cluster_roadmap_SOURCES)

@@ -1902,10 +1902,10 @@
 	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml $(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-upgrade-downgrade.validpure: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.titles: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.useless: $(mysql_cluster_upgrade_downgrade_SOURCES)

@@ -1927,13 +1927,13 @@
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml $(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap
 mysql-cluster-utilities.validpure: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.titles: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.useless: $(mysql_cluster_utilities_SOURCES)

@@ -1993,34 +1993,34 @@
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../ndbapi/metadata/ndbapi.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2100,28 +2100,28 @@
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
 	../../refman-6.0/metadata/dba-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2140,17 +2140,17 @@
 partitioning_IMAGES =
 partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
 partitioning_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 partitioning.validpure: $(partitioning_SOURCES)
 partitioning.titles: $(partitioning_SOURCES)
 partitioning.useless: $(partitioning_SOURCES)

@@ -2169,8 +2169,8 @@
 precision_math_IMAGES =
 precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
 precision_math_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/precision-math.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/precision-math.idmap
 precision-math.validpure: $(precision_math_SOURCES)
 precision-math.titles: $(precision_math_SOURCES)
 precision-math.useless: $(precision_math_SOURCES)

@@ -2207,15 +2207,15 @@
 programs_admin_util_IMAGES =
 programs_admin_util_SOURCES = programs-admin-util.xml $(programs_admin_util_INCLUDES)
 programs_admin_util_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 programs-admin-util.validpure: $(programs_admin_util_SOURCES)
 programs-admin-util.titles: $(programs_admin_util_SOURCES)
 programs-admin-util.useless: $(programs_admin_util_SOURCES)

@@ -2234,17 +2234,17 @@
 programs_client_IMAGES =
 programs_client_SOURCES = programs-client.xml $(programs_client_INCLUDES)
 programs_client_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -2263,7 +2263,7 @@
 programs_development_IMAGES =
 programs_development_SOURCES = programs-development.xml $(programs_development_INCLUDES)
 programs_development_IDMAPS = \
-	metadata/programs-miscellaneous.idmap
+	../refman-5.1/metadata/programs-miscellaneous.idmap
 programs-development.validpure: $(programs_development_SOURCES)
 programs-development.titles: $(programs_development_SOURCES)
 programs-development.useless: $(programs_development_SOURCES)

@@ -2282,10 +2282,10 @@
 programs_installation_IMAGES =
 programs_installation_SOURCES = programs-installation.xml $(programs_installation_INCLUDES)
 programs_installation_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)
 programs-installation.titles: $(programs_installation_SOURCES)
 programs-installation.useless: $(programs_installation_SOURCES)

@@ -2304,7 +2304,7 @@
 programs_miscellaneous_IMAGES =
 programs_miscellaneous_SOURCES = programs-miscellaneous.xml $(programs_miscellaneous_INCLUDES)
 programs_miscellaneous_IDMAPS = \
-	metadata/programs-development.idmap
+	../refman-5.1/metadata/programs-development.idmap
 programs-miscellaneous.validpure: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.titles: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.useless: $(programs_miscellaneous_SOURCES)

@@ -2323,11 +2323,11 @@
 programs_server_IMAGES =
 programs_server_SOURCES = programs-server.xml $(programs_server_INCLUDES)
 programs_server_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -2346,11 +2346,11 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 programs-using.validpure: $(programs_using_SOURCES)
 programs-using.titles: $(programs_using_SOURCES)
 programs-using.useless: $(programs_using_SOURCES)

@@ -2376,27 +2376,27 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2415,14 +2415,14 @@
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
 replication_configuration_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication-configuration.validpure: $(replication_configuration_SOURCES)
 replication-configuration.titles: $(replication_configuration_SOURCES)
 replication-configuration.useless: $(replication_configuration_SOURCES)

@@ -2441,12 +2441,12 @@
 replication_implementation_IMAGES =
 replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
 replication_implementation_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)
 replication-implementation.useless: $(replication_implementation_SOURCES)

@@ -2466,19 +2466,19 @@
 replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
 replication_notes_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication-notes.validpure: $(replication_notes_SOURCES)
 replication-notes.titles: $(replication_notes_SOURCES)
 replication-notes.useless: $(replication_notes_SOURCES)

@@ -2507,11 +2507,11 @@
 	../refman-common/images/published/submaster-performance.png
 replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES)
 replication_solutions_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)
 replication-solutions.titles: $(replication_solutions_SOURCES)
 replication-solutions.useless: $(replication_solutions_SOURCES)

@@ -2545,23 +2545,23 @@
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -2580,10 +2580,10 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 restrictions.validpure: $(restrictions_SOURCES)
 restrictions.titles: $(restrictions_SOURCES)
 restrictions.useless: $(restrictions_SOURCES)

@@ -2602,8 +2602,8 @@
 se_archive_IMAGES =
 se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
 se_archive_IDMAPS = \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-archive.validpure: $(se_archive_SOURCES)
 se-archive.titles: $(se_archive_SOURCES)
 se-archive.useless: $(se_archive_SOURCES)

@@ -2624,7 +2624,7 @@
 	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
-	metadata/replication-configuration.idmap
+	../refman-5.1/metadata/replication-configuration.idmap
 se-blackhole.validpure: $(se_blackhole_SOURCES)
 se-blackhole.titles: $(se_blackhole_SOURCES)
 se-blackhole.useless: $(se_blackhole_SOURCES)

@@ -2681,8 +2681,8 @@
 	../refman-common/images/published/se-federated-structure.png
 se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES)
 se_federated_IDMAPS = \
-	metadata/se-federated.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-federated.validpure: $(se_federated_SOURCES)
 se-federated.titles: $(se_federated_SOURCES)
 se-federated.useless: $(se_federated_SOURCES)

@@ -2714,9 +2714,9 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)
 se-memory.titles: $(se_memory_SOURCES)
 se-memory.useless: $(se_memory_SOURCES)

@@ -2735,9 +2735,9 @@
 se_merge_IMAGES =
 se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
 se_merge_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap
 se-merge.validpure: $(se_merge_SOURCES)
 se-merge.titles: $(se_merge_SOURCES)
 se-merge.useless: $(se_merge_SOURCES)

@@ -2769,9 +2769,9 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -2791,47 +2791,47 @@
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -2868,30 +2868,30 @@
 	../refman-common/images/published/se-federated-structure.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -2910,17 +2910,17 @@
 stored_procedures_IMAGES =
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/restrictions.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 stored-procedures.validpure: $(stored_procedures_SOURCES)
 stored-procedures.titles: $(stored_procedures_SOURCES)
 stored-procedures.useless: $(stored_procedures_SOURCES)

@@ -2939,12 +2939,12 @@
 triggers_IMAGES =
 triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
 triggers_IDMAPS = \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap
 triggers.validpure: $(triggers_SOURCES)
 triggers.titles: $(triggers_SOURCES)
 triggers.useless: $(triggers_SOURCES)

@@ -2963,19 +2963,19 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)

@@ -2994,13 +2994,13 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/programs-installation.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/views.idmap
 views.validpure: $(views_SOURCES)
 views.titles: $(views_SOURCES)
 views.useless: $(views_SOURCES)


Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/migration-toolkit/Makefile	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 646 bytes

@@ -17,7 +17,7 @@
 IDMAP_MAIN = migration-toolkit
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = $(REPO_ROOT/migration-toolkit $(REPO_ROOT)/gui-common $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
+IDMAP_REFS = $(REPO_ROOT)/migration-toolkit $(REPO_ROOT)/gui-common $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/migration-toolkit/Makefile.depends
===================================================================
--- trunk/migration-toolkit/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/migration-toolkit/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 11; 2322 bytes

@@ -27,7 +27,7 @@
 extending_IMAGES =
 extending_SOURCES = extending.xml $(extending_INCLUDES)
 extending_IDMAPS = \
-	metadata/indepth.idmap
+	../migration-toolkit/metadata/indepth.idmap
 extending.validpure: $(extending_SOURCES)
 extending.titles: $(extending_SOURCES)
 extending.useless: $(extending_SOURCES)

@@ -106,10 +106,10 @@
 	images/published/welcome-screen.png
 indepth_SOURCES = indepth.xml $(indepth_INCLUDES)
 indepth_IDMAPS = \
-	metadata/accessprep.idmap \
-	metadata/indepth.idmap \
-	metadata/introduction.idmap \
-	metadata/scripted-migration.idmap
+	../migration-toolkit/metadata/accessprep.idmap \
+	../migration-toolkit/metadata/indepth.idmap \
+	../migration-toolkit/metadata/introduction.idmap \
+	../migration-toolkit/metadata/scripted-migration.idmap
 indepth.validpure: $(indepth_SOURCES)
 indepth.titles: $(indepth_SOURCES)
 indepth.useless: $(indepth_SOURCES)

@@ -229,11 +229,11 @@
 	images/published/welcome-screen.png
 migration_toolkit_SOURCES = migration-toolkit.xml $(migration_toolkit_INCLUDES)
 migration_toolkit_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/accessprep.idmap \
-	metadata/indepth.idmap \
-	metadata/introduction.idmap \
-	metadata/scripted-migration.idmap
+	../migration-toolkit/metadata/accessprep.idmap \
+	../migration-toolkit/metadata/indepth.idmap \
+	../migration-toolkit/metadata/introduction.idmap \
+	../migration-toolkit/metadata/scripted-migration.idmap \
+	../refman-common/metadata/bug-reports.idmap
 migration-toolkit.validpure: $(migration_toolkit_SOURCES)
 migration-toolkit.titles: $(migration_toolkit_SOURCES)
 migration-toolkit.useless: $(migration_toolkit_SOURCES)

@@ -269,7 +269,7 @@
 scripted_migration_SOURCES = scripted-migration.xml $(scripted_migration_INCLUDES)
 scripted_migration_IDMAPS = \
 	../gui-common/metadata/chapter-grt-shell.idmap \
-	metadata/indepth.idmap
+	../migration-toolkit/metadata/indepth.idmap
 scripted-migration.validpure: $(scripted_migration_SOURCES)
 scripted-migration.titles: $(scripted_migration_SOURCES)
 scripted-migration.useless: $(scripted_migration_SOURCES)


Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/mysqldoc-guide/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 7, Lines Added: 12, Lines Deleted: 13; 3239 bytes

@@ -5,8 +5,8 @@
 formats_IMAGES =
 formats_SOURCES = formats.xml $(formats_INCLUDES)
 formats_IDMAPS = \
-	metadata/formats.de.idmap \
-	metadata/tools.de.idmap
+	../mysqldoc-guide/metadata/formats.de.idmap \
+	../mysqldoc-guide/metadata/tools.de.idmap
 formats.validpure: $(formats_SOURCES)
 formats.titles: $(formats_SOURCES)
 formats.useless: $(formats_SOURCES)

@@ -23,8 +23,8 @@
 formatting_guide_IMAGES =
 formatting_guide_SOURCES = formatting-guide.xml $(formatting_guide_INCLUDES)
 formatting_guide_IDMAPS = \
-	metadata/formatting-guide.idmap \
-	metadata/styleguide.idmap
+	../mysqldoc-guide/metadata/formatting-guide.idmap \
+	../mysqldoc-guide/metadata/styleguide.idmap
 formatting-guide.validpure: $(formatting_guide_SOURCES)
 formatting-guide.titles: $(formatting_guide_SOURCES)
 formatting-guide.useless: $(formatting_guide_SOURCES)

@@ -63,8 +63,7 @@
 mysqldoc_formatting_guide_IMAGES =
 mysqldoc_formatting_guide_SOURCES = mysqldoc-formatting-guide.xml $(mysqldoc_formatting_guide_INCLUDES)
 mysqldoc_formatting_guide_IDMAPS = \
-	metadata/formatting-guide.idmap \
-	metadata/styleguide.idmap
+	../mysqldoc-guide/metadata/styleguide.idmap
 mysqldoc-formatting-guide.validpure: $(mysqldoc_formatting_guide_SOURCES)
 mysqldoc-formatting-guide.titles: $(mysqldoc_formatting_guide_SOURCES)
 mysqldoc-formatting-guide.useless: $(mysqldoc_formatting_guide_SOURCES)

@@ -87,10 +86,10 @@
 mysqldoc_guide_IMAGES =
 mysqldoc_guide_SOURCES = mysqldoc-guide.xml $(mysqldoc_guide_INCLUDES)
 mysqldoc_guide_IDMAPS = \
-	metadata/formats.de.idmap \
-	metadata/formatting-guide.idmap \
-	metadata/styleguide.idmap \
-	metadata/tools.de.idmap
+	../mysqldoc-guide/metadata/formats.de.idmap \
+	../mysqldoc-guide/metadata/formatting-guide.idmap \
+	../mysqldoc-guide/metadata/styleguide.idmap \
+	../mysqldoc-guide/metadata/tools.de.idmap
 mysqldoc-guide.validpure: $(mysqldoc_guide_SOURCES)
 mysqldoc-guide.titles: $(mysqldoc_guide_SOURCES)
 mysqldoc-guide.useless: $(mysqldoc_guide_SOURCES)

@@ -116,7 +115,7 @@
 mysqldoc_style_guide_IMAGES =
 mysqldoc_style_guide_SOURCES = mysqldoc-style-guide.xml $(mysqldoc_style_guide_INCLUDES)
 mysqldoc_style_guide_IDMAPS = \
-	metadata/formatting-guide.idmap
+	../mysqldoc-guide/metadata/formatting-guide.idmap
 mysqldoc-style-guide.validpure: $(mysqldoc_style_guide_SOURCES)
 mysqldoc-style-guide.titles: $(mysqldoc_style_guide_SOURCES)
 mysqldoc-style-guide.useless: $(mysqldoc_style_guide_SOURCES)

@@ -146,7 +145,7 @@
 styleguide_IMAGES =
 styleguide_SOURCES = styleguide.xml $(styleguide_INCLUDES)
 styleguide_IDMAPS = \
-	metadata/formatting-guide.idmap
+	../mysqldoc-guide/metadata/formatting-guide.idmap
 styleguide.validpure: $(styleguide_SOURCES)
 styleguide.titles: $(styleguide_SOURCES)
 styleguide.useless: $(styleguide_SOURCES)

@@ -163,7 +162,7 @@
 tools_IMAGES =
 tools_SOURCES = tools.xml $(tools_INCLUDES)
 tools_IDMAPS = \
-	metadata/tools.de.idmap
+	../mysqldoc-guide/metadata/tools.de.idmap
 tools.validpure: $(tools_SOURCES)
 tools.titles: $(tools_SOURCES)
 tools.useless: $(tools_SOURCES)


Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/mysqltest/Makefile	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 497 bytes

@@ -19,7 +19,7 @@
 IDMAP_MAIN = mysqltest
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = $(REPO_ROOT)/mysqltext $(REPO_ROOT)/refman-5.1
+IDMAP_REFS = $(REPO_ROOT)/mysqltest $(REPO_ROOT)/refman-5.1
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/mysqltest/Makefile.depends
===================================================================
--- trunk/mysqltest/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/mysqltest/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 4, Lines Added: 10, Lines Deleted: 10; 2041 bytes

@@ -4,7 +4,7 @@
 command_reference_IMAGES =
 command_reference_SOURCES = command-reference.xml $(command_reference_INCLUDES)
 command_reference_IDMAPS = \
-	metadata/command-reference.idmap
+	../mysqltest/metadata/command-reference.idmap
 command-reference.validpure: $(command_reference_SOURCES)
 command-reference.titles: $(command_reference_SOURCES)
 command-reference.useless: $(command_reference_SOURCES)

@@ -71,10 +71,10 @@
 mysqltest_IMAGES =
 mysqltest_SOURCES = mysqltest.xml $(mysqltest_INCLUDES)
 mysqltest_IDMAPS = \
-	../refman-5.1/metadata/installing-core.idmap \
-	metadata/command-reference.idmap \
-	metadata/programs.idmap \
-	metadata/tutorial.idmap
+	../mysqltest/metadata/command-reference.idmap \
+	../mysqltest/metadata/programs.idmap \
+	../mysqltest/metadata/tutorial.idmap \
+	../refman-5.1/metadata/installing-core.idmap
 mysqltest.validpure: $(mysqltest_SOURCES)
 mysqltest.titles: $(mysqltest_SOURCES)
 mysqltest.useless: $(mysqltest_SOURCES)

@@ -105,8 +105,8 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	../refman-5.1/metadata/installing-core.idmap \
-	metadata/command-reference.idmap
+	../mysqltest/metadata/command-reference.idmap \
+	../refman-5.1/metadata/installing-core.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -122,9 +122,9 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/command-reference.idmap \
-	metadata/programs.idmap \
-	metadata/tutorial.idmap
+	../mysqltest/metadata/command-reference.idmap \
+	../mysqltest/metadata/programs.idmap \
+	../mysqltest/metadata/tutorial.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)


Modified: trunk/ndbapi/Makefile.depends
===================================================================
--- trunk/ndbapi/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/ndbapi/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 17, Lines Added: 99, Lines Deleted: 99; 14111 bytes

@@ -9,9 +9,9 @@
 	images/published/Ndb-cluster-connection-class.png
 class_ndb_cluster_connection_SOURCES = class-ndb-cluster-connection.xml $(class_ndb_cluster_connection_INCLUDES)
 class_ndb_cluster_connection_IDMAPS = \
-	metadata/class-ndb-cluster-connection.idmap \
-	metadata/class-ndb.idmap \
-	metadata/ndb-examples.idmap
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/ndb-examples.idmap
 class-ndb-cluster-connection.validpure: $(class_ndb_cluster_connection_SOURCES)
 class-ndb-cluster-connection.titles: $(class_ndb_cluster_connection_SOURCES)
 class-ndb-cluster-connection.useless: $(class_ndb_cluster_connection_SOURCES)

@@ -32,13 +32,13 @@
 	images/published/Ndb-class.png
 class_ndb_SOURCES = class-ndb.xml $(class_ndb_INCLUDES)
 class_ndb_IDMAPS = \
-	metadata/class-ndb-cluster-connection.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/class-ndbtransaction.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/ndb-internals.idmap
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/ndb-internals.idmap
 class-ndb.validpure: $(class_ndb_SOURCES)
 class-ndb.titles: $(class_ndb_SOURCES)
 class-ndb.useless: $(class_ndb_SOURCES)

@@ -59,11 +59,11 @@
 	images/published/NdbBlob-class.png
 class_ndbblob_SOURCES = class-ndbblob.xml $(class_ndbblob_INCLUDES)
 class_ndbblob_IDMAPS = \
-	metadata/class-ndbblob.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/ndb-errors.idmap
+	../ndbapi/metadata/class-ndbblob.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/ndb-errors.idmap
 class-ndbblob.validpure: $(class_ndbblob_SOURCES)
 class-ndbblob.titles: $(class_ndbblob_SOURCES)
 class-ndbblob.useless: $(class_ndbblob_SOURCES)

@@ -108,17 +108,17 @@
 	images/published/NdbDictionary-classes.png
 class_ndbdictionary_SOURCES = class-ndbdictionary.xml $(class_ndbdictionary_INCLUDES)
 class_ndbdictionary_IDMAPS = \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbblob.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/interface-ndbrecord.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
 	../refman-5.1/metadata/apis-c.idmap \
 	../refman-5.1/metadata/data-types.idmap \
 	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbblob.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/interface-ndbrecord.idmap \
-	metadata/ndb-errors.idmap
+	../refman-5.1/metadata/sql-syntax.idmap
 class-ndbdictionary.validpure: $(class_ndbdictionary_SOURCES)
 class-ndbdictionary.titles: $(class_ndbdictionary_SOURCES)
 class-ndbdictionary.useless: $(class_ndbdictionary_SOURCES)

@@ -139,13 +139,13 @@
 	images/published/NdbEventOperation-class.png
 class_ndbeventoperation_SOURCES = class-ndbeventoperation.xml $(class_ndbeventoperation_INCLUDES)
 class_ndbeventoperation_IDMAPS = \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbblob.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/class-ndbrecattr.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/ndb-examples.idmap
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbblob.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/class-ndbrecattr.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/ndb-examples.idmap
 class-ndbeventoperation.validpure: $(class_ndbeventoperation_SOURCES)
 class-ndbeventoperation.titles: $(class_ndbeventoperation_SOURCES)
 class-ndbeventoperation.useless: $(class_ndbeventoperation_SOURCES)

@@ -174,14 +174,14 @@
 	images/published/NdbScanOperation-class.png
 class_ndboperation_SOURCES = class-ndboperation.xml $(class_ndboperation_INCLUDES)
 class_ndboperation_IDMAPS = \
-	metadata/class-ndbblob.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbrecattr.idmap \
-	metadata/class-ndbtransaction.idmap \
-	metadata/interface-ndbrecord.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/overview.idmap
+	../ndbapi/metadata/class-ndbblob.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbrecattr.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap \
+	../ndbapi/metadata/interface-ndbrecord.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/overview.idmap
 class-ndboperation.validpure: $(class_ndboperation_SOURCES)
 class-ndboperation.titles: $(class_ndboperation_SOURCES)
 class-ndboperation.useless: $(class_ndboperation_SOURCES)

@@ -202,9 +202,9 @@
 	images/published/NdbRecAttr-class.png
 class_ndbrecattr_SOURCES = class-ndbrecattr.xml $(class_ndbrecattr_INCLUDES)
 class_ndbrecattr_IDMAPS = \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbrecattr.idmap \
-	metadata/ndb-examples.idmap
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbrecattr.idmap \
+	../ndbapi/metadata/ndb-examples.idmap
 class-ndbrecattr.validpure: $(class_ndbrecattr_SOURCES)
 class-ndbrecattr.titles: $(class_ndbrecattr_SOURCES)
 class-ndbrecattr.useless: $(class_ndbrecattr_SOURCES)

@@ -225,8 +225,8 @@
 	images/published/NdbScanFilter-class.png
 class_ndbscanfilter_SOURCES = class-ndbscanfilter.xml $(class_ndbscanfilter_INCLUDES)
 class_ndbscanfilter_IDMAPS = \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbscanfilter.idmap
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbscanfilter.idmap
 class-ndbscanfilter.validpure: $(class_ndbscanfilter_SOURCES)
 class-ndbscanfilter.titles: $(class_ndbscanfilter_SOURCES)
 class-ndbscanfilter.useless: $(class_ndbscanfilter_SOURCES)

@@ -247,12 +247,12 @@
 	images/published/NdbTransaction-class.png
 class_ndbtransaction_SOURCES = class-ndbtransaction.xml $(class_ndbtransaction_INCLUDES)
 class_ndbtransaction_IDMAPS = \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbtransaction.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/overview.idmap
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/overview.idmap
 class-ndbtransaction.validpure: $(class_ndbtransaction_SOURCES)
 class-ndbtransaction.titles: $(class_ndbtransaction_SOURCES)
 class-ndbtransaction.useless: $(class_ndbtransaction_SOURCES)

@@ -271,7 +271,7 @@
 getting_started_IMAGES =
 getting_started_SOURCES = getting-started.xml $(getting_started_INCLUDES)
 getting_started_IDMAPS = \
-	metadata/class-ndb-cluster-connection.idmap
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap
 getting-started.validpure: $(getting_started_SOURCES)
 getting-started.titles: $(getting_started_SOURCES)
 getting-started.useless: $(getting_started_SOURCES)

@@ -290,9 +290,9 @@
 interface_ndbrecord_IMAGES =
 interface_ndbrecord_SOURCES = interface-ndbrecord.xml $(interface_ndbrecord_INCLUDES)
 interface_ndbrecord_IDMAPS = \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbtransaction.idmap
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap
 interface-ndbrecord.validpure: $(interface_ndbrecord_SOURCES)
 interface-ndbrecord.titles: $(interface_ndbrecord_SOURCES)
 interface-ndbrecord.useless: $(interface_ndbrecord_SOURCES)

@@ -324,8 +324,8 @@
 mgm_api_IMAGES =
 mgm_api_SOURCES = mgm-api.xml $(mgm_api_INCLUDES)
 mgm_api_IDMAPS = \
-	metadata/mgm-api.idmap \
-	metadata/ndb-errors.idmap
+	../ndbapi/metadata/mgm-api.idmap \
+	../ndbapi/metadata/ndb-errors.idmap
 mgm-api.validpure: $(mgm_api_SOURCES)
 mgm-api.titles: $(mgm_api_SOURCES)
 mgm-api.useless: $(mgm_api_SOURCES)

@@ -424,9 +424,9 @@
 	images/published/NdbError-struct.png
 ndb_errors_SOURCES = ndb-errors.xml $(ndb_errors_INCLUDES)
 ndb_errors_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	metadata/mgm-api.idmap \
-	metadata/ndb-errors.idmap
+	../ndbapi/metadata/mgm-api.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap
 ndb-errors.validpure: $(ndb_errors_SOURCES)
 ndb-errors.titles: $(ndb_errors_SOURCES)
 ndb-errors.useless: $(ndb_errors_SOURCES)

@@ -445,12 +445,12 @@
 ndb_examples_IMAGES =
 ndb_examples_SOURCES = ndb-examples.xml $(ndb_examples_INCLUDES)
 ndb_examples_IDMAPS = \
-	metadata/class-ndb-cluster-connection.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbscanfilter.idmap \
-	metadata/class-ndbtransaction.idmap
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbscanfilter.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap
 ndb-examples.validpure: $(ndb_examples_SOURCES)
 ndb-examples.titles: $(ndb_examples_SOURCES)
 ndb-examples.useless: $(ndb_examples_SOURCES)

@@ -489,12 +489,12 @@
 	images/published/ndb-protocol-uk-lookup-1.png
 ndb_internals_SOURCES = ndb-internals.xml $(ndb_internals_INCLUDES)
 ndb_internals_IDMAPS = \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/ndb-internals-ndb-protocol.idmap \
+	../ndbapi/metadata/ndb-internals.idmap \
 	../refman-5.1/metadata/mysql-cluster-backup.idmap \
-	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/ndb-internals-ndb-protocol.idmap \
-	metadata/ndb-internals.idmap
+	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap
 ndb-internals.validpure: $(ndb_internals_SOURCES)
 ndb-internals.titles: $(ndb_internals_SOURCES)
 ndb-internals.useless: $(ndb_internals_SOURCES)

@@ -603,30 +603,30 @@
 	images/published/ndb-protocol-uk-lookup-1.png
 ndbapi_SOURCES = ndbapi.xml $(ndbapi_INCLUDES)
 ndbapi_IDMAPS = \
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbblob.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbrecattr.idmap \
+	../ndbapi/metadata/class-ndbscanfilter.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap \
+	../ndbapi/metadata/interface-ndbrecord.idmap \
+	../ndbapi/metadata/mgm-api.idmap \
+	../ndbapi/metadata/ndb-classes.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/ndb-examples.idmap \
+	../ndbapi/metadata/ndb-internals-ndb-protocol.idmap \
+	../ndbapi/metadata/ndb-internals.idmap \
+	../ndbapi/metadata/overview.idmap \
 	../refman-5.1/metadata/apis-c.idmap \
 	../refman-5.1/metadata/data-types.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-backup.idmap \
 	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	metadata/class-ndb-cluster-connection.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbblob.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbrecattr.idmap \
-	metadata/class-ndbscanfilter.idmap \
-	metadata/class-ndbtransaction.idmap \
-	metadata/interface-ndbrecord.idmap \
-	metadata/mgm-api.idmap \
-	metadata/ndb-classes.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/ndb-examples.idmap \
-	metadata/ndb-internals-ndb-protocol.idmap \
-	metadata/ndb-internals.idmap \
-	metadata/overview.idmap
+	../refman-5.1/metadata/sql-syntax.idmap
 ndbapi.validpure: $(ndbapi_SOURCES)
 ndbapi.titles: $(ndbapi_SOURCES)
 ndbapi.useless: $(ndbapi_SOURCES)

@@ -645,20 +645,20 @@
 overview_IMAGES =
 overview_SOURCES = overview.xml $(overview_INCLUDES)
 overview_IDMAPS = \
+	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
+	../ndbapi/metadata/class-ndb.idmap \
+	../ndbapi/metadata/class-ndbdictionary.idmap \
+	../ndbapi/metadata/class-ndbeventoperation.idmap \
+	../ndbapi/metadata/class-ndboperation.idmap \
+	../ndbapi/metadata/class-ndbrecattr.idmap \
+	../ndbapi/metadata/class-ndbtransaction.idmap \
+	../ndbapi/metadata/mgm-api.idmap \
+	../ndbapi/metadata/ndb-classes.idmap \
+	../ndbapi/metadata/ndb-errors.idmap \
+	../ndbapi/metadata/ndb-examples.idmap \
+	../ndbapi/metadata/overview.idmap \
 	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
-	../refman-5.1/metadata/partitioning.idmap \
-	metadata/class-ndb-cluster-connection.idmap \
-	metadata/class-ndb.idmap \
-	metadata/class-ndbdictionary.idmap \
-	metadata/class-ndbeventoperation.idmap \
-	metadata/class-ndboperation.idmap \
-	metadata/class-ndbrecattr.idmap \
-	metadata/class-ndbtransaction.idmap \
-	metadata/mgm-api.idmap \
-	metadata/ndb-classes.idmap \
-	metadata/ndb-errors.idmap \
-	metadata/ndb-examples.idmap \
-	metadata/overview.idmap
+	../refman-5.1/metadata/partitioning.idmap
 overview.validpure: $(overview_SOURCES)
 overview.titles: $(overview_SOURCES)
 overview.useless: $(overview_SOURCES)


Modified: trunk/pt/refman-5.1/Makefile
===================================================================
--- trunk/pt/refman-5.1/Makefile	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/pt/refman-5.1/Makefile	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 638 bytes

@@ -21,7 +21,7 @@
 IDMAP_VER = $(DOC_VER)
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-6.0 $(REPO_ROOT)/ndbapi $(REPO_ROOT)/quick-guides
+IDMAP_REFS = ../refman-5.1 $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-6.0 $(REPO_ROOT)/ndbapi $(REPO_ROOT)/quick-guides
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/pt/refman-5.1/Makefile.depends
===================================================================
--- trunk/pt/refman-5.1/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/pt/refman-5.1/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 67, Lines Added: 744, Lines Deleted: 744; 84583 bytes

@@ -9,18 +9,18 @@
 apis_c_IDMAPS = \
 	../../refman-common/metadata/connector-j.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-libmysqld.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -75,9 +75,9 @@
 apis_libmysqld_IMAGES =
 apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES)
 apis_libmysqld_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
 apis-libmysqld.useless: $(apis_libmysqld_SOURCES)

@@ -97,7 +97,7 @@
 apis_perl_SOURCES = apis-perl.xml $(apis_perl_INCLUDES)
 apis_perl_IDMAPS = \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/installing-core.idmap
+	../refman-5.1/metadata/installing-core.idmap
 apis-perl.validpure: $(apis_perl_SOURCES)
 apis-perl.titles: $(apis_perl_SOURCES)
 apis-perl.useless: $(apis_perl_SOURCES)

@@ -116,8 +116,8 @@
 apis_php_IMAGES =
 apis_php_SOURCES = apis-php.xml $(apis_php_INCLUDES)
 apis_php_IDMAPS = \
-	metadata/apis-php.idmap \
-	metadata/errors-problems-core.idmap
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap
 apis-php.validpure: $(apis_php_SOURCES)
 apis-php.titles: $(apis_php_SOURCES)
 apis-php.useless: $(apis_php_SOURCES)

@@ -315,14 +315,14 @@
 	../../refman-common/metadata/news-cmxj-core.idmap \
 	../../refman-common/metadata/news-cnet-core.idmap \
 	../../refman-common/metadata/news-codbc-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-php.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -341,18 +341,18 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -515,42 +515,42 @@
 dynxml_local_dba_SOURCES = dynxml-local-dba.xml $(dynxml_local_dba_INCLUDES)
 dynxml_local_dba_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-perl.idmap \
-	metadata/apis-php.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-topology.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -575,20 +575,20 @@
 dynxml_local_errors_problems_SOURCES = dynxml-local-errors-problems.xml $(dynxml_local_errors_problems_INCLUDES)
 dynxml_local_errors_problems_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 dynxml-local-errors-problems.validpure: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.titles: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.useless: $(dynxml_local_errors_problems_SOURCES)

@@ -610,21 +610,21 @@
 dynxml_local_functions_SOURCES = dynxml-local-functions.xml $(dynxml_local_functions_INCLUDES)
 dynxml_local_functions_IDMAPS = \
 	../../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -647,30 +647,30 @@
 dynxml_local_installing_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)

@@ -690,16 +690,16 @@
 dynxml_local_language_structure_SOURCES = dynxml-local-language-structure.xml $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_language_structure_IDMAPS = \
 	../../quick-guides/metadata/reservedwords-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-perl.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-language-structure.validpure: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.titles: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.useless: $(dynxml_local_language_structure_SOURCES)

@@ -729,37 +729,37 @@
 	../../ndbapi/metadata/class-ndbtransaction.idmap \
 	../../ndbapi/metadata/mgm-api.idmap \
 	../../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 dynxml-local-news-5.1.validpure: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.titles: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.useless: $(dynxml_local_news_5_1_SOURCES)

@@ -780,12 +780,12 @@
 dynxml_local_se_innodb_IMAGES =
 dynxml_local_se_innodb_SOURCES = dynxml-local-se-innodb.xml $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_innodb_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -806,14 +806,14 @@
 dynxml_local_se_myisam_IMAGES =
 dynxml_local_se_myisam_SOURCES = dynxml-local-se-myisam.xml $(dynxml_local_se_myisam_INCLUDES)
 dynxml_local_se_myisam_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 dynxml-local-se-myisam.validpure: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.titles: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.useless: $(dynxml_local_se_myisam_SOURCES)

@@ -871,16 +871,16 @@
 events_IMAGES =
 events_SOURCES = events.xml $(events_INCLUDES)
 events_IDMAPS = \
-	metadata/events.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap
 events.validpure: $(events_SOURCES)
 events.titles: $(events_SOURCES)
 events.useless: $(events_SOURCES)

@@ -901,16 +901,16 @@
 extending_mysql_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -936,40 +936,40 @@
 	../../refman-common/metadata/connector-mxj.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-php.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-server.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/ha.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/views.idmap
 faqs.validpure: $(faqs_SOURCES)
 faqs.titles: $(faqs_SOURCES)
 faqs.useless: $(faqs_SOURCES)

@@ -1007,10 +1007,10 @@
 ha_SOURCES = ha.xml $(ha_INCLUDES)
 ha_IDMAPS = \
 	../../refman-common/metadata/replication-drbd.idmap \
-	metadata/faqs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap
 ha.validpure: $(ha_SOURCES)
 ha.titles: $(ha_SOURCES)
 ha.useless: $(ha_SOURCES)

@@ -1029,18 +1029,18 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/views.idmap
 information-schema.validpure: $(information_schema_SOURCES)
 information-schema.titles: $(information_schema_SOURCES)
 information-schema.useless: $(information_schema_SOURCES)

@@ -1073,16 +1073,16 @@
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
 	../../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 internationalization.validpure: $(internationalization_SOURCES)
 internationalization.titles: $(internationalization_SOURCES)
 internationalization.useless: $(internationalization_SOURCES)

@@ -1112,41 +1112,41 @@
 	../../refman-common/metadata/credits.idmap \
 	../../refman-common/metadata/information-sources.idmap \
 	../../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -1476,77 +1476,77 @@
 	../../refman-common/metadata/mysql-proxy.idmap \
 	../../refman-common/metadata/replication-drbd.idmap \
 	../../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/apis-perl.idmap \
-	metadata/apis-php.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis-libmysqld.idmap \
+	../refman-5.1/metadata/apis-perl.idmap \
+	../refman-5.1/metadata/apis-php.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/ha.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/precision-math.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/programs.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/replication-topology.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1565,11 +1565,11 @@
 mysql_cluster_backup_IMAGES =
 mysql_cluster_backup_SOURCES = mysql-cluster-backup.xml $(mysql_cluster_backup_INCLUDES)
 mysql_cluster_backup_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-backup.validpure: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.titles: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.useless: $(mysql_cluster_backup_SOURCES)

@@ -1589,9 +1589,9 @@
 mysql_cluster_cge_SOURCES = mysql-cluster-cge.xml $(mysql_cluster_cge_INCLUDES)
 mysql_cluster_cge_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-cge.validpure: $(mysql_cluster_cge_SOURCES)
 mysql-cluster-cge.titles: $(mysql_cluster_cge_SOURCES)
 mysql-cluster-cge.useless: $(mysql_cluster_cge_SOURCES)

@@ -1612,13 +1612,13 @@
 mysql_cluster_configuration_IDMAPS = \
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap
 mysql-cluster-configuration.validpure: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.titles: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.useless: $(mysql_cluster_configuration_SOURCES)

@@ -1637,9 +1637,9 @@
 mysql_cluster_disk_data_IMAGES =
 mysql_cluster_disk_data_SOURCES = mysql-cluster-disk-data.xml $(mysql_cluster_disk_data_INCLUDES)
 mysql_cluster_disk_data_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/information-schema.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-disk-data.validpure: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.titles: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.useless: $(mysql_cluster_disk_data_SOURCES)

@@ -1658,12 +1658,12 @@
 mysql_cluster_glossary_IMAGES =
 mysql_cluster_glossary_SOURCES = mysql-cluster-glossary.xml $(mysql_cluster_glossary_INCLUDES)
 mysql_cluster_glossary_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap
 mysql-cluster-glossary.validpure: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.titles: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.useless: $(mysql_cluster_glossary_SOURCES)

@@ -1682,8 +1682,8 @@
 mysql_cluster_interconnects_IMAGES =
 mysql_cluster_interconnects_SOURCES = mysql-cluster-interconnects.xml $(mysql_cluster_interconnects_INCLUDES)
 mysql_cluster_interconnects_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap
 mysql-cluster-interconnects.validpure: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.titles: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.useless: $(mysql_cluster_interconnects_SOURCES)

@@ -1703,15 +1703,15 @@
 mysql_cluster_limitations_SOURCES = mysql-cluster-limitations.xml $(mysql_cluster_limitations_INCLUDES)
 mysql_cluster_limitations_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/partitioning.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-limitations.validpure: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.titles: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.useless: $(mysql_cluster_limitations_SOURCES)

@@ -1731,13 +1731,13 @@
 mysql_cluster_management_SOURCES = mysql-cluster-management.xml $(mysql_cluster_management_INCLUDES)
 mysql_cluster_management_IDMAPS = \
 	../../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-management.validpure: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.titles: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.useless: $(mysql_cluster_management_SOURCES)

@@ -1758,16 +1758,16 @@
 	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml $(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1793,8 +1793,8 @@
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml $(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-overview.idmap
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap
 mysql-cluster-overview.validpure: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.titles: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.useless: $(mysql_cluster_overview_SOURCES)

@@ -1814,13 +1814,13 @@
 mysql_cluster_process_management_SOURCES = mysql-cluster-process-management.xml $(mysql_cluster_process_management_INCLUDES)
 mysql_cluster_process_management_IDMAPS = \
 	../../ndbapi/metadata/ndb-errors.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1847,16 +1847,16 @@
 	../refman-common/images/published/cluster-replication-overview.png
 mysql_cluster_replication_SOURCES = mysql-cluster-replication.xml $(mysql_cluster_replication_INCLUDES)
 mysql_cluster_replication_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster-replication.validpure: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.titles: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.useless: $(mysql_cluster_replication_SOURCES)

@@ -1875,11 +1875,11 @@
 mysql_cluster_roadmap_IMAGES =
 mysql_cluster_roadmap_SOURCES = mysql-cluster-roadmap.xml $(mysql_cluster_roadmap_INCLUDES)
 mysql_cluster_roadmap_IDMAPS = \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/partitioning.idmap
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/partitioning.idmap
 mysql-cluster-roadmap.validpure: $(mysql_cluster_roadmap_SOURCES)
 mysql-cluster-roadmap.titles: $(mysql_cluster_roadmap_SOURCES)
 mysql-cluster-roadmap.useless: $(mysql_cluster_roadmap_SOURCES)

@@ -1902,10 +1902,10 @@
 	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml $(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-upgrade-downgrade.validpure: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.titles: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.useless: $(mysql_cluster_upgrade_downgrade_SOURCES)

@@ -1927,13 +1927,13 @@
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml $(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../../ndbapi/metadata/ndbapi.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap
 mysql-cluster-utilities.validpure: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.titles: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.useless: $(mysql_cluster_utilities_SOURCES)

@@ -1993,34 +1993,34 @@
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../ndbapi/metadata/ndbapi.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-cge.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-roadmap.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-backup.idmap \
+	../refman-5.1/metadata/mysql-cluster-cge.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
+	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2100,28 +2100,28 @@
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
 	../../refman-6.0/metadata/dba-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/connectors.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2140,17 +2140,17 @@
 partitioning_IMAGES =
 partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
 partitioning_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 partitioning.validpure: $(partitioning_SOURCES)
 partitioning.titles: $(partitioning_SOURCES)
 partitioning.useless: $(partitioning_SOURCES)

@@ -2169,8 +2169,8 @@
 precision_math_IMAGES =
 precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
 precision_math_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/precision-math.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/precision-math.idmap
 precision-math.validpure: $(precision_math_SOURCES)
 precision-math.titles: $(precision_math_SOURCES)
 precision-math.useless: $(precision_math_SOURCES)

@@ -2207,15 +2207,15 @@
 programs_admin_util_IMAGES =
 programs_admin_util_SOURCES = programs-admin-util.xml $(programs_admin_util_INCLUDES)
 programs_admin_util_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 programs-admin-util.validpure: $(programs_admin_util_SOURCES)
 programs-admin-util.titles: $(programs_admin_util_SOURCES)
 programs-admin-util.useless: $(programs_admin_util_SOURCES)

@@ -2234,17 +2234,17 @@
 programs_client_IMAGES =
 programs_client_SOURCES = programs-client.xml $(programs_client_INCLUDES)
 programs_client_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -2263,7 +2263,7 @@
 programs_development_IMAGES =
 programs_development_SOURCES = programs-development.xml $(programs_development_INCLUDES)
 programs_development_IDMAPS = \
-	metadata/programs-miscellaneous.idmap
+	../refman-5.1/metadata/programs-miscellaneous.idmap
 programs-development.validpure: $(programs_development_SOURCES)
 programs-development.titles: $(programs_development_SOURCES)
 programs-development.useless: $(programs_development_SOURCES)

@@ -2282,10 +2282,10 @@
 programs_installation_IMAGES =
 programs_installation_SOURCES = programs-installation.xml $(programs_installation_INCLUDES)
 programs_installation_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)
 programs-installation.titles: $(programs_installation_SOURCES)
 programs-installation.useless: $(programs_installation_SOURCES)

@@ -2304,7 +2304,7 @@
 programs_miscellaneous_IMAGES =
 programs_miscellaneous_SOURCES = programs-miscellaneous.xml $(programs_miscellaneous_INCLUDES)
 programs_miscellaneous_IDMAPS = \
-	metadata/programs-development.idmap
+	../refman-5.1/metadata/programs-development.idmap
 programs-miscellaneous.validpure: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.titles: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.useless: $(programs_miscellaneous_SOURCES)

@@ -2323,11 +2323,11 @@
 programs_server_IMAGES =
 programs_server_SOURCES = programs-server.xml $(programs_server_INCLUDES)
 programs_server_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -2346,11 +2346,11 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs-using.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/programs-using.idmap
 programs-using.validpure: $(programs_using_SOURCES)
 programs-using.titles: $(programs_using_SOURCES)
 programs-using.useless: $(programs_using_SOURCES)

@@ -2376,27 +2376,27 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-development.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/programs-miscellaneous.idmap \
+	../refman-5.1/metadata/programs-server.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2415,14 +2415,14 @@
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
 replication_configuration_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication-configuration.validpure: $(replication_configuration_SOURCES)
 replication-configuration.titles: $(replication_configuration_SOURCES)
 replication-configuration.useless: $(replication_configuration_SOURCES)

@@ -2441,12 +2441,12 @@
 replication_implementation_IMAGES =
 replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
 replication_implementation_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)
 replication-implementation.useless: $(replication_implementation_SOURCES)

@@ -2466,19 +2466,19 @@
 replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
 replication_notes_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication-notes.validpure: $(replication_notes_SOURCES)
 replication-notes.titles: $(replication_notes_SOURCES)
 replication-notes.useless: $(replication_notes_SOURCES)

@@ -2507,11 +2507,11 @@
 	../refman-common/images/published/submaster-performance.png
 replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES)
 replication_solutions_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)
 replication-solutions.titles: $(replication_solutions_SOURCES)
 replication-solutions.useless: $(replication_solutions_SOURCES)

@@ -2545,23 +2545,23 @@
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/replication-solutions.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -2580,10 +2580,10 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 restrictions.validpure: $(restrictions_SOURCES)
 restrictions.titles: $(restrictions_SOURCES)
 restrictions.useless: $(restrictions_SOURCES)

@@ -2602,8 +2602,8 @@
 se_archive_IMAGES =
 se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
 se_archive_IDMAPS = \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-archive.validpure: $(se_archive_SOURCES)
 se-archive.titles: $(se_archive_SOURCES)
 se-archive.useless: $(se_archive_SOURCES)

@@ -2624,7 +2624,7 @@
 	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
-	metadata/replication-configuration.idmap
+	../refman-5.1/metadata/replication-configuration.idmap
 se-blackhole.validpure: $(se_blackhole_SOURCES)
 se-blackhole.titles: $(se_blackhole_SOURCES)
 se-blackhole.useless: $(se_blackhole_SOURCES)

@@ -2681,8 +2681,8 @@
 	../refman-common/images/published/se-federated-structure.png
 se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES)
 se_federated_IDMAPS = \
-	metadata/se-federated.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-federated.validpure: $(se_federated_SOURCES)
 se-federated.titles: $(se_federated_SOURCES)
 se-federated.useless: $(se_federated_SOURCES)

@@ -2714,9 +2714,9 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)
 se-memory.titles: $(se_memory_SOURCES)
 se-memory.useless: $(se_memory_SOURCES)

@@ -2735,9 +2735,9 @@
 se_merge_IMAGES =
 se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
 se_merge_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap
 se-merge.validpure: $(se_merge_SOURCES)
 se-merge.titles: $(se_merge_SOURCES)
 se-merge.useless: $(se_merge_SOURCES)

@@ -2769,9 +2769,9 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -2791,47 +2791,47 @@
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
 	../../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/apis.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/events.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap \
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-5.1/metadata/views.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -2868,30 +2868,30 @@
 	../refman-common/images/published/se-federated-structure.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-admin-util.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/se-archive.idmap \
+	../refman-5.1/metadata/se-blackhole.idmap \
+	../refman-5.1/metadata/se-csv.idmap \
+	../refman-5.1/metadata/se-example.idmap \
+	../refman-5.1/metadata/se-federated.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/se-memory.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam-core.idmap \
+	../refman-5.1/metadata/spatial-extensions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/storage-engines.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -2910,17 +2910,17 @@
 stored_procedures_IMAGES =
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/restrictions.idmap \
-	metadata/stored-procedures.idmap
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/extending-mysql.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/replication-implementation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap
 stored-procedures.validpure: $(stored_procedures_SOURCES)
 stored-procedures.titles: $(stored_procedures_SOURCES)
 stored-procedures.useless: $(stored_procedures_SOURCES)

@@ -2939,12 +2939,12 @@
 triggers_IMAGES =
 triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
 triggers_IDMAPS = \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/triggers.idmap
 triggers.validpure: $(triggers_SOURCES)
 triggers.titles: $(triggers_SOURCES)
 triggers.useless: $(triggers_SOURCES)

@@ -2963,19 +2963,19 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/functions-core.idmap \
+	../refman-5.1/metadata/installing-core.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
+	../refman-5.1/metadata/optimization.idmap \
+	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/replication-notes.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/tutorial.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)

@@ -2994,13 +2994,13 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/programs-installation.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/views.idmap
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
+	../refman-5.1/metadata/information-schema.idmap \
+	../refman-5.1/metadata/programs-installation.idmap \
+	../refman-5.1/metadata/restrictions.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-5.1/metadata/views.idmap
 views.validpure: $(views_SOURCES)
 views.titles: $(views_SOURCES)
 views.useless: $(views_SOURCES)


Modified: trunk/query-browser/Makefile.depends
===================================================================
--- trunk/query-browser/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/query-browser/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 6, Lines Added: 17, Lines Deleted: 17; 3575 bytes

@@ -8,7 +8,7 @@
 	images/published/qb-options.png
 chapter_options_query_browser_SOURCES = chapter-options-query-browser.xml $(chapter_options_query_browser_INCLUDES)
 chapter_options_query_browser_IDMAPS = \
-	metadata/tour.idmap
+	../query-browser/metadata/tour.idmap
 chapter-options-query-browser.validpure: $(chapter_options_query_browser_SOURCES)
 chapter-options-query-browser.titles: $(chapter_options_query_browser_SOURCES)
 chapter-options-query-browser.useless: $(chapter_options_query_browser_SOURCES)

@@ -31,7 +31,7 @@
 	../gui-common/metadata/appendix-connection-storage.idmap \
 	../gui-common/metadata/appendix-troubleshooting.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \
-	metadata/options.idmap
+	../query-browser/metadata/options.idmap
 connection-dialog.validpure: $(connection_dialog_SOURCES)
 connection-dialog.titles: $(connection_dialog_SOURCES)
 connection-dialog.useless: $(connection_dialog_SOURCES)

@@ -187,17 +187,17 @@
 	images/published/twosakilas.png
 query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES)
 query_browser_IDMAPS = \
+	../query-browser/metadata/chapter-options-query-browser.idmap \
+	../query-browser/metadata/options.idmap \
+	../query-browser/metadata/tour.idmap \
+	../query-browser/metadata/using.idmap \
+	../query-browser/metadata/xml-files.idmap \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/chapter-options-query-browser.idmap \
-	metadata/options.idmap \
-	metadata/tour.idmap \
-	metadata/using.idmap \
-	metadata/xml-files.idmap
+	../refman-common/metadata/bug-reports.idmap
 query-browser.validpure: $(query_browser_SOURCES)
 query-browser.titles: $(query_browser_SOURCES)
 query-browser.useless: $(query_browser_SOURCES)

@@ -230,11 +230,11 @@
 tour_SOURCES = tour.xml $(tour_INCLUDES)
 tour_IDMAPS = \
 	../gui-common/metadata/chapter-table-editor.idmap \
-	../refman-5.1/metadata/se-innodb-core.idmap \
-	metadata/chapter-options-query-browser.idmap \
-	metadata/tour.idmap \
-	metadata/using.idmap \
-	metadata/xml-files.idmap
+	../query-browser/metadata/chapter-options-query-browser.idmap \
+	../query-browser/metadata/tour.idmap \
+	../query-browser/metadata/using.idmap \
+	../query-browser/metadata/xml-files.idmap \
+	../refman-5.1/metadata/se-innodb-core.idmap
 tour.validpure: $(tour_SOURCES)
 tour.titles: $(tour_SOURCES)
 tour.useless: $(tour_SOURCES)

@@ -258,9 +258,9 @@
 	images/published/tabletool.png
 using_SOURCES = using.xml $(using_INCLUDES)
 using_IDMAPS = \
-	metadata/chapter-options-query-browser.idmap \
-	metadata/tour.idmap \
-	metadata/using.idmap
+	../query-browser/metadata/chapter-options-query-browser.idmap \
+	../query-browser/metadata/tour.idmap \
+	../query-browser/metadata/using.idmap
 using.validpure: $(using_SOURCES)
 using.titles: $(using_SOURCES)
 using.useless: $(using_SOURCES)

@@ -280,7 +280,7 @@
 xml_files_IDMAPS = \
 	../gui-common/metadata/appendix-common-files.idmap \
 	../gui-common/metadata/chapter-table-editor.idmap \
-	metadata/tour.idmap
+	../query-browser/metadata/tour.idmap
 xml-files.validpure: $(xml_files_SOURCES)
 xml-files.titles: $(xml_files_SOURCES)
 xml-files.useless: $(xml_files_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/refman-4.1/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 45, Lines Added: 482, Lines Deleted: 482; 55432 bytes

@@ -7,20 +7,20 @@
 apis_c_IMAGES =
 apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
 apis_c_IDMAPS = \
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-development.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/programs.idmap \
 	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap
+	../refman-common/metadata/connector-odbc.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -48,22 +48,22 @@
 apis_IMAGES =
 apis_SOURCES = apis.xml $(apis_INCLUDES)
 apis_IDMAPS = \
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-development.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/programs.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap
+	../refman-common/metadata/information-sources.idmap
 apis.validpure: $(apis_SOURCES)
 apis.titles: $(apis_SOURCES)
 apis.useless: $(apis_SOURCES)

@@ -194,20 +194,20 @@
 	../refman-common/images/published/mysql-vstudioplugin-4.png
 connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
 connectors_IDMAPS = \
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/internationalization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-common/metadata/news-codbc-core.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -226,16 +226,16 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -375,32 +375,32 @@
 dynxml_local_dba_IMAGES =
 dynxml_local_dba_SOURCES = dynxml-local-dba.xml $(dynxml_local_dba_INCLUDES)
 dynxml_local_dba_IDMAPS = \
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
 	../refman-common/metadata/apis-perl.idmap \
 	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-common/metadata/bug-reports.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -421,19 +421,19 @@
 dynxml_local_functions_IMAGES =
 dynxml_local_functions_SOURCES = dynxml-local-functions.xml $(dynxml_local_functions_INCLUDES)
 dynxml_local_functions_IDMAPS = \
-	../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure.idmap \
-	metadata/optimization.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -456,24 +456,24 @@
 dynxml_local_news_4_1_IMAGES =
 dynxml_local_news_4_1_SOURCES = dynxml-local-news-4.1.xml $(dynxml_local_news_4_1_INCLUDES)
 dynxml_local_news_4_1_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-miscellaneous.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap
 dynxml-local-news-4.1.validpure: $(dynxml_local_news_4_1_SOURCES)
 dynxml-local-news-4.1.titles: $(dynxml_local_news_4_1_SOURCES)
 dynxml-local-news-4.1.useless: $(dynxml_local_news_4_1_SOURCES)

@@ -520,21 +520,21 @@
 errors_problems_IMAGES =
 errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
 errors_problems_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/bug-reports.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -553,13 +553,13 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/installing.idmap \
-	metadata/language-structure.idmap \
-	metadata/programs-installation.idmap \
-	metadata/se-innodb-core.idmap
+	../refman-common/metadata/information-sources.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -591,34 +591,34 @@
 installing_IMAGES =
 installing_SOURCES = installing.xml $(installing_INCLUDES)
 installing_IDMAPS = \
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/news-4.0.idmap \
+	../refman-4.1/metadata/news-4.1-core.idmap \
+	../refman-4.1/metadata/news.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/restrictions.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-4.0.idmap \
-	metadata/news-4.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-common/metadata/information-sources.idmap
 installing.validpure: $(installing_SOURCES)
 installing.titles: $(installing_SOURCES)
 installing.useless: $(installing_SOURCES)

@@ -637,16 +637,16 @@
 internationalization_IMAGES =
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-common/metadata/information-sources.idmap
 internationalization.validpure: $(internationalization_SOURCES)
 internationalization.titles: $(internationalization_SOURCES)
 internationalization.useless: $(internationalization_SOURCES)

@@ -672,31 +672,31 @@
 introduction_IMAGES =
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
-	../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-4.0.idmap \
-	metadata/news-4.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/news-4.0.idmap \
+	../refman-4.1/metadata/news-4.1-core.idmap \
+	../refman-4.1/metadata/news.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-miscellaneous.idmap \
+	../refman-4.1/metadata/programs.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -718,15 +718,15 @@
 language_structure_IMAGES =
 language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES)
 language_structure_IDMAPS = \
-	../refman-common/metadata/apis-perl.idmap \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-common/metadata/apis-perl.idmap
 language-structure.validpure: $(language_structure_SOURCES)
 language-structure.titles: $(language_structure_SOURCES)
 language-structure.useless: $(language_structure_SOURCES)

@@ -986,51 +986,51 @@
 	../ndbapi/metadata/ndb-errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
 	../ndbapi/metadata/ndbapi.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-faq.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-3.23.idmap \
-	metadata/news-4.0.idmap \
-	metadata/news-4.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-faq.idmap \
+	../refman-4.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/mysql-cluster-overview.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/news-3.23.idmap \
+	../refman-4.1/metadata/news-4.0.idmap \
+	../refman-4.1/metadata/news-4.1-core.idmap \
+	../refman-4.1/metadata/news.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-development.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/programs-miscellaneous.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/programs.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/restrictions.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-4.1/metadata/tutorial.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1049,10 +1049,10 @@
 mysql_cluster_backup_IMAGES =
 mysql_cluster_backup_SOURCES = mysql-cluster-backup.xml $(mysql_cluster_backup_INCLUDES)
 mysql_cluster_backup_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-backup.validpure: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.titles: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.useless: $(mysql_cluster_backup_SOURCES)

@@ -1071,12 +1071,12 @@
 mysql_cluster_configuration_IMAGES =
 mysql_cluster_configuration_SOURCES = mysql-cluster-configuration.xml $(mysql_cluster_configuration_INCLUDES)
 mysql_cluster_configuration_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-common/metadata/bug-reports.idmap
 mysql-cluster-configuration.validpure: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.titles: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.useless: $(mysql_cluster_configuration_SOURCES)

@@ -1095,17 +1095,17 @@
 mysql_cluster_faq_IMAGES =
 mysql_cluster_faq_SOURCES = mysql-cluster-faq.xml $(mysql_cluster_faq_INCLUDES)
 mysql_cluster_faq_IDMAPS = \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/spatial-extensions.idmap
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-common/metadata/news-cluster.idmap
 mysql-cluster-faq.validpure: $(mysql_cluster_faq_SOURCES)
 mysql-cluster-faq.titles: $(mysql_cluster_faq_SOURCES)
 mysql-cluster-faq.useless: $(mysql_cluster_faq_SOURCES)

@@ -1124,11 +1124,11 @@
 mysql_cluster_glossary_IMAGES =
 mysql_cluster_glossary_SOURCES = mysql-cluster-glossary.xml $(mysql_cluster_glossary_INCLUDES)
 mysql_cluster_glossary_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-overview.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap
 mysql-cluster-glossary.validpure: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.titles: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.useless: $(mysql_cluster_glossary_SOURCES)

@@ -1147,8 +1147,8 @@
 mysql_cluster_interconnects_IMAGES =
 mysql_cluster_interconnects_SOURCES = mysql-cluster-interconnects.xml $(mysql_cluster_interconnects_INCLUDES)
 mysql_cluster_interconnects_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap
 mysql-cluster-interconnects.validpure: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.titles: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.useless: $(mysql_cluster_interconnects_SOURCES)

@@ -1167,13 +1167,13 @@
 mysql_cluster_limitations_IMAGES =
 mysql_cluster_limitations_SOURCES = mysql-cluster-limitations.xml $(mysql_cluster_limitations_INCLUDES)
 mysql_cluster_limitations_IDMAPS = \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/sql-syntax.idmap
+	../refman-common/metadata/news-cluster.idmap
 mysql-cluster-limitations.validpure: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.titles: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.useless: $(mysql_cluster_limitations_SOURCES)

@@ -1193,12 +1193,12 @@
 mysql_cluster_management_SOURCES = mysql-cluster-management.xml $(mysql_cluster_management_INCLUDES)
 mysql_cluster_management_IDMAPS = \
 	../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap
 mysql-cluster-management.validpure: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.titles: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.useless: $(mysql_cluster_management_SOURCES)

@@ -1219,16 +1219,16 @@
 	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml $(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/programs-using.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1254,8 +1254,8 @@
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml $(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-overview.idmap
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-overview.idmap
 mysql-cluster-overview.validpure: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.titles: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.useless: $(mysql_cluster_overview_SOURCES)

@@ -1275,12 +1275,12 @@
 mysql_cluster_process_management_SOURCES = mysql-cluster-process-management.xml $(mysql_cluster_process_management_INCLUDES)
 mysql_cluster_process_management_IDMAPS = \
 	../ndbapi/metadata/ndb-errors.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/programs-using.idmap
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-4.1/metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1303,9 +1303,9 @@
 	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml $(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-upgrade-downgrade.validpure: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.titles: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.useless: $(mysql_cluster_upgrade_downgrade_SOURCES)

@@ -1327,13 +1327,13 @@
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml $(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap
 mysql-cluster-utilities.validpure: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.titles: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.useless: $(mysql_cluster_utilities_SOURCES)

@@ -1381,26 +1381,26 @@
 	../ndbapi/metadata/ndb-errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
 	../ndbapi/metadata/ndbapi.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-backup.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-faq.idmap \
+	../refman-4.1/metadata/mysql-cluster-glossary.idmap \
+	../refman-4.1/metadata/mysql-cluster-interconnects.idmap \
+	../refman-4.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-4.1/metadata/mysql-cluster-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/mysql-cluster-overview.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-faq.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/programs-using.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-common/metadata/news-cluster.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -1419,14 +1419,14 @@
 news_3_23_IMAGES =
 news_3_23_SOURCES = news-3.23.xml $(news_3_23_INCLUDES)
 news_3_23_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/news-3.23.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-server.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/storage-engines.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/news-3.23.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/storage-engines.idmap
 news-3.23.validpure: $(news_3_23_SOURCES)
 news-3.23.titles: $(news_3_23_SOURCES)
 news-3.23.useless: $(news_3_23_SOURCES)

@@ -1445,24 +1445,24 @@
 news_4_0_IMAGES =
 news_4_0_SOURCES = news-4.0.xml $(news_4_0_INCLUDES)
 news_4_0_IDMAPS = \
-	../refman-common/metadata/news-innodb.idmap \
-	metadata/apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/news-innodb.idmap
 news-4.0.validpure: $(news_4_0_SOURCES)
 news-4.0.titles: $(news_4_0_SOURCES)
 news-4.0.useless: $(news_4_0_SOURCES)

@@ -1543,22 +1543,22 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/connectors.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -1595,13 +1595,13 @@
 programs_admin_util_IMAGES =
 programs_admin_util_SOURCES = programs-admin-util.xml $(programs_admin_util_INCLUDES)
 programs_admin_util_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap
 programs-admin-util.validpure: $(programs_admin_util_SOURCES)
 programs-admin-util.titles: $(programs_admin_util_SOURCES)
 programs-admin-util.useless: $(programs_admin_util_SOURCES)

@@ -1620,15 +1620,15 @@
 programs_client_IMAGES =
 programs_client_SOURCES = programs-client.xml $(programs_client_INCLUDES)
 programs_client_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -1647,7 +1647,7 @@
 programs_development_IMAGES =
 programs_development_SOURCES = programs-development.xml $(programs_development_INCLUDES)
 programs_development_IDMAPS = \
-	metadata/programs-miscellaneous.idmap
+	../refman-4.1/metadata/programs-miscellaneous.idmap
 programs-development.validpure: $(programs_development_SOURCES)
 programs-development.titles: $(programs_development_SOURCES)
 programs-development.useless: $(programs_development_SOURCES)

@@ -1666,8 +1666,8 @@
 programs_installation_IMAGES =
 programs_installation_SOURCES = programs-installation.xml $(programs_installation_INCLUDES)
 programs_installation_IDMAPS = \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)
 programs-installation.titles: $(programs_installation_SOURCES)
 programs-installation.useless: $(programs_installation_SOURCES)

@@ -1686,7 +1686,7 @@
 programs_miscellaneous_IMAGES =
 programs_miscellaneous_SOURCES = programs-miscellaneous.xml $(programs_miscellaneous_INCLUDES)
 programs_miscellaneous_IDMAPS = \
-	metadata/programs-development.idmap
+	../refman-4.1/metadata/programs-development.idmap
 programs-miscellaneous.validpure: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.titles: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.useless: $(programs_miscellaneous_SOURCES)

@@ -1705,10 +1705,10 @@
 programs_server_IMAGES =
 programs_server_SOURCES = programs-server.xml $(programs_server_INCLUDES)
 programs_server_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -1727,11 +1727,11 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs-using.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/programs-using.idmap
 programs-using.validpure: $(programs_using_SOURCES)
 programs-using.titles: $(programs_using_SOURCES)
 programs-using.useless: $(programs_using_SOURCES)

@@ -1757,24 +1757,24 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-development.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/programs-miscellaneous.idmap \
+	../refman-4.1/metadata/programs-server.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -1793,16 +1793,16 @@
 replication_IMAGES =
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-common/metadata/bug-reports.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -1860,7 +1860,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap
+	../refman-4.1/metadata/internationalization.idmap
 restrictions.validpure: $(restrictions_SOURCES)
 restrictions.titles: $(restrictions_SOURCES)
 restrictions.useless: $(restrictions_SOURCES)

@@ -1879,12 +1879,12 @@
 se_innodb_core_IMAGES =
 se_innodb_core_SOURCES = se-innodb-core.xml $(se_innodb_core_INCLUDES)
 se_innodb_core_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/installing.idmap \
-	metadata/programs-using.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap
 se-innodb-core.validpure: $(se_innodb_core_SOURCES)
 se-innodb-core.titles: $(se_innodb_core_SOURCES)
 se-innodb-core.useless: $(se_innodb_core_SOURCES)

@@ -1903,9 +1903,9 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -1924,29 +1924,29 @@
 sql_syntax_IMAGES =
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/apis-c.idmap \
+	../refman-4.1/metadata/apis.idmap \
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/extending-mysql.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/internationalization.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-installation.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/restrictions.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap \
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/bug-reports.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -1968,20 +1968,20 @@
 	../refman-common/images/published/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-4.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util.idmap \
-	metadata/programs-client.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-4.1/metadata/news-4.1-core.idmap \
+	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-admin-util.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/spatial-extensions.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/storage-engines.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -2000,18 +2000,18 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/programs-client.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-4.1/metadata/data-types.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/functions-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/language-structure.idmap \
+	../refman-4.1/metadata/programs-client.idmap \
+	../refman-4.1/metadata/replication.idmap \
+	../refman-4.1/metadata/se-innodb-core.idmap \
+	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-4.1/metadata/tutorial.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/refman-5.0/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 13, Lines Added: 71, Lines Deleted: 5; 8555 bytes

@@ -422,7 +422,6 @@
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
-	../refman-5.0/metadata/replication-topology.idmap \
 	../refman-5.0/metadata/replication.idmap \
 	../refman-5.0/metadata/se-bdb-core.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \

@@ -432,7 +431,8 @@
 	../refman-5.0/metadata/stored-procedures.idmap \
 	../refman-common/metadata/apis-perl.idmap \
 	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/ha-topology.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -678,8 +678,14 @@
 dynxml_local_programs_admin_util_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-admin-util-core.xml \
 	versions.ent
 dynxml_local_programs_admin_util_IMAGES =
 dynxml_local_programs_admin_util_SOURCES = dynxml-local-programs-admin-util.xml $(dynxml_local_programs_admin_util_INCLUDES)

@@ -704,8 +710,14 @@
 dynxml_local_programs_client_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-client-core.xml \
 	versions.ent
 dynxml_local_programs_client_IMAGES =
 dynxml_local_programs_client_SOURCES = dynxml-local-programs-client.xml $(dynxml_local_programs_client_INCLUDES)

@@ -1059,12 +1071,14 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/replication-drbd.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	versions.ent
 ha_IMAGES = \
-	../refman-common/images/published/drbd-main.png
+	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png
 ha_SOURCES = ha.xml $(ha_INCLUDES)
 ha_IDMAPS = \
 	../refman-5.0/metadata/faqs.idmap \

@@ -1379,7 +1393,17 @@
 	../dynamic-docs/changelog/mysqld.xml \
 	../dynamic-docs/changelog/vstudioplugin-versions.xml \
 	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
 	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
 	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../dynamic-docs/reserved-words/mysql-4.1.22 \
 	../dynamic-docs/reserved-words/mysql-5.0.10-beta \

@@ -1449,6 +1473,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1594,6 +1619,8 @@
 	optimization.xml \
 	precision-math.xml \
 	preface.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \

@@ -1638,6 +1665,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1764,7 +1792,6 @@
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
 	../refman-5.0/metadata/replication-solutions.idmap \
-	../refman-5.0/metadata/replication-topology.idmap \
 	../refman-5.0/metadata/replication.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
 	../refman-5.0/metadata/se-archive.idmap \

@@ -1784,7 +1811,8 @@
 	../refman-5.0/metadata/tutorial.idmap \
 	../refman-5.0/metadata/views.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-common/metadata/ha-topology.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -2323,6 +2351,32 @@
 preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 
+programs_admin_util_core_INCLUDES =
+programs_admin_util_core_IMAGES =
+programs_admin_util_core_SOURCES = programs-admin-util-core.xml $(programs_admin_util_core_INCLUDES)
+programs_admin_util_core_IDMAPS =
+programs-admin-util-core.validpure: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.titles: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.useless: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.valid: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core.validwarn: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-prepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-manprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-remprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+
+programs_client_core_INCLUDES =
+programs_client_core_IMAGES =
+programs_client_core_SOURCES = programs-client-core.xml $(programs_client_core_INCLUDES)
+programs_client_core_IDMAPS =
+programs-client-core.validpure: $(programs_client_core_SOURCES)
+programs-client-core.titles: $(programs_client_core_SOURCES)
+programs-client-core.useless: $(programs_client_core_SOURCES)
+programs-client-core.valid: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core.validwarn: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-prepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-manprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-remprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+
 programs_development_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -2409,11 +2463,23 @@
 programs_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \
 	dynxml-local-programs-server.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/refman-5.1/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 13, Lines Added: 74, Lines Deleted: 5; 8650 bytes

@@ -429,7 +429,6 @@
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
-	../refman-5.1/metadata/replication-topology.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \

@@ -438,7 +437,8 @@
 	../refman-5.1/metadata/stored-procedures.idmap \
 	../refman-common/metadata/apis-perl.idmap \
 	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/ha-topology.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -654,8 +654,14 @@
 dynxml_local_programs_admin_util_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-admin-util-core.xml \
 	versions.ent
 dynxml_local_programs_admin_util_IMAGES =
 dynxml_local_programs_admin_util_SOURCES = dynxml-local-programs-admin-util.xml $(dynxml_local_programs_admin_util_INCLUDES)

@@ -681,8 +687,15 @@
 dynxml_local_programs_client_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-client-core.xml \
 	versions.ent
 dynxml_local_programs_client_IMAGES =
 dynxml_local_programs_client_SOURCES = dynxml-local-programs-client.xml $(dynxml_local_programs_client_INCLUDES)

@@ -949,12 +962,14 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/replication-drbd.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	versions.ent
 ha_IMAGES = \
-	../refman-common/images/published/drbd-main.png
+	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png
 ha_SOURCES = ha.xml $(ha_INCLUDES)
 ha_IDMAPS = \
 	../refman-5.1/metadata/faqs.idmap \

@@ -1132,7 +1147,18 @@
 	../dynamic-docs/changelog/mysqld.xml \
 	../dynamic-docs/changelog/vstudioplugin-versions.xml \
 	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
 	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../dynamic-docs/open-bugs/mysqld-versions.xml \
 	../dynamic-docs/open-bugs/mysqld.xml \
 	../dynamic-docs/opsfunctions/opfunctions.xml \

@@ -1169,6 +1195,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1299,6 +1326,8 @@
 	partitioning.xml \
 	precision-math.xml \
 	preface.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \

@@ -1343,6 +1372,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1451,7 +1481,6 @@
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.1/metadata/replication-solutions.idmap \
-	../refman-5.1/metadata/replication-topology.idmap \
 	../refman-5.1/metadata/replication.idmap \
 	../refman-5.1/metadata/restrictions.idmap \
 	../refman-5.1/metadata/se-archive.idmap \

@@ -1471,7 +1500,8 @@
 	../refman-5.1/metadata/tutorial.idmap \
 	../refman-5.1/metadata/views.idmap \
 	../refman-6.0/metadata/dba-core.idmap \
-	../refman-6.0/metadata/manual.idmap
+	../refman-6.0/metadata/manual.idmap \
+	../refman-common/metadata/ha-topology.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -2072,6 +2102,32 @@
 preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 
+programs_admin_util_core_INCLUDES =
+programs_admin_util_core_IMAGES =
+programs_admin_util_core_SOURCES = programs-admin-util-core.xml $(programs_admin_util_core_INCLUDES)
+programs_admin_util_core_IDMAPS =
+programs-admin-util-core.validpure: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.titles: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.useless: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.valid: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core.validwarn: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-prepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-manprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-remprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+
+programs_client_core_INCLUDES =
+programs_client_core_IMAGES =
+programs_client_core_SOURCES = programs-client-core.xml $(programs_client_core_INCLUDES)
+programs_client_core_IDMAPS =
+programs-client-core.validpure: $(programs_client_core_SOURCES)
+programs-client-core.titles: $(programs_client_core_SOURCES)
+programs-client-core.useless: $(programs_client_core_SOURCES)
+programs-client-core.valid: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core.validwarn: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-prepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-manprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-remprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+
 programs_development_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -2157,11 +2213,24 @@
 programs_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \
 	dynxml-local-programs-server.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-01-09 16:09:28 UTC (rev 9529)
+++ trunk/refman-6.0/Makefile.depends	2008-01-09 16:10:01 UTC (rev 9530)
Changed blocks: 71, Lines Added: 782, Lines Deleted: 713; 88838 bytes

@@ -7,20 +7,20 @@
 apis_c_IMAGES =
 apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
 apis_c_IDMAPS = \
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/apis-libmysqld.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-development.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/programs.idmap \
 	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap
+	../refman-common/metadata/connector-odbc.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -39,9 +39,9 @@
 apis_libmysqld_IMAGES =
 apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES)
 apis_libmysqld_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
 apis-libmysqld.useless: $(apis_libmysqld_SOURCES)

@@ -200,20 +200,20 @@
 	../refman-common/images/published/mysql-vstudioplugin-4.png
 connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
 connectors_IDMAPS = \
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/apis.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/internationalization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-common/metadata/news-codbc-core.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -232,18 +232,18 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/precision-math.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/spatial-extensions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -405,43 +405,43 @@
 dynxml_local_dba_IMAGES =
 dynxml_local_dba_SOURCES = dynxml-local-dba.xml $(dynxml_local_dba_INCLUDES)
 dynxml_local_dba_IDMAPS = \
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-myisam-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/storage-engines.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
 	../refman-common/metadata/apis-perl.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-common/metadata/ha-topology.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -462,22 +462,22 @@
 dynxml_local_functions_IMAGES =
 dynxml_local_functions_SOURCES = dynxml-local-functions.xml $(dynxml_local_functions_INCLUDES)
 dynxml_local_functions_IDMAPS = \
-	../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/tutorial.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/precision-math.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-6.0/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -498,32 +498,32 @@
 dynxml_local_installing_IMAGES =
 dynxml_local_installing_SOURCES = dynxml-local-installing.xml $(dynxml_local_installing_INCLUDES)
 dynxml_local_installing_IDMAPS = \
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/news-6.0-core.idmap \
+	../refman-6.0/metadata/news.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-myisam-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-common/metadata/information-sources.idmap
 dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)

@@ -543,16 +543,16 @@
 dynxml_local_language_structure_SOURCES = dynxml-local-language-structure.xml $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_language_structure_IDMAPS = \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-common/metadata/apis-perl.idmap
 dynxml-local-language-structure.validpure: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.titles: $(dynxml_local_language_structure_SOURCES)
 dynxml-local-language-structure.useless: $(dynxml_local_language_structure_SOURCES)

@@ -575,8 +575,8 @@
 dynxml_local_news_5_2_IMAGES =
 dynxml_local_news_5_2_SOURCES = dynxml-local-news-5.2.xml $(dynxml_local_news_5_2_INCLUDES)
 dynxml_local_news_5_2_IDMAPS = \
-	metadata/introduction.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 dynxml-local-news-5.2.validpure: $(dynxml_local_news_5_2_SOURCES)
 dynxml-local-news-5.2.titles: $(dynxml_local_news_5_2_SOURCES)
 dynxml-local-news-5.2.useless: $(dynxml_local_news_5_2_SOURCES)

@@ -599,14 +599,14 @@
 dynxml_local_news_6_0_IMAGES =
 dynxml_local_news_6_0_SOURCES = dynxml-local-news-6.0.xml $(dynxml_local_news_6_0_INCLUDES)
 dynxml_local_news_6_0_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 dynxml-local-news-6.0.validpure: $(dynxml_local_news_6_0_SOURCES)
 dynxml-local-news-6.0.titles: $(dynxml_local_news_6_0_SOURCES)
 dynxml-local-news-6.0.useless: $(dynxml_local_news_6_0_SOURCES)

@@ -619,20 +619,26 @@
 dynxml_local_programs_admin_util_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-admin-util-core.xml \
 	versions.ent
 dynxml_local_programs_admin_util_IMAGES =
 dynxml_local_programs_admin_util_SOURCES = dynxml-local-programs-admin-util.xml $(dynxml_local_programs_admin_util_INCLUDES)
 dynxml_local_programs_admin_util_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 dynxml-local-programs-admin-util.validpure: $(dynxml_local_programs_admin_util_SOURCES)
 dynxml-local-programs-admin-util.titles: $(dynxml_local_programs_admin_util_SOURCES)
 dynxml-local-programs-admin-util.useless: $(dynxml_local_programs_admin_util_SOURCES)

@@ -645,23 +651,30 @@
 dynxml_local_programs_client_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	programs-client-core.xml \
 	versions.ent
 dynxml_local_programs_client_IMAGES =
 dynxml_local_programs_client_SOURCES = dynxml-local-programs-client.xml $(dynxml_local_programs_client_INCLUDES)
 dynxml_local_programs_client_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/tutorial.idmap
 dynxml-local-programs-client.validpure: $(dynxml_local_programs_client_SOURCES)
 dynxml-local-programs-client.titles: $(dynxml_local_programs_client_SOURCES)
 dynxml-local-programs-client.useless: $(dynxml_local_programs_client_SOURCES)

@@ -681,10 +694,10 @@
 dynxml_local_programs_server_SOURCES = dynxml-local-programs-server.xml $(dynxml_local_programs_server_INCLUDES)
 dynxml_local_programs_server_IDMAPS = \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap
 dynxml-local-programs-server.validpure: $(dynxml_local_programs_server_SOURCES)
 dynxml-local-programs-server.titles: $(dynxml_local_programs_server_SOURCES)
 dynxml-local-programs-server.useless: $(dynxml_local_programs_server_SOURCES)

@@ -706,8 +719,8 @@
 dynxml_local_se_falcon_SOURCES = dynxml-local-se-falcon.xml $(dynxml_local_se_falcon_INCLUDES)
 dynxml_local_se_falcon_IDMAPS = \
 	../query-browser/metadata/query-browser.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/tutorial.idmap
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/tutorial.idmap
 dynxml-local-se-falcon.validpure: $(dynxml_local_se_falcon_SOURCES)
 dynxml-local-se-falcon.titles: $(dynxml_local_se_falcon_SOURCES)
 dynxml-local-se-falcon.useless: $(dynxml_local_se_falcon_SOURCES)

@@ -728,12 +741,12 @@
 dynxml_local_se_innodb_IMAGES =
 dynxml_local_se_innodb_SOURCES = dynxml-local-se-innodb.xml $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_innodb_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/installing-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -754,14 +767,14 @@
 dynxml_local_se_myisam_IMAGES =
 dynxml_local_se_myisam_SOURCES = dynxml-local-se-myisam.xml $(dynxml_local_se_myisam_INCLUDES)
 dynxml_local_se_myisam_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 dynxml-local-se-myisam.validpure: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.titles: $(dynxml_local_se_myisam_SOURCES)
 dynxml-local-se-myisam.useless: $(dynxml_local_se_myisam_SOURCES)

@@ -808,22 +821,22 @@
 errors_problems_IMAGES =
 errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
 errors_problems_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-merge.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/tutorial.idmap \
+	../refman-common/metadata/bug-reports.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -842,16 +855,16 @@
 events_IMAGES =
 events_SOURCES = events.xml $(events_INCLUDES)
 events_IDMAPS = \
-	metadata/events.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-6.0/metadata/triggers.idmap
 events.validpure: $(events_SOURCES)
 events.titles: $(events_SOURCES)
 events.useless: $(events_SOURCES)

@@ -870,18 +883,18 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/stored-procedures.idmap
+	../refman-common/metadata/information-sources.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -902,45 +915,45 @@
 	../refman-common/images/published/active-master-mysql-server.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/ha.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/se-archive.idmap \
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/se-federated.idmap \
+	../refman-6.0/metadata/spatial-extensions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/storage-engines.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-6.0/metadata/triggers.idmap \
+	../refman-6.0/metadata/views.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-mxj.idmap \
 	../refman-common/metadata/connector-net.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-common/metadata/connector-odbc.idmap
 faqs.validpure: $(faqs_SOURCES)
 faqs.titles: $(faqs_SOURCES)
 faqs.useless: $(faqs_SOURCES)

@@ -969,18 +982,20 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/replication-drbd.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	versions.ent
 ha_IMAGES = \
-	../refman-common/images/published/drbd-main.png
+	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png
 ha_SOURCES = ha.xml $(ha_INCLUDES)
 ha_IDMAPS = \
-	metadata/faqs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/replication.idmap \
-	metadata/se-innodb-core.idmap
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap
 ha.validpure: $(ha_SOURCES)
 ha.titles: $(ha_SOURCES)
 ha.useless: $(ha_SOURCES)

@@ -999,17 +1014,17 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/triggers.idmap \
+	../refman-6.0/metadata/views.idmap
 information-schema.validpure: $(information_schema_SOURCES)
 information-schema.titles: $(information_schema_SOURCES)
 information-schema.useless: $(information_schema_SOURCES)

@@ -1041,17 +1056,17 @@
 internationalization_IMAGES =
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-common/metadata/information-sources.idmap
 internationalization.validpure: $(internationalization_SOURCES)
 internationalization.titles: $(internationalization_SOURCES)
 internationalization.useless: $(internationalization_SOURCES)

@@ -1078,37 +1093,37 @@
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
 	../ndbapi/metadata/interface-ndbrecord.idmap \
-	../refman-common/metadata/credits.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/apis.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/news.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-miscellaneous.idmap \
+	../refman-6.0/metadata/programs.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/storage-engines.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-6.0/metadata/triggers.idmap \
+	../refman-6.0/metadata/tutorial.idmap \
+	../refman-6.0/metadata/views.idmap \
+	../refman-common/metadata/credits.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -1150,7 +1165,18 @@
 	../dynamic-docs/changelog/mysqld.xml \
 	../dynamic-docs/changelog/vstudioplugin-versions.xml \
 	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
 	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/../refman-common/connector-j-connprops.xml \

@@ -1185,6 +1211,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1316,6 +1343,8 @@
 	partitioning.xml \
 	precision-math.xml \
 	preface.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \

@@ -1361,6 +1390,7 @@
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
 	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \

@@ -1428,74 +1458,74 @@
 	../query-browser/metadata/query-browser.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/apis.idmap \
-	metadata/connectors.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/ha.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication-topology.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/apis-libmysqld.idmap \
+	../refman-6.0/metadata/apis.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/ha.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-glossary.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster-overview.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/news-6.0-core.idmap \
+	../refman-6.0/metadata/news.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/precision-math.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-development.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/programs-miscellaneous.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/programs.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-solutions.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/se-archive.idmap \
+	../refman-6.0/metadata/se-blackhole.idmap \
+	../refman-6.0/metadata/se-csv.idmap \
+	../refman-6.0/metadata/se-example.idmap \
+	../refman-6.0/metadata/se-falcon-core.idmap \
+	../refman-6.0/metadata/se-federated.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-memory.idmap \
+	../refman-6.0/metadata/se-merge.idmap \
+	../refman-6.0/metadata/se-myisam-core.idmap \
+	../refman-6.0/metadata/spatial-extensions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/storage-engines.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-6.0/metadata/triggers.idmap \
+	../refman-6.0/metadata/tutorial.idmap \
+	../refman-6.0/metadata/views.idmap \
+	../refman-common/metadata/ha-topology.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1514,11 +1544,11 @@
 mysql_cluster_backup_IMAGES =
 mysql_cluster_backup_SOURCES = mysql-cluster-backup.xml $(mysql_cluster_backup_INCLUDES)
 mysql_cluster_backup_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-backup.validpure: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.titles: $(mysql_cluster_backup_SOURCES)
 mysql-cluster-backup.useless: $(mysql_cluster_backup_SOURCES)

@@ -1538,14 +1568,14 @@
 mysql_cluster_configuration_SOURCES = mysql-cluster-configuration.xml $(mysql_cluster_configuration_INCLUDES)
 mysql_cluster_configuration_IDMAPS = \
 	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-common/metadata/bug-reports.idmap
 mysql-cluster-configuration.validpure: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.titles: $(mysql_cluster_configuration_SOURCES)
 mysql-cluster-configuration.useless: $(mysql_cluster_configuration_SOURCES)

@@ -1564,9 +1594,9 @@
 mysql_cluster_disk_data_IMAGES =
 mysql_cluster_disk_data_SOURCES = mysql-cluster-disk-data.xml $(mysql_cluster_disk_data_INCLUDES)
 mysql_cluster_disk_data_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/information-schema.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 mysql-cluster-disk-data.validpure: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.titles: $(mysql_cluster_disk_data_SOURCES)
 mysql-cluster-disk-data.useless: $(mysql_cluster_disk_data_SOURCES)

@@ -1585,12 +1615,12 @@
 mysql_cluster_glossary_IMAGES =
 mysql_cluster_glossary_SOURCES = mysql-cluster-glossary.xml $(mysql_cluster_glossary_INCLUDES)
 mysql_cluster_glossary_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-overview.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap
 mysql-cluster-glossary.validpure: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.titles: $(mysql_cluster_glossary_SOURCES)
 mysql-cluster-glossary.useless: $(mysql_cluster_glossary_SOURCES)

@@ -1609,8 +1639,8 @@
 mysql_cluster_interconnects_IMAGES =
 mysql_cluster_interconnects_SOURCES = mysql-cluster-interconnects.xml $(mysql_cluster_interconnects_INCLUDES)
 mysql_cluster_interconnects_IDMAPS = \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-interconnects.idmap
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap
 mysql-cluster-interconnects.validpure: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.titles: $(mysql_cluster_interconnects_SOURCES)
 mysql-cluster-interconnects.useless: $(mysql_cluster_interconnects_SOURCES)

@@ -1629,16 +1659,16 @@
 mysql_cluster_limitations_IMAGES =
 mysql_cluster_limitations_SOURCES = mysql-cluster-limitations.xml $(mysql_cluster_limitations_INCLUDES)
 mysql_cluster_limitations_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/partitioning.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap
 mysql-cluster-limitations.validpure: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.titles: $(mysql_cluster_limitations_SOURCES)
 mysql-cluster-limitations.useless: $(mysql_cluster_limitations_SOURCES)

@@ -1658,13 +1688,13 @@
 mysql_cluster_management_SOURCES = mysql-cluster-management.xml $(mysql_cluster_management_INCLUDES)
 mysql_cluster_management_IDMAPS = \
 	../ndbapi/metadata/ndb-internals.idmap \
-	metadata/dba-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 mysql-cluster-management.validpure: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.titles: $(mysql_cluster_management_SOURCES)
 mysql-cluster-management.useless: $(mysql_cluster_management_SOURCES)

@@ -1685,16 +1715,16 @@
 	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml $(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/programs-using.idmap
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1720,8 +1750,8 @@
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml $(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-overview.idmap
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-overview.idmap
 mysql-cluster-overview.validpure: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.titles: $(mysql_cluster_overview_SOURCES)
 mysql-cluster-overview.useless: $(mysql_cluster_overview_SOURCES)

@@ -1741,13 +1771,13 @@
 mysql_cluster_process_management_SOURCES = mysql-cluster-process-management.xml $(mysql_cluster_process_management_INCLUDES)
 mysql_cluster_process_management_IDMAPS = \
 	../ndbapi/metadata/ndb-errors.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/programs-using.idmap
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1774,15 +1804,15 @@
 	../refman-common/images/published/cluster-replication-overview.png
 mysql_cluster_replication_SOURCES = mysql-cluster-replication.xml $(mysql_cluster_replication_INCLUDES)
 mysql_cluster_replication_IDMAPS = \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 mysql-cluster-replication.validpure: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.titles: $(mysql_cluster_replication_SOURCES)
 mysql-cluster-replication.useless: $(mysql_cluster_replication_SOURCES)

@@ -1823,10 +1853,10 @@
 	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml $(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap
 mysql-cluster-upgrade-downgrade.validpure: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.titles: $(mysql_cluster_upgrade_downgrade_SOURCES)
 mysql-cluster-upgrade-downgrade.useless: $(mysql_cluster_upgrade_downgrade_SOURCES)

@@ -1848,13 +1878,13 @@
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml $(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-utilities.idmap
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-glossary.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap
 mysql-cluster-utilities.validpure: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.titles: $(mysql_cluster_utilities_SOURCES)
 mysql-cluster-utilities.useless: $(mysql_cluster_utilities_SOURCES)

@@ -1912,32 +1942,32 @@
 	../ndbapi/metadata/ndb-errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
 	../ndbapi/metadata/ndbapi.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-backup.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-process-management.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster-utilities.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/faqs.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-backup.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-disk-data.idmap \
+	../refman-6.0/metadata/mysql-cluster-glossary.idmap \
+	../refman-6.0/metadata/mysql-cluster-interconnects.idmap \
+	../refman-6.0/metadata/mysql-cluster-limitations.idmap \
+	../refman-6.0/metadata/mysql-cluster-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster-overview.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2031,28 +2061,28 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/connectors.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/connectors.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/extending-mysql.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication.idmap \
+	../refman-6.0/metadata/se-archive.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-memory.idmap \
+	../refman-6.0/metadata/se-myisam-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/storage-engines.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2071,16 +2101,16 @@
 partitioning_IMAGES =
 partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
 partitioning_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/partitioning.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 partitioning.validpure: $(partitioning_SOURCES)
 partitioning.titles: $(partitioning_SOURCES)
 partitioning.useless: $(partitioning_SOURCES)

@@ -2099,8 +2129,8 @@
 precision_math_IMAGES =
 precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
 precision_math_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/precision-math.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/precision-math.idmap
 precision-math.validpure: $(precision_math_SOURCES)
 precision-math.titles: $(precision_math_SOURCES)
 precision-math.useless: $(precision_math_SOURCES)

@@ -2128,6 +2158,32 @@
 preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
 
+programs_admin_util_core_INCLUDES =
+programs_admin_util_core_IMAGES =
+programs_admin_util_core_SOURCES = programs-admin-util-core.xml $(programs_admin_util_core_INCLUDES)
+programs_admin_util_core_IDMAPS =
+programs-admin-util-core.validpure: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.titles: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.useless: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.valid: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core.validwarn: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-prepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-manprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-remprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+
+programs_client_core_INCLUDES =
+programs_client_core_IMAGES =
+programs_client_core_SOURCES = programs-client-core.xml $(programs_client_core_INCLUDES)
+programs_client_core_IDMAPS =
+programs-client-core.validpure: $(programs_client_core_SOURCES)
+programs-client-core.titles: $(programs_client_core_SOURCES)
+programs-client-core.useless: $(programs_client_core_SOURCES)
+programs-client-core.valid: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core.validwarn: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-prepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-manprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-remprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+
 programs_development_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -2137,7 +2193,7 @@
 programs_development_IMAGES =
 programs_development_SOURCES = programs-development.xml $(programs_development_INCLUDES)
 programs_development_IDMAPS = \
-	metadata/programs-miscellaneous.idmap
+	../refman-6.0/metadata/programs-miscellaneous.idmap
 programs-development.validpure: $(programs_development_SOURCES)
 programs-development.titles: $(programs_development_SOURCES)
 programs-development.useless: $(programs_development_SOURCES)

@@ -2156,10 +2212,10 @@
 programs_installation_IMAGES =
 programs_installation_SOURCES = programs-installation.xml $(programs_installation_INCLUDES)
 programs_installation_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)
 programs-installation.titles: $(programs_installation_SOURCES)
 programs-installation.useless: $(programs_installation_SOURCES)

@@ -2178,7 +2234,7 @@
 programs_miscellaneous_IMAGES =
 programs_miscellaneous_SOURCES = programs-miscellaneous.xml $(programs_miscellaneous_INCLUDES)
 programs_miscellaneous_IDMAPS = \
-	metadata/programs-development.idmap
+	../refman-6.0/metadata/programs-development.idmap
 programs-miscellaneous.validpure: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.titles: $(programs_miscellaneous_SOURCES)
 programs-miscellaneous.useless: $(programs_miscellaneous_SOURCES)

@@ -2197,11 +2253,11 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs-using.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/programs-using.idmap
 programs-using.validpure: $(programs_using_SOURCES)
 programs-using.titles: $(programs_using_SOURCES)
 programs-using.useless: $(programs_using_SOURCES)

@@ -2214,11 +2270,24 @@
 programs_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \
 	dynxml-local-programs-server.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
 	programs-development.xml \
 	programs-installation.xml \
 	programs-miscellaneous.xml \

@@ -2228,27 +2297,27 @@
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
-	metadata/events.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/events.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-development.idmap \
+	../refman-6.0/metadata/programs-installation.idmap \
+	../refman-6.0/metadata/programs-miscellaneous.idmap \
+	../refman-6.0/metadata/programs-server-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2267,14 +2336,14 @@
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
 replication_configuration_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap
 replication-configuration.validpure: $(replication_configuration_SOURCES)
 replication-configuration.titles: $(replication_configuration_SOURCES)
 replication-configuration.useless: $(replication_configuration_SOURCES)

@@ -2293,12 +2362,12 @@
 replication_implementation_IMAGES =
 replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
 replication_implementation_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)
 replication-implementation.useless: $(replication_implementation_SOURCES)

@@ -2317,20 +2386,20 @@
 replication_notes_IMAGES =
 replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
 replication_notes_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-solutions.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-memory.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-common/metadata/bug-reports.idmap
 replication-notes.validpure: $(replication_notes_SOURCES)
 replication-notes.titles: $(replication_notes_SOURCES)
 replication-notes.useless: $(replication_notes_SOURCES)

@@ -2359,11 +2428,11 @@
 	../refman-common/images/published/submaster-performance.png
 replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES)
 replication_solutions_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-solutions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)
 replication-solutions.titles: $(replication_solutions_SOURCES)
 replication-solutions.useless: $(replication_solutions_SOURCES)

@@ -2396,24 +2465,24 @@
 	../refman-common/images/published/submaster-performance.png
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-6.0/metadata/data-types.idmap \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/functions-core.idmap \
+	../refman-6.0/metadata/information-schema.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/replication-configuration.idmap \
+	../refman-6.0/metadata/replication-implementation.idmap \
+	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-solutions.idmap \
+	../refman-6.0/metadata/se-innodb-core.idmap \
+	../refman-6.0/metadata/se-memory.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap \
+	../refman-common/metadata/bug-reports.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -2432,10 +2501,10 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap
+	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/restrictions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap \
+	../refman-6.0/metadata/stored-procedures.idmap
 restrictions.validpure: $(restrictions_SOURCES)
 restrictions.titles: $(restrictions_SOURCES)
 restrictions.useless: $(restrictions_SOURCES)

@@ -2454,8 +2523,8 @@
 se_archive_IMAGES =
 se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
 se_archive_IDMAPS = \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/spatial-extensions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 se-archive.validpure: $(se_archive_SOURCES)
 se-archive.titles: $(se_archive_SOURCES)
 se-archive.useless: $(se_archive_SOURCES)

@@ -2476,7 +2545,7 @@
 	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
-	metadata/replication-configuration.idmap
+	../refman-6.0/metadata/replication-configuration.idmap
 se-blackhole.validpure: $(se_blackhole_SOURCES)
 se-blackhole.titles: $(se_blackhole_SOURCES)
 se-blackhole.useless: $(se_blackhole_SOURCES)

@@ -2546,8 +2615,8 @@
 	../refman-common/images/published/se-federated-structure.png
 se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES)
 se_federated_IDMAPS = \
-	metadata/se-federated.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/se-federated.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 se-federated.validpure: $(se_federated_SOURCES)
 se-federated.titles: $(se_federated_SOURCES)
 se-federated.useless: $(se_federated_SOURCES)

@@ -2579,9 +2648,9 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/optimization.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)
 se-memory.titles: $(se_memory_SOURCES)
 se-memory.useless: $(se_memory_SOURCES)

@@ -2600,9 +2669,9 @@
 se_merge_IMAGES =
 se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
 se_merge_IDMAPS = \
-	metadata/installing-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap
+	../refman-6.0/metadata/installing-core.idmap \
+	../refman-6.0/metadata/optimization.idmap \
+	../refman-6.0/metadata/programs-admin-util-core.idmap
 se-merge.validpure: $(se_merge_SOURCES)
 se-merge.titles: $(se_merge_SOURCES)
 se-merge.useless: $(se_merge_SOURCES)

@@ -2634,9 +2703,9 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/apis-c.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap
+	../refman-6.0/metadata/apis-c.idmap \
+	../refman-6.0/metadata/spatial-extensions.idmap \
+	../refman-6.0/metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -2655,48 +2724,48 @@
 sql_syntax_IMAGES =
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-disk-data.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-replication.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \