MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:mc.brown Date:April 28 2010 11:34am
Subject:svn commit - mysqldoc@docsrva: r20297 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysql-monitor-common refman-5.0 refman-5.1 refman-5.1-maria refm...
View as plain text  
Author: docauto
Date: 2010-04-28 13:34:22 +0200 (Wed, 28 Apr 2010)
New Revision: 20297

Log:
Dependency auto-update

Modified:
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysql-monitor-2.1/Makefile.depends
   trunk/mysql-monitor-common/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.4/Makefile.depends
   trunk/refman-5.5/Makefile.depends
   trunk/refman-6.0/Makefile.depends


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 6; 1429 bytes

@@ -395,9 +395,6 @@
 	../mysql-monitor-common/images/published/monitor-migration-progress.png
 dynsel_default_monitor_mem_reference_SOURCES = dynsel-default-monitor-mem-reference.xml $(dynsel_default_monitor_mem_reference_INCLUDES)
 dynsel_default_monitor_mem_reference_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-common/metadata/dashboard-advisors-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/install-agent-core.idmap \

@@ -739,9 +736,6 @@
 	images/published/usage-advisor-configuration.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-common/metadata/dashboard-advisors-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \


Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/mysql-monitor-2.1/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 6; 1359 bytes

@@ -402,9 +402,6 @@
 	images/published/monitor-migration-check.png
 dynsel_mem21_monitor_mem_reference_SOURCES = dynsel-mem21-monitor-mem-reference.xml $(dynsel_mem21_monitor_mem_reference_INCLUDES)
 dynsel_mem21_monitor_mem_reference_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-common/metadata/dashboard-advisors-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/install-agent-core.idmap \

@@ -715,9 +712,6 @@
 	images/published/server-rename.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \


Modified: trunk/mysql-monitor-common/Makefile.depends
===================================================================
--- trunk/mysql-monitor-common/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/mysql-monitor-common/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 6; 1287 bytes

@@ -840,9 +840,6 @@
 mem_reference_advgraph_IMAGES =
 mem_reference_advgraph_SOURCES = mem-reference-advgraph.xml $(mem_reference_advgraph_INCLUDES)
 mem_reference_advgraph_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	metadata/mem-reference-advgraph.idmap
 mem-reference-advgraph.validpure: $(mem_reference_advgraph_SOURCES)
 mem-reference-advgraph.titles: $(mem_reference_advgraph_SOURCES)

@@ -872,9 +869,6 @@
 	images/published/monitor-migration-progress.png
 mem_reference_core_SOURCES = mem-reference-core.xml $(mem_reference_core_INCLUDES)
 mem_reference_core_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	metadata/dashboard-advisors-core.idmap \
 	metadata/dashboard-configure-core.idmap \
 	metadata/install-agent-core.idmap \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-5.0/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 25, Lines Added: 36, Lines Deleted: 2670; 145411 bytes

@@ -1625,131 +1625,17 @@
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_manual_index_cfunc_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-cfunc-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	tutorial.xml \
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1760,255 +1646,18 @@
 dynxml-local-manual-index-cfunc-remprepped.xml: $(dynxml_local_manual_index_cfunc_SOURCES) $(dynxml_local_manual_index_cfunc_IDMAPS)
 dynxml-local-manual-index-cfunc.xml: $(dynxml_local_manual_index_cfunc_INCLUDES)
 dynxml_local_manual_index_command_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dba.xml \
-	dynxml-local-dba-mysqld-server.xml \
-	dynxml-local-dba-security.xml \
-	dynxml-local-dba-user-management.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-command-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml \
-	windows-config-wizard.xml
-dynxml_local_manual_index_command_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png
+	versions.ent
+dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap \
-	metadata/windows-config-wizard.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2020,143 +1669,17 @@
 dynxml-local-manual-index-command.xml: $(dynxml_local_manual_index_command_INCLUDES)
 dynxml_local_manual_index_function_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-function-core.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2168,124 +1691,17 @@
 dynxml-local-manual-index-function.xml: $(dynxml_local_manual_index_function_INCLUDES)
 dynxml_local_manual_index_is_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	dba-privilege-system.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
 	manual-index-is-core.xml \
-	mysql-cluster-management.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_is_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+	versions.ent
+dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2301,63 +1717,13 @@
 	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-mysqld-server-core.xml \
 	manual-index-isolevel-core.xml \
-	mysql-cluster-overview.xml \
-	optimization.xml \
-	se-innodb-core.xml \
-	sql-syntax-transactions.xml \
 	versions.ent
-dynxml_local_manual_index_isolevel_IMAGES = \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png
+dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-routines.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2373,65 +1739,13 @@
 	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	manual-index-jointype-core.xml \
-	mysql-cluster-management.xml \
-	optimization.xml \
-	se-merge.xml \
-	sql-syntax-data-manipulation.xml \
 	versions.ent
-dynxml_local_manual_index_jointype_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2443,132 +1757,17 @@
 dynxml-local-manual-index-jointype.xml: $(dynxml_local_manual_index_jointype_INCLUDES)
 dynxml_local_manual_index_operator_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	information-schema.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-operator-core.xml \
-	mysql-cluster-management.xml \
-	optimization.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_operator_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+	versions.ent
+dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2579,536 +1778,18 @@
 dynxml-local-manual-index-operator-remprepped.xml: $(dynxml_local_manual_index_operator_SOURCES) $(dynxml_local_manual_index_operator_IDMAPS)
 dynxml-local-manual-index-operator.xml: $(dynxml_local_manual_index_operator_INCLUDES)
 dynxml_local_manual_index_option_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	dynxml-local-se-bdb.xml \
-	dynxml-local-se-innodb.xml \
-	dynxml-local-se-myisam.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-option-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster.xml \
-	news-5.0-core.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml \
-	windows-config-wizard.xml
-dynxml_local_manual_index_option_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png
+	versions.ent
+dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.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 \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap \
-	metadata/windows-config-wizard.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3119,144 +1800,18 @@
 dynxml-local-manual-index-option-remprepped.xml: $(dynxml_local_manual_index_option_SOURCES) $(dynxml_local_manual_index_option_IDMAPS)
 dynxml-local-manual-index-option.xml: $(dynxml_local_manual_index_option_INCLUDES)
 dynxml_local_manual_index_priv_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
 	manual-index-priv-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-programs-core.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-server-core.xml \
-	replication-configuration.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_priv_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+	versions.ent
+dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3268,123 +1823,17 @@
 dynxml-local-manual-index-priv.xml: $(dynxml_local_manual_index_priv_INCLUDES)
 dynxml_local_manual_index_sqlmode_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sqlmode-core.xml \
-	programs-client-core.xml \
-	replication-notes.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3400,85 +1849,13 @@
 	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
 	manual-index-statvar-core.xml \
-	mysql-cluster-configuration-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
 	versions.ent
-dynxml_local_manual_index_statvar_IMAGES = \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png
+dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3489,232 +1866,18 @@
 dynxml-local-manual-index-statvar-remprepped.xml: $(dynxml_local_manual_index_statvar_SOURCES) $(dynxml_local_manual_index_statvar_IDMAPS)
 dynxml-local-manual-index-statvar.xml: $(dynxml_local_manual_index_statvar_INCLUDES)
 dynxml_local_manual_index_stmt_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	dynxml-local-se-bdb.xml \
-	dynxml-local-se-innodb.xml \
-	dynxml-local-se-myisam.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-stmt-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_stmt_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png
+	versions.ent
+dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3725,197 +1888,18 @@
 dynxml-local-manual-index-stmt-remprepped.xml: $(dynxml_local_manual_index_stmt_SOURCES) $(dynxml_local_manual_index_stmt_IDMAPS)
 dynxml-local-manual-index-stmt.xml: $(dynxml_local_manual_index_stmt_INCLUDES)
 dynxml_local_manual_index_sysvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	dynxml-local-se-bdb.xml \
-	dynxml-local-se-innodb.xml \
-	dynxml-local-se-myisam.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sysvar-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-overview.xml \
-	news-5.0-core.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-using.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_sysvar_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png
+	versions.ent
+dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -3926,594 +1910,18 @@
 dynxml-local-manual-index-sysvar-remprepped.xml: $(dynxml_local_manual_index_sysvar_SOURCES) $(dynxml_local_manual_index_sysvar_IDMAPS)
 dynxml-local-manual-index-sysvar.xml: $(dynxml_local_manual_index_sysvar_INCLUDES)
 dynxml_local_manual_index_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-2.1/news-monitor-core.xml \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/submaster-performance.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/news-cj-core.xml \
-	../refman-common/news-cluster.xml \
-	../refman-common/news-cmxj-core.xml \
-	../refman-common/news-cnet-core.xml \
-	../refman-common/news-codbc-core.xml \
-	../refman-common/news-mysql-proxy-core.xml \
-	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-common-news-cj.xml \
-	dynxml-common-news-cmxj.xml \
-	dynxml-common-news-cnet.xml \
-	dynxml-common-news-codbc.xml \
-	dynxml-common-news-mysql-proxy.xml \
-	dynxml-common-news-vstudioplugin.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-news-5.0.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	dynxml-local-se-bdb.xml \
-	dynxml-local-se-innodb.xml \
-	dynxml-local-se-myisam.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	faqs-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-outline.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster.xml \
-	news-5.0-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
-	news.xml \
-	optimization.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	replication-solutions.xml \
-	replication.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-0.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules-sbr.png \
-	../refman-common/images/published/replication-filtering-tbl-rules-sbr.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/submaster-performance.png
+	versions.ent
+dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap \
-	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-cmxj-core.idmap \
-	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-outline.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-version.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.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-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -5203,19 +2611,6 @@
 installing-es-manprepped.xml: $(installing_es_SOURCES) $(installing_es_IDMAPS)
 installing-es-remprepped.xml: $(installing_es_SOURCES) $(installing_es_IDMAPS)
 
-installing_outline_INCLUDES =
-installing_outline_IMAGES =
-installing_outline_SOURCES = installing-outline.xml $(installing_outline_INCLUDES)
-installing_outline_IDMAPS =
-installing-outline.validpure: $(installing_outline_SOURCES)
-installing-outline.titles: $(installing_outline_SOURCES)
-installing-outline.useless: $(installing_outline_SOURCES)
-installing-outline.valid: $(installing_outline_SOURCES) $(installing_outline_IDMAPS)
-installing-outline.validwarn: $(installing_outline_SOURCES) $(installing_outline_IDMAPS)
-installing-outline-prepped.xml: $(installing_outline_SOURCES) $(installing_outline_IDMAPS)
-installing-outline-manprepped.xml: $(installing_outline_SOURCES) $(installing_outline_IDMAPS)
-installing-outline-remprepped.xml: $(installing_outline_SOURCES) $(installing_outline_IDMAPS)
-
 installing_updowngrade_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -6133,7 +3528,6 @@
 	installing-core.xml \
 	installing-cs.xml \
 	installing-es.xml \
-	installing-outline.xml \
 	installing-updowngrade.xml \
 	installing-version.xml \
 	internationalization.xml \

@@ -6226,8 +3620,7 @@
 	triggers.xml \
 	tutorial.xml \
 	versions.ent \
-	views.xml \
-	windows-config-wizard.xml
+	views.xml
 manual_IMAGES = \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \

@@ -6448,9 +3841,6 @@
 	images/published/mysql-es-win32-fig4.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \

@@ -6476,11 +3866,7 @@
 	../ndbapi/metadata/ndb-internals.idmap \
 	../ndbapi/metadata/overview.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/introduction.idmap \

@@ -6513,7 +3899,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6528,14 +3913,11 @@
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/license-libedit.idmap \
 	../refman-common/metadata/license-regex.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
 	../refman-common/metadata/what-is.en.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-libmysqld.idmap \

@@ -6557,7 +3939,6 @@
 	metadata/installing-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-es.idmap \
-	metadata/installing-outline.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-version.idmap \
 	metadata/internationalization.idmap \

@@ -6592,7 +3973,6 @@
 	metadata/restrictions.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
 	metadata/se-csv.idmap \
 	metadata/se-example.idmap \
 	metadata/se-federated.idmap \

@@ -6615,8 +3995,7 @@
 	metadata/stored-routines.idmap \
 	metadata/triggers.idmap \
 	metadata/tutorial.idmap \
-	metadata/views.idmap \
-	metadata/windows-config-wizard.idmap
+	metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -8826,20 +6205,7 @@
 views-manprepped.xml: $(views_SOURCES) $(views_IDMAPS)
 views-remprepped.xml: $(views_SOURCES) $(views_IDMAPS)
 
-windows_config_wizard_INCLUDES =
-windows_config_wizard_IMAGES =
-windows_config_wizard_SOURCES = windows-config-wizard.xml $(windows_config_wizard_INCLUDES)
-windows_config_wizard_IDMAPS =
-windows-config-wizard.validpure: $(windows_config_wizard_SOURCES)
-windows-config-wizard.titles: $(windows_config_wizard_SOURCES)
-windows-config-wizard.useless: $(windows_config_wizard_SOURCES)
-windows-config-wizard.valid: $(windows_config_wizard_SOURCES) $(windows_config_wizard_IDMAPS)
-windows-config-wizard.validwarn: $(windows_config_wizard_SOURCES) $(windows_config_wizard_IDMAPS)
-windows-config-wizard-prepped.xml: $(windows_config_wizard_SOURCES) $(windows_config_wizard_IDMAPS)
-windows-config-wizard-manprepped.xml: $(windows_config_wizard_SOURCES) $(windows_config_wizard_IDMAPS)
-windows-config-wizard-remprepped.xml: $(windows_config_wizard_SOURCES) $(windows_config_wizard_IDMAPS)
 
-
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
 monitor-refman-chapter-aspec.xml.mem-query-analyzer.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-reference.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-whatsnew.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-common/images/published/monitor-ins!
 tall-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap ../mysql-monitor-2.0/images/published/heat-chart-legend.png dynsel-mem21-monitor-install-server.xml dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-2.1/monitor-faq-core.xml ../mysql-monitor-common/mem-reference-advgraph.xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2!
 .0/../common/phrases.ent ../mysql-monitor-common/images/publis!
 hed/quan
-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/images/published/monitor-install-win4.png ../mysql-monitor-common/install-unattended-core.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ..!
 /mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/images/published/replication.png ../mysql-monitor-2.1/images/published/mem-settings-servers.png ../mysql-monitor-common/images/published/success_alert_21.png ../mysql-monitor-common/images/published/unknown_alert.png ../mysql-monitor-2.1/metadata/monitor-faq-core.idmap ../mysql-monitor-common/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent ../mysql-monitor-common/dashboard-graphs-core.xml monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-2.1/i!
 mages/published/mem-settings-notification.png ../mysql-monitor!
 -common/
enterprise.ent ../mysql-monitor-common/mem-reference-core.xml ../mysql-monitor-common/images/published/critical_alert.png ../mysql-monitor-2.0/images/published/monitor-update-install-3.png dynsel-mem21-monitor-install-agent.xml ../common/fixedchars.ent ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/images/published/monitor-install-osx5.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/metadata/!
 install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/monitor-install-osx6.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/install-upgrades-core.xml ../mysql-monitor-common/images/published/email-settings.png ../mysql-monitor-2.1/images/published/server-graphs.png ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-osx2.png all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/mem-quan-item-example.png monitor-refman-chapter-base.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-common/dashboard-advisors-core.xml ../!
 common/product-versions.ent ../mysql-monitor-2.0/metadata/intr!
 oduction
.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-common/images/published/monitor-install-win3.png ../mysql-monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/metadata/mem-reference-advgraph.idmap ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-advisors-core.!
 idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-5.1/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 18, Lines Added: 37, Lines Deleted: 3271; 169704 bytes

@@ -1867,138 +1867,18 @@
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_manual_index_cfunc_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-cfunc-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_cfunc_IMAGES = \
-	../refman-common/images/published/se-federated-structure.png
+dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -2009,366 +1889,19 @@
 dynxml-local-manual-index-cfunc-remprepped.xml: $(dynxml_local_manual_index_cfunc_SOURCES) $(dynxml_local_manual_index_cfunc_IDMAPS)
 dynxml-local-manual-index-cfunc.xml: $(dynxml_local_manual_index_cfunc_INCLUDES)
 dynxml_local_manual_index_command_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dba.xml \
-	dynxml-local-dba-mysqld-server.xml \
-	dynxml-local-dba-security.xml \
-	dynxml-local-dba-user-management.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-news.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-mysql-cluster-replication.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png \
-	information-schema.xml \
-	installing-envvar.xml \
-	installing-general.xml \
-	installing-generic-binary.xml \
-	installing-i5os.xml \
-	installing-linux.xml \
-	installing-macosx.xml \
-	installing-perl.xml \
-	installing-postinstall.xml \
-	installing-solaris.xml \
-	installing-source-core.xml \
-	installing-updowngrade.xml \
-	installing-windows.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-command-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-news-core.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster-replication-core.xml \
-	mysql-cluster.xml \
-	news-5.1-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_command_IMAGES = \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png
+	versions.ent
+dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-column.idmap \
-	../ndbapi/metadata/ndb-dictionary.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndb-cluster-connection.idmap \
-	../ndbapi/metadata/ndb-ndb.idmap \
-	../ndbapi/metadata/ndb-ndberror.idmap \
-	../ndbapi/metadata/ndb-ndbindexscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbinterpretedcode.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../ndbapi/metadata/ndb-ndbscanfilter.idmap \
-	../ndbapi/metadata/ndb-ndbscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbtransaction.idmap \
-	../ndbapi/metadata/ndb-partitionspec.idmap \
-	../ndbapi/metadata/ndb-recordspecification.idmap \
-	../ndbapi/metadata/ndb-table.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-aix.idmap \
-	metadata/installing-bsd.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-hpux.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2380,159 +1913,18 @@
 dynxml-local-manual-index-command.xml: $(dynxml_local_manual_index_command_INCLUDES)
 dynxml_local_manual_index_function_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-postinstall.xml \
-	installing-source-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-function-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_function_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2544,156 +1936,18 @@
 dynxml-local-manual-index-function.xml: $(dynxml_local_manual_index_function_INCLUDES)
 dynxml_local_manual_index_is_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	dba-privilege-system.xml \
-	extending-mysql.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
 	manual-index-is-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-overview.xml \
-	optimization.xml \
-	partitioning.xml \
-	replication-notes.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_is_IMAGES = \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2710,81 +1964,13 @@
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
 	manual-index-isolevel-core.xml \
-	mysql-cluster-overview.xml \
-	optimization.xml \
-	se-innodb-core.xml \
-	sql-syntax-transactions.xml \
 	versions.ent
-dynxml_local_manual_index_isolevel_IMAGES = \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png
+dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2801,70 +1987,13 @@
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	manual-index-jointype-core.xml \
-	mysql-cluster-management.xml \
-	optimization.xml \
-	se-merge.xml \
-	sql-syntax-data-manipulation.xml \
 	versions.ent
-dynxml_local_manual_index_jointype_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2876,140 +2005,18 @@
 dynxml-local-manual-index-jointype.xml: $(dynxml_local_manual_index_jointype_INCLUDES)
 dynxml_local_manual_index_operator_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-operator-core.xml \
-	mysql-cluster-management.xml \
-	optimization.xml \
-	partitioning.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_operator_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+	versions.ent
+dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -3020,696 +2027,19 @@
 dynxml-local-manual-index-operator-remprepped.xml: $(dynxml_local_manual_index_operator_SOURCES) $(dynxml_local_manual_index_operator_IDMAPS)
 dynxml-local-manual-index-operator.xml: $(dynxml_local_manual_index_operator_INCLUDES)
 dynxml_local_manual_index_option_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-news.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-mysql-cluster-replication.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png \
-	information-schema.xml \
-	installing-envvar.xml \
-	installing-general.xml \
-	installing-generic-binary.xml \
-	installing-i5os.xml \
-	installing-linux.xml \
-	installing-macosx.xml \
-	installing-perl.xml \
-	installing-postinstall.xml \
-	installing-solaris.xml \
-	installing-source-core.xml \
-	installing-updowngrade.xml \
-	installing-windows.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-option-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-news-core.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster-replication-core.xml \
-	mysql-cluster.xml \
-	news-5.1-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-db2-core.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_option_IMAGES = \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png
+	versions.ent
+dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-column.idmap \
-	../ndbapi/metadata/ndb-dictionary.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndb-cluster-connection.idmap \
-	../ndbapi/metadata/ndb-ndb.idmap \
-	../ndbapi/metadata/ndb-ndberror.idmap \
-	../ndbapi/metadata/ndb-ndbindexscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbinterpretedcode.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../ndbapi/metadata/ndb-ndbscanfilter.idmap \
-	../ndbapi/metadata/ndb-ndbscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbtransaction.idmap \
-	../ndbapi/metadata/ndb-partitionspec.idmap \
-	../ndbapi/metadata/ndb-recordspecification.idmap \
-	../ndbapi/metadata/ndb-table.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-ccpp-core.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 \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-aix.idmap \
-	metadata/installing-bsd.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-hpux.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3720,151 +2050,19 @@
 dynxml-local-manual-index-option-remprepped.xml: $(dynxml_local_manual_index_option_SOURCES) $(dynxml_local_manual_index_option_IDMAPS)
 dynxml-local-manual-index-option.xml: $(dynxml_local_manual_index_option_INCLUDES)
 dynxml_local_manual_index_priv_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
 	manual-index-priv-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-programs-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-server-core.xml \
-	replication-configuration.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_priv_IMAGES = \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png
+	versions.ent
+dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3876,131 +2074,18 @@
 dynxml-local-manual-index-priv.xml: $(dynxml_local_manual_index_priv_INCLUDES)
 dynxml_local_manual_index_sqlmode_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sqlmode-core.xml \
-	partitioning.xml \
-	programs-client-core.xml \
-	replication-notes.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	storage-engines-core.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_sqlmode_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-core.idmap \
-	metadata/programs-client-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -4017,106 +2102,13 @@
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
 	manual-index-statvar-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-replication-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
 	versions.ent
-dynxml_local_manual_index_statvar_IMAGES = \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -4127,280 +2119,19 @@
 dynxml-local-manual-index-statvar-remprepped.xml: $(dynxml_local_manual_index_statvar_SOURCES) $(dynxml_local_manual_index_statvar_IDMAPS)
 dynxml-local-manual-index-statvar.xml: $(dynxml_local_manual_index_statvar_INCLUDES)
 dynxml_local_manual_index_stmt_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-postinstall.xml \
-	installing-source-core.xml \
-	installing-updowngrade.xml \
-	installing-windows.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-stmt-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster-replication-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_stmt_IMAGES = \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -4411,232 +2142,19 @@
 dynxml-local-manual-index-stmt-remprepped.xml: $(dynxml_local_manual_index_stmt_SOURCES) $(dynxml_local_manual_index_stmt_IDMAPS)
 dynxml-local-manual-index-stmt.xml: $(dynxml_local_manual_index_stmt_INCLUDES)
 dynxml_local_manual_index_sysvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	installing-windows.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sysvar-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-replication-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-using.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_sysvar_IMAGES = \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -4647,760 +2165,19 @@
 dynxml-local-manual-index-sysvar-remprepped.xml: $(dynxml_local_manual_index_sysvar_SOURCES) $(dynxml_local_manual_index_sysvar_IDMAPS)
 dynxml-local-manual-index-sysvar.xml: $(dynxml_local_manual_index_sysvar_INCLUDES)
 dynxml_local_manual_index_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb-config-params.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-2.1/news-monitor-core.xml \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/news-ccpp-core.xml \
-	../refman-common/news-cj-core.xml \
-	../refman-common/news-cmxj-core.xml \
-	../refman-common/news-cnet-core.xml \
-	../refman-common/news-codbc-core.xml \
-	../refman-common/news-mysql-proxy-core.xml \
-	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-common-news-ccpp.xml \
-	dynxml-common-news-cj.xml \
-	dynxml-common-news-cmxj.xml \
-	dynxml-common-news-cnet.xml \
-	dynxml-common-news-codbc.xml \
-	dynxml-common-news-mysql-proxy.xml \
-	dynxml-common-news-vstudioplugin.xml \
-	dynxml-local-installing-source.xml \
-	dynxml-local-mysql-cluster-configuration.xml \
-	dynxml-local-mysql-cluster-news.xml \
-	dynxml-local-mysql-cluster-programs.xml \
-	dynxml-local-mysql-cluster-replication.xml \
-	dynxml-local-news-5.1.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	faqs-core.xml \
-	functions-core.xml \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png \
-	information-schema.xml \
-	installing-aix.xml \
-	installing-bsd.xml \
-	installing-envvar.xml \
-	installing-general.xml \
-	installing-generic-binary.xml \
-	installing-hpux.xml \
-	installing-i5os.xml \
-	installing-linux.xml \
-	installing-macosx.xml \
-	installing-perl.xml \
-	installing-postinstall.xml \
-	installing-solaris.xml \
-	installing-source-core.xml \
-	installing-updowngrade.xml \
-	installing-windows.xml \
-	installing.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-core.xml \
-	mysql-cluster-configuration-core.xml \
-	mysql-cluster-management.xml \
-	mysql-cluster-multi-computer.xml \
-	mysql-cluster-news-core.xml \
-	mysql-cluster-overview.xml \
-	mysql-cluster-programs-core.xml \
-	mysql-cluster-replication-core.xml \
-	mysql-cluster.xml \
-	news-5.1-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
-	news.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	replication-solutions.xml \
-	replication.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_IMAGES = \
-	../refman-common/images/generated/win-msi-autosvg.png \
-	../refman-common/images/generated/win-msi-follow-autosvg.png \
-	../refman-common/images/generated/win-msi-install-autosvg.png \
-	../refman-common/images/generated/win-zip-install-autosvg.png \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cluster-circular-replication-1.png \
-	../refman-common/images/published/cluster-circular-replication-2.png \
-	../refman-common/images/published/cluster-components-1.png \
-	../refman-common/images/published/cluster-replication-binlog-injector.png \
-	../refman-common/images/published/cluster-replication-ipv6.png \
-	../refman-common/images/published/cluster-replication-multi-master-mysqlds.png \
-	../refman-common/images/published/cluster-replication-multi-master.png \
-	../refman-common/images/published/cluster-replication-overview.png \
-	../refman-common/images/published/cluster-security-network-1.png \
-	../refman-common/images/published/cluster-security-network-2.png \
-	../refman-common/images/published/cluster-security-network-3.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-comp-1.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/mysql-cfg-fig1.png \
-	../refman-common/images/published/mysql-cfg-fig10.png \
-	../refman-common/images/published/mysql-cfg-fig2.png \
-	../refman-common/images/published/mysql-cfg-fig3.png \
-	../refman-common/images/published/mysql-cfg-fig4.png \
-	../refman-common/images/published/mysql-cfg-fig5.png \
-	../refman-common/images/published/mysql-cfg-fig6.png \
-	../refman-common/images/published/mysql-cfg-fig7.png \
-	../refman-common/images/published/mysql-cfg-fig8.png \
-	../refman-common/images/published/mysql-cfg-fig9.png \
-	../refman-common/images/published/mysql-cfg-fig9b.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png \
-	../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png \
-	../refman-common/images/published/ndb-size-pl-1.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replicas-groups-1-1.png \
-	../refman-common/images/published/replicas-groups-1-2.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rolling-restarts.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png \
-	images/published/install-osx-pkg-1.png \
-	images/published/install-osx-pkg-4.png \
-	images/published/install-osx-prefpane.png \
-	images/published/install-osx-startup-1.png \
-	images/published/install-osx-startup-3.png \
-	images/published/install-osx-startup-5.png
+	versions.ent
+dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-changes.idmap \
-	../innodb-plugin-1.0/metadata/innodb-information-schema.idmap \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap \
-	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../ndbapi/metadata/mgm-api.idmap \
-	../ndbapi/metadata/ndb-column.idmap \
-	../ndbapi/metadata/ndb-dictionary.idmap \
-	../ndbapi/metadata/ndb-errors.idmap \
-	../ndbapi/metadata/ndb-getting-started.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/ndb-ndb-cluster-connection.idmap \
-	../ndbapi/metadata/ndb-ndb.idmap \
-	../ndbapi/metadata/ndb-ndberror.idmap \
-	../ndbapi/metadata/ndb-ndbindexscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbinterpretedcode.idmap \
-	../ndbapi/metadata/ndb-ndboperation.idmap \
-	../ndbapi/metadata/ndb-ndbrecord.idmap \
-	../ndbapi/metadata/ndb-ndbscanfilter.idmap \
-	../ndbapi/metadata/ndb-ndbscanoperation.idmap \
-	../ndbapi/metadata/ndb-ndbtransaction.idmap \
-	../ndbapi/metadata/ndb-partitionspec.idmap \
-	../ndbapi/metadata/ndb-recordspecification.idmap \
-	../ndbapi/metadata/ndb-table.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.5/metadata/installing-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	../refman-common/metadata/news-ccpp-core.idmap \
-	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-cmxj-core.idmap \
-	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-aix.idmap \
-	metadata/installing-bsd.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-hpux.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-windows.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.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-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -8263,13 +5040,10 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../innodb-plugin-1.0/metadata/innodb-changes.idmap \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
 	../innodb-plugin-1.0/metadata/innodb-information-schema.idmap \
 	../innodb-plugin-1.0/metadata/innodb-other-changes.idmap \
 	../innodb-plugin-1.0/metadata/innodb-performance.idmap \
 	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \

@@ -8311,11 +5085,7 @@
 	../ndbapi/metadata/ndb-table.idmap \
 	../ndbapi/metadata/overview.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \

@@ -8346,7 +5116,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -8361,15 +5130,12 @@
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/license-libedit.idmap \
 	../refman-common/metadata/license-regex.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
 	../refman-common/metadata/what-is.en.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-libmysqld.idmap \


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-5.1-maria/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 3; 1001 bytes

@@ -1343,13 +1343,10 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../innodb-plugin-1.0/metadata/innodb-changes.idmap \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
 	../innodb-plugin-1.0/metadata/innodb-information-schema.idmap \
 	../innodb-plugin-1.0/metadata/innodb-other-changes.idmap \
 	../innodb-plugin-1.0/metadata/innodb-performance.idmap \
 	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \


Modified: trunk/refman-5.4/Makefile.depends
===================================================================
--- trunk/refman-5.4/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-5.4/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 19, Lines Added: 33, Lines Deleted: 2568; 133737 bytes

@@ -1832,133 +1832,18 @@
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_manual_index_cfunc_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-cfunc-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_cfunc_IMAGES = \
-	../refman-common/images/published/se-federated-structure.png
+dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1969,219 +1854,19 @@
 dynxml-local-manual-index-cfunc-remprepped.xml: $(dynxml_local_manual_index_cfunc_SOURCES) $(dynxml_local_manual_index_cfunc_IDMAPS)
 dynxml-local-manual-index-cfunc.xml: $(dynxml_local_manual_index_cfunc_INCLUDES)
 dynxml_local_manual_index_command_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-dtrace.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dba.xml \
-	dynxml-local-dba-mysqld-server.xml \
-	dynxml-local-dba-security.xml \
-	dynxml-local-dba-user-management.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	images/published/dtrace-groups.png \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-command-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_command_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	images/published/dtrace-groups.png
+	versions.ent
+dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-configuration-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2193,150 +1878,18 @@
 dynxml-local-manual-index-command.xml: $(dynxml_local_manual_index_command_INCLUDES)
 dynxml_local_manual_index_function_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-function-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_function_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2348,122 +1901,18 @@
 dynxml-local-manual-index-function.xml: $(dynxml_local_manual_index_function_INCLUDES)
 dynxml_local_manual_index_is_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	dba-privilege-system.xml \
-	extending-mysql.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
 	manual-index-is-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	replication-notes.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_is_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2482,57 +1931,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
 	manual-index-isolevel-core.xml \
-	optimization.xml \
-	se-innodb-core.xml \
-	sql-syntax-transactions.xml \
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-core.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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2552,54 +1955,10 @@
 	../refman-common/urls.ent \
 	all-entities.ent \
 	manual-index-jointype-core.xml \
-	optimization.xml \
-	se-merge.xml \
-	sql-syntax-data-manipulation.xml \
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2611,123 +1970,18 @@
 dynxml-local-manual-index-jointype.xml: $(dynxml_local_manual_index_jointype_INCLUDES)
 dynxml_local_manual_index_operator_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-operator-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-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-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2738,545 +1992,19 @@
 dynxml-local-manual-index-operator-remprepped.xml: $(dynxml_local_manual_index_operator_SOURCES) $(dynxml_local_manual_index_operator_IDMAPS)
 dynxml-local-manual-index-operator.xml: $(dynxml_local_manual_index_operator_INCLUDES)
 dynxml_local_manual_index_option_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-option-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-db2-core.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_option_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-ccpp-core.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 \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3287,8 +2015,6 @@
 dynxml-local-manual-index-option-remprepped.xml: $(dynxml_local_manual_index_option_SOURCES) $(dynxml_local_manual_index_option_IDMAPS)
 dynxml-local-manual-index-option.xml: $(dynxml_local_manual_index_option_INCLUDES)
 dynxml_local_manual_index_priv_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \

@@ -3297,125 +2023,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
 	manual-index-priv-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-server-core.xml \
-	replication-configuration.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3427,129 +2039,18 @@
 dynxml-local-manual-index-priv.xml: $(dynxml_local_manual_index_priv_INCLUDES)
 dynxml_local_manual_index_sqlmode_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sqlmode-core.xml \
-	partitioning.xml \
-	programs-client-core.xml \
-	replication-notes.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	storage-engines-core.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_sqlmode_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3561,118 +2062,18 @@
 dynxml-local-manual-index-sqlmode.xml: $(dynxml_local_manual_index_sqlmode_INCLUDES)
 dynxml_local_manual_index_statvar_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	introduction.xml \
 	manual-index-statvar-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
 	versions.ent
-dynxml_local_manual_index_statvar_IMAGES = \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3683,206 +2084,19 @@
 dynxml-local-manual-index-statvar-remprepped.xml: $(dynxml_local_manual_index_statvar_SOURCES) $(dynxml_local_manual_index_statvar_IDMAPS)
 dynxml-local-manual-index-statvar.xml: $(dynxml_local_manual_index_statvar_INCLUDES)
 dynxml_local_manual_index_stmt_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-stmt-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_stmt_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3893,174 +2107,19 @@
 dynxml-local-manual-index-stmt-remprepped.xml: $(dynxml_local_manual_index_stmt_SOURCES) $(dynxml_local_manual_index_stmt_IDMAPS)
 dynxml-local-manual-index-stmt.xml: $(dynxml_local_manual_index_stmt_INCLUDES)
 dynxml_local_manual_index_sysvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sysvar-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-using.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_sysvar_IMAGES = \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -4071,603 +2130,19 @@
 dynxml-local-manual-index-sysvar-remprepped.xml: $(dynxml_local_manual_index_sysvar_SOURCES) $(dynxml_local_manual_index_sysvar_IDMAPS)
 dynxml-local-manual-index-sysvar.xml: $(dynxml_local_manual_index_sysvar_INCLUDES)
 dynxml_local_manual_index_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-2.1/news-monitor-core.xml \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/news-ccpp-core.xml \
-	../refman-common/news-cj-core.xml \
-	../refman-common/news-cmxj-core.xml \
-	../refman-common/news-cnet-core.xml \
-	../refman-common/news-codbc-core.xml \
-	../refman-common/news-mysql-proxy-core.xml \
-	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-common-news-ccpp.xml \
-	dynxml-common-news-cj.xml \
-	dynxml-common-news-cmxj.xml \
-	dynxml-common-news-cnet.xml \
-	dynxml-common-news-codbc.xml \
-	dynxml-common-news-mysql-proxy.xml \
-	dynxml-common-news-vstudioplugin.xml \
-	dynxml-local-news-5.4.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	faqs-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-core.xml \
-	news-5.4-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
-	news.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	replication-solutions.xml \
-	replication.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png
+	versions.ent
+dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap \
-	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	../refman-common/metadata/news-ccpp-core.idmap \
-	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-cmxj-core.idmap \
-	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.4-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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -6547,12 +4022,9 @@
 	images/published/dtrace-groups.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.0/metadata/innodb-downgrading.idmap \
 	../innodb-plugin-1.0/metadata/innodb-other-changes.idmap \
 	../innodb-plugin-1.0/metadata/innodb-performance.idmap \
 	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../innodb-plugin-1.0/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \

@@ -6573,10 +4045,7 @@
 	../mysql-monitor-common/metadata/mem-reference-advgraph.idmap \
 	../mysql-monitor-common/metadata/mem-reference-core.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \

@@ -6616,7 +4085,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6632,15 +4100,12 @@
 	../refman-common/metadata/license-libedit.idmap \
 	../refman-common/metadata/license-netlib.idmap \
 	../refman-common/metadata/license-regex.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
 	../refman-common/metadata/what-is.en.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-libmysqld.idmap \


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-5.5/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 19, Lines Added: 33, Lines Deleted: 2539; 132320 bytes

@@ -1830,132 +1830,18 @@
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_manual_index_cfunc_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-cfunc-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_cfunc_IMAGES = \
-	../refman-common/images/published/se-federated-structure.png
+dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1966,219 +1852,19 @@
 dynxml-local-manual-index-cfunc-remprepped.xml: $(dynxml_local_manual_index_cfunc_SOURCES) $(dynxml_local_manual_index_cfunc_IDMAPS)
 dynxml-local-manual-index-cfunc.xml: $(dynxml_local_manual_index_cfunc_INCLUDES)
 dynxml_local_manual_index_command_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-dtrace.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dba.xml \
-	dynxml-local-dba-mysqld-server.xml \
-	dynxml-local-dba-security.xml \
-	dynxml-local-dba-user-management.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	images/published/dtrace-groups.png \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-command-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_command_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	images/published/dtrace-groups.png
+	versions.ent
+dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-configuration-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2190,148 +1876,18 @@
 dynxml-local-manual-index-command.xml: $(dynxml_local_manual_index_command_INCLUDES)
 dynxml_local_manual_index_function_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-function-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_function_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2343,122 +1899,18 @@
 dynxml-local-manual-index-function.xml: $(dynxml_local_manual_index_function_INCLUDES)
 dynxml_local_manual_index_is_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	dba-privilege-system.xml \
-	extending-mysql.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
 	manual-index-is-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	replication-notes.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_is_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2477,57 +1929,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
 	manual-index-isolevel-core.xml \
-	optimization.xml \
-	se-innodb-core.xml \
-	sql-syntax-transactions.xml \
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-core.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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2547,54 +1953,10 @@
 	../refman-common/urls.ent \
 	all-entities.ent \
 	manual-index-jointype-core.xml \
-	optimization.xml \
-	se-merge.xml \
-	sql-syntax-data-manipulation.xml \
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems-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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2606,123 +1968,18 @@
 dynxml-local-manual-index-jointype.xml: $(dynxml_local_manual_index_jointype_INCLUDES)
 dynxml_local_manual_index_operator_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-operator-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2733,544 +1990,19 @@
 dynxml-local-manual-index-operator-remprepped.xml: $(dynxml_local_manual_index_operator_SOURCES) $(dynxml_local_manual_index_operator_IDMAPS)
 dynxml-local-manual-index-operator.xml: $(dynxml_local_manual_index_operator_INCLUDES)
 dynxml_local_manual_index_option_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-option-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-db2-core.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_option_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-ccpp-core.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 \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3281,8 +2013,6 @@
 dynxml-local-manual-index-option-remprepped.xml: $(dynxml_local_manual_index_option_SOURCES) $(dynxml_local_manual_index_option_IDMAPS)
 dynxml-local-manual-index-option.xml: $(dynxml_local_manual_index_option_INCLUDES)
 dynxml_local_manual_index_priv_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \

@@ -3291,127 +2021,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
 	manual-index-priv-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-server-core.xml \
-	replication-configuration.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3423,127 +2037,18 @@
 dynxml-local-manual-index-priv.xml: $(dynxml_local_manual_index_priv_INCLUDES)
 dynxml_local_manual_index_sqlmode_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sqlmode-core.xml \
-	partitioning.xml \
-	programs-client-core.xml \
-	replication-notes.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	storage-engines-core.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_sqlmode_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -3560,88 +2065,13 @@
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errors-problems-core.xml \
 	manual-index-statvar-core.xml \
-	optimization.xml \
-	performance-schema-core.xml \
-	programs-client-core.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
 	versions.ent
-dynxml_local_manual_index_statvar_IMAGES = \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -3652,205 +2082,19 @@
 dynxml-local-manual-index-statvar-remprepped.xml: $(dynxml_local_manual_index_statvar_SOURCES) $(dynxml_local_manual_index_statvar_IDMAPS)
 dynxml-local-manual-index-statvar.xml: $(dynxml_local_manual_index_statvar_INCLUDES)
 dynxml_local_manual_index_stmt_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-stmt-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_stmt_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -3861,173 +2105,19 @@
 dynxml-local-manual-index-stmt-remprepped.xml: $(dynxml_local_manual_index_stmt_SOURCES) $(dynxml_local_manual_index_stmt_IDMAPS)
 dynxml-local-manual-index-stmt.xml: $(dynxml_local_manual_index_stmt_INCLUDES)
 dynxml_local_manual_index_sysvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sysvar-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-using.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_sysvar_IMAGES = \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -4038,605 +2128,19 @@
 dynxml-local-manual-index-sysvar-remprepped.xml: $(dynxml_local_manual_index_sysvar_SOURCES) $(dynxml_local_manual_index_sysvar_IDMAPS)
 dynxml-local-manual-index-sysvar.xml: $(dynxml_local_manual_index_sysvar_INCLUDES)
 dynxml_local_manual_index_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-2.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-2.1/news-monitor-core.xml \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/news-ccpp-core.xml \
-	../refman-common/news-cj-core.xml \
-	../refman-common/news-cmxj-core.xml \
-	../refman-common/news-cnet-core.xml \
-	../refman-common/news-codbc-core.xml \
-	../refman-common/news-mysql-proxy-core.xml \
-	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-common-news-ccpp.xml \
-	dynxml-common-news-cj.xml \
-	dynxml-common-news-cmxj.xml \
-	dynxml-common-news-cnet.xml \
-	dynxml-common-news-codbc.xml \
-	dynxml-common-news-mysql-proxy.xml \
-	dynxml-common-news-vstudioplugin.xml \
-	dynxml-local-news-5.5.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errors-problems-core.xml \
-	events.xml \
-	extending-mysql.xml \
-	faqs-core.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-core.xml \
-	news-5.5-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
-	news.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	replication-solutions.xml \
-	replication.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/multi-db.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/redundancy-after.png \
-	../refman-common/images/published/redundancy-before.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/scaleout.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/images/published/submaster-performance.png
+	versions.ent
+dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
-	../innodb-plugin-1.1/metadata/innodb-changes.idmap \
-	../innodb-plugin-1.1/metadata/innodb-plugin.idmap \
-	../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap \
-	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/news-5.1-core.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	../refman-common/metadata/news-ccpp-core.idmap \
-	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-cmxj-core.idmap \
-	../refman-common/metadata/news-cnet-core.idmap \
-	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.5-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -6558,12 +4062,9 @@
 manual_IDMAPS = \
 	../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
 	../innodb-plugin-1.1/metadata/innodb-changes.idmap \
-	../innodb-plugin-1.1/metadata/innodb-compression.idmap \
-	../innodb-plugin-1.1/metadata/innodb-downgrading.idmap \
 	../innodb-plugin-1.1/metadata/innodb-other-changes.idmap \
 	../innodb-plugin-1.1/metadata/innodb-performance.idmap \
 	../innodb-plugin-1.1/metadata/innodb-plugin.idmap \
-	../innodb-plugin-1.1/metadata/innodb-row-format.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
 	../mysql-monitor-2.0/metadata/install-user-roles.idmap \

@@ -6584,10 +4085,7 @@
 	../mysql-monitor-common/metadata/mem-reference-advgraph.idmap \
 	../mysql-monitor-common/metadata/mem-reference-core.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \

@@ -6627,7 +4125,6 @@
 	../refman-common/metadata/connector-net-ref.idmap \
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
 	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
 	../refman-common/metadata/connector-net-tutorials.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \

@@ -6643,15 +4140,12 @@
 	../refman-common/metadata/license-libedit.idmap \
 	../refman-common/metadata/license-netlib.idmap \
 	../refman-common/metadata/license-regex.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
 	../refman-common/metadata/what-is.en.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-libmysqld.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2010-04-28 10:57:27 UTC (rev 20296)
+++ trunk/refman-6.0/Makefile.depends	2010-04-28 11:34:22 UTC (rev 20297)
Changed blocks: 22, Lines Added: 33, Lines Deleted: 2610; 135271 bytes

@@ -1738,133 +1738,18 @@
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_manual_index_cfunc_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-cfunc-core.xml \
-	optimization.xml \
-	programs-client-core.xml \
-	restrictions.xml \
-	se-federated.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_cfunc_IMAGES = \
-	../refman-common/images/published/se-federated-structure.png
+dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.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.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1875,223 +1760,19 @@
 dynxml-local-manual-index-cfunc-remprepped.xml: $(dynxml_local_manual_index_cfunc_SOURCES) $(dynxml_local_manual_index_cfunc_IDMAPS)
 dynxml-local-manual-index-cfunc.xml: $(dynxml_local_manual_index_cfunc_INCLUDES)
 dynxml_local_manual_index_command_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbackup.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	data-types.xml \
-	dba-dtrace.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dba.xml \
-	dynxml-local-dba-mysqld-server.xml \
-	dynxml-local-dba-security.xml \
-	dynxml-local-dba-user-management.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	images/published/dtrace-groups.png \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-command-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-falcon-core.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-maria-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_command_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	images/published/dtrace-groups.png
+	versions.ent
+dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-dtrace.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -2103,148 +1784,18 @@
 dynxml-local-manual-index-command.xml: $(dynxml_local_manual_index_command_INCLUDES)
 dynxml_local_manual_index_function_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-function-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	programs-admin-util-core.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	spatial-extensions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_function_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -2256,123 +1807,18 @@
 dynxml-local-manual-index-function.xml: $(dynxml_local_manual_index_function_INCLUDES)
 dynxml_local_manual_index_is_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	dba-privilege-system.xml \
-	extending-mysql.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
 	manual-index-is-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	replication-notes.xml \
-	restrictions.xml \
-	se-falcon-core.xml \
-	se-innodb-core.xml \
-	sql-syntax-server-administration.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_is_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+	versions.ent
+dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -2391,59 +1837,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
 	manual-index-isolevel-core.xml \
-	optimization.xml \
-	se-innodb-core.xml \
-	se-maria-core.xml \
-	sql-syntax-transactions.xml \
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems.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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -2463,54 +1861,10 @@
 	../refman-common/urls.ent \
 	all-entities.ent \
 	manual-index-jointype-core.xml \
-	optimization.xml \
-	se-merge.xml \
-	sql-syntax-data-manipulation.xml \
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/errors-problems.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/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -2522,125 +1876,18 @@
 dynxml-local-manual-index-jointype.xml: $(dynxml_local_manual_index_jointype_INCLUDES)
 dynxml_local_manual_index_operator_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	information-schema.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-operator-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-server-administration.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.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-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -2651,549 +1898,19 @@
 dynxml-local-manual-index-operator-remprepped.xml: $(dynxml_local_manual_index_operator_SOURCES) $(dynxml_local_manual_index_operator_IDMAPS)
 dynxml-local-manual-index-operator.xml: $(dynxml_local_manual_index_operator_INCLUDES)
 dynxml_local_manual_index_option_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbackup.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/apis-cplusplus.xml \
-	../refman-common/apis-eiffel.xml \
-	../refman-common/apis-perl.xml \
-	../refman-common/apis-php-mysql.xml \
-	../refman-common/apis-php-mysqli.xml \
-	../refman-common/apis-php-mysqlnd.xml \
-	../refman-common/apis-php-pdo-mysql.xml \
-	../refman-common/apis-php.xml \
-	../refman-common/apis-python.xml \
-	../refman-common/apis-ruby.xml \
-	../refman-common/apis-tcl.xml \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-c-core.xml \
-	../refman-common/connector-cpp-core.xml \
-	../refman-common/connector-cpp-tutorials.xml \
-	../refman-common/connector-j-connprops.xml \
-	../refman-common/connector-j-errormap.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net-connection-options.xml \
-	../refman-common/connector-net-core.xml \
-	../refman-common/connector-net-install.xml \
-	../refman-common/connector-net-programming.xml \
-	../refman-common/connector-net-ref.xml \
-	../refman-common/connector-net-support.xml \
-	../refman-common/connector-net-tutorials-intro.xml \
-	../refman-common/connector-net-tutorials-mysqlscript.xml \
-	../refman-common/connector-net-tutorials-ssl.xml \
-	../refman-common/connector-net-tutorials.xml \
-	../refman-common/connector-net-versions.xml \
-	../refman-common/connector-net-visual-studio.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-ooo.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	apis-c.xml \
-	apis-libmysqld.xml \
-	backup.xml \
-	connectors-apis.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-multiple-servers.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-common-connector-c.xml \
-	dynxml-common-connector-cpp.xml \
-	dynxml-common-connector-net.xml \
-	dynxml-local-programs-admin-util.xml \
-	dynxml-local-programs-client.xml \
-	dynxml-local-programs-server.xml \
-	dynxml-local-replication-options.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-core.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-option-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-development.xml \
-	programs-installation.xml \
-	programs-miscellaneous.xml \
-	programs-server-core.xml \
-	programs-using.xml \
-	programs.xml \
-	replication-configuration.xml \
-	replication-implementation.xml \
-	replication-notes.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-archive-core.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-db2-core.xml \
-	se-example.xml \
-	se-falcon-core.xml \
-	se-federated.xml \
-	se-innodb-core.xml \
-	se-maria-core.xml \
-	se-memory-core.xml \
-	se-merge.xml \
-	se-myisam-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-prepared-statements.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	sql-syntax-utility.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	tutorial.xml \
-	versions.ent \
-	views.xml
-dynxml_local_manual_index_option_IMAGES = \
-	../refman-common/images/published/blackhole-1.png \
-	../refman-common/images/published/cmxj-overview.png \
-	../refman-common/images/published/cnet-win-install-step1.png \
-	../refman-common/images/published/cnet-win-install-step2.png \
-	../refman-common/images/published/cnet-win-install-step3.png \
-	../refman-common/images/published/cnet-win-install-step4.png \
-	../refman-common/images/published/cnet-win-install-step5.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
-	../refman-common/images/published/connector-cpp-additional-dependencies.png \
-	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
-	../refman-common/images/published/connector-cpp-additional-library-dir.png \
-	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
-	../refman-common/images/published/connector-cpp-installer-custom.png \
-	../refman-common/images/published/connector-cpp-installer-overview.png \
-	../refman-common/images/published/connector-cpp-installer-welcome.png \
-	../refman-common/images/published/connector-cpp-menu-new-project.png \
-	../refman-common/images/published/connector-cpp-menu-project-properties.png \
-	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
-	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
-	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
-	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
-	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
-	../refman-common/images/published/connector-cpp-netbeans.png \
-	../refman-common/images/published/connector-cpp-new-project-wizard.png \
-	../refman-common/images/published/connector-cpp-properties.png \
-	../refman-common/images/published/connector-cpp-select-release-build.png \
-	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
-	../refman-common/images/published/connector-net-tutorials-1.png \
-	../refman-common/images/published/connector-net-tutorials-asp-provider-profile-simple-app.png \
-	../refman-common/images/published/connector-net-tutorials-authentication-type.png \
-	../refman-common/images/published/connector-net-tutorials-create-user.png \
-	../refman-common/images/published/connector-net-tutorials-security-tab.png \
-	../refman-common/images/published/connector-net-tutorials-select-provider.png \
-	../refman-common/images/published/connector-net-tutorials-tables.png \
-	../refman-common/images/published/connector-net-tutorials-users-roles-tables.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
-	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
-	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
-	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
-	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
-	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
-	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
-	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
-	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
-	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
-	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
-	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
-	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
-	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
-	../refman-common/images/published/connector-net-website-config-tool-membership.png \
-	../refman-common/images/published/connector-net-website-config-tool-options.png \
-	../refman-common/images/published/connector-net-website-config-tool-profiles.png \
-	../refman-common/images/published/connector-net-website-config-tool-roles.png \
-	../refman-common/images/published/connector-net-website-config-tool-session-state.png \
-	../refman-common/images/published/connector-net-website-config-tool-string-editor.png \
-	../refman-common/images/published/connector-net-website-config-tool-tables.png \
-	../refman-common/images/published/connector-net-website-config-tool.png \
-	../refman-common/images/published/connector-ooo-add-extension.png \
-	../refman-common/images/published/connector-ooo-base.png \
-	../refman-common/images/published/connector-ooo-dbwizard1.png \
-	../refman-common/images/published/connector-ooo-dbwizard2.png \
-	../refman-common/images/published/connector-ooo-dbwizard3.png \
-	../refman-common/images/published/connector-ooo-dbwizard4.png \
-	../refman-common/images/published/connector-ooo-dbwizard5.png \
-	../refman-common/images/published/connector-ooo-dbwizard6.png \
-	../refman-common/images/published/myaccess-odbc.png \
-	../refman-common/images/published/myaccess.png \
-	../refman-common/images/published/myarchitecture.png \
-	../refman-common/images/published/myflowchart.png \
-	../refman-common/images/published/myodbc-crystal-1.png \
-	../refman-common/images/published/myodbc-crystal-2.png \
-	../refman-common/images/published/myodbc-crystal-3.png \
-	../refman-common/images/published/myodbc-crystal-4.png \
-	../refman-common/images/published/myodbc-crystal-5.png \
-	../refman-common/images/published/myodbc-crystal-6.png \
-	../refman-common/images/published/myodbc-excel-step1.png \
-	../refman-common/images/published/myodbc-excel-step2.png \
-	../refman-common/images/published/myodbc-excel-step3.png \
-	../refman-common/images/published/myodbc-excel-step4.png \
-	../refman-common/images/published/myodbc-excel-step5.png \
-	../refman-common/images/published/myodbc-link-step1.png \
-	../refman-common/images/published/myodbc-link-step3.png \
-	../refman-common/images/published/myodbc-link-step4.png \
-	../refman-common/images/published/myodbc-link-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step1.png \
-	../refman-common/images/published/myodbc-macosx-install-step2.png \
-	../refman-common/images/published/myodbc-macosx-install-step3.png \
-	../refman-common/images/published/myodbc-macosx-install-step4.png \
-	../refman-common/images/published/myodbc-macosx-install-step5.png \
-	../refman-common/images/published/myodbc-macosx-install-step6.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/published/myodbc-win-install-step1.png \
-	../refman-common/images/published/myodbc-win-install-step2.png \
-	../refman-common/images/published/myodbc-win-install-step3.png \
-	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
-	../refman-common/images/published/myodbc-win-tracing.png \
-	../refman-common/images/published/replication-filtering-db-rules.png \
-	../refman-common/images/published/replication-filtering-tbl-rules.png \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/images/published/se-federated-structure.png
+	versions.ent
+dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.0/metadata/windows-config-wizard.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php-mysql.idmap \
-	../refman-common/metadata/apis-php-mysqli.idmap \
-	../refman-common/metadata/apis-php-mysqlnd.idmap \
-	../refman-common/metadata/apis-php-pdo-mysql.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-c-core.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/connector-cpp-tutorials.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-install.idmap \
-	../refman-common/metadata/connector-net-programming.idmap \
-	../refman-common/metadata/connector-net-ref.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-net-tutorials-intro.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/connector-net-tutorials-ssl.idmap \
-	../refman-common/metadata/connector-net-tutorials.idmap \
-	../refman-common/metadata/connector-net-visual-studio.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-ooo.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-ccpp-core.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 \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3204,8 +1921,6 @@
 dynxml-local-manual-index-option-remprepped.xml: $(dynxml_local_manual_index_option_SOURCES) $(dynxml_local_manual_index_option_IDMAPS)
 dynxml-local-manual-index-option.xml: $(dynxml_local_manual_index_option_INCLUDES)
 dynxml_local_manual_index_priv_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \

@@ -3214,126 +1929,11 @@
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	apis-c.xml \
-	backup.xml \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-privilege-system.xml \
-	dba-security-core.xml \
-	dba-user-management-core.xml \
-	dynxml-local-replication-options.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	events.xml \
-	extending-mysql.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	internationalization.xml \
 	manual-index-priv-core.xml \
-	optimization.xml \
-	partitioning.xml \
-	performance-schema-core.xml \
-	programs-admin-util-core.xml \
-	programs-client-core.xml \
-	programs-server-core.xml \
-	replication-configuration.xml \
-	replication-options-core.xml \
-	restrictions.xml \
-	se-innodb-core.xml \
-	se-merge.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-data-manipulation.xml \
-	sql-syntax-replication.xml \
-	sql-syntax-server-administration.xml \
-	sql-syntax-transactions.xml \
-	storage-engines-core.xml \
-	stored-programs-views.xml \
-	stored-routines.xml \
-	triggers.xml \
-	versions.ent \
-	views.xml
+	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-6.0-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.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-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -3345,128 +1945,18 @@
 dynxml-local-manual-index-priv.xml: $(dynxml_local_manual_index_priv_INCLUDES)
 dynxml_local_manual_index_sqlmode_INCLUDES = \
 	../common/fixedchars.ent \
-	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../common/phrases.ent \
 	../common/product-versions.ent \
-	../common/product-versions.ent \
 	../gui-common/gui-common.ent \
-	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \
-	../refman-common/what-is.en.xml \
 	all-entities.ent \
-	data-types.xml \
-	dba-log-files.xml \
-	dba-mysqld-server-core.xml \
-	dba-user-management-core.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	functions-core.xml \
-	information-schema.xml \
-	installing-updowngrade.xml \
-	introduction.xml \
-	language-structure-core.xml \
 	manual-index-sqlmode-core.xml \
-	partitioning.xml \
-	programs-client-core.xml \
-	replication-notes.xml \
-	se-innodb-core.xml \
-	sql-syntax-data-definition.xml \
-	sql-syntax-server-administration.xml \
-	storage-engines-core.xml \
-	tutorial.xml \
 	versions.ent
-dynxml_local_manual_index_sqlmode_IMAGES = \
-	../refman-common/images/published/rpl-create-select-failure-rbr.png
+dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/introduction.idmap \
-	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication-core.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.5/metadata/introduction.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/what-is.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems.idmap \
-	metadata/events.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.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-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-