MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:mc.brown Date:July 28 2010 1:36pm
Subject:svn commit - mysqldoc@docsrva: r21936 - in trunk: mysql-monitor-common refman-5.0 refman-5.1 refman-5.5 refman-6.0
View as plain text  
Author: docauto
Date: 2010-07-28 15:36:59 +0200 (Wed, 28 Jul 2010)
New Revision: 21936

Log:
Dependency auto-update

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


Modified: trunk/mysql-monitor-common/Makefile.depends
===================================================================
--- trunk/mysql-monitor-common/Makefile.depends	2010-07-28 13:25:54 UTC (rev 21935)
+++ trunk/mysql-monitor-common/Makefile.depends	2010-07-28 13:36:59 UTC (rev 21936)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 23; 2622 bytes

@@ -653,30 +653,17 @@
 	enterprise.ent \
 	enterprise.ent \
 	images/published/email-settings.png \
-	images/published/email-settings.png \
 	images/published/monitor-install-osx1.png \
-	images/published/monitor-install-osx1.png \
 	images/published/monitor-install-osx2.png \
-	images/published/monitor-install-osx2.png \
 	images/published/monitor-install-osx4.png \
-	images/published/monitor-install-osx4.png \
 	images/published/monitor-install-osx5.png \
-	images/published/monitor-install-osx5.png \
 	images/published/monitor-install-osx6.png \
-	images/published/monitor-install-osx6.png \
 	images/published/monitor-install-win1.png \
-	images/published/monitor-install-win1.png \
 	images/published/monitor-install-win3.png \
-	images/published/monitor-install-win3.png \
 	images/published/monitor-install-win4.png \
-	images/published/monitor-install-win4.png \
 	images/published/monitor-install-win5.png \
-	images/published/monitor-install-win5.png \
 	install-agent-core.xml \
-	install-agent-core.xml \
 	install-unattended-core.xml \
-	install-unattended-core.xml \
-	install-upgrades-core.xml \
 	install-upgrades-core.xml
 install_core_IMAGES = \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \

@@ -698,24 +685,14 @@
 	../mysql-monitor-2.0/images/published/monitor-update-install-9.png \
 	../mysql-monitor-2.1/images/published/first-dashboard-login.png \
 	images/published/email-settings.png \
-	images/published/email-settings.png \
 	images/published/monitor-install-osx1.png \
-	images/published/monitor-install-osx1.png \
 	images/published/monitor-install-osx2.png \
-	images/published/monitor-install-osx2.png \
 	images/published/monitor-install-osx4.png \
-	images/published/monitor-install-osx4.png \
 	images/published/monitor-install-osx5.png \
-	images/published/monitor-install-osx5.png \
 	images/published/monitor-install-osx6.png \
-	images/published/monitor-install-osx6.png \
 	images/published/monitor-install-win1.png \
-	images/published/monitor-install-win1.png \
 	images/published/monitor-install-win3.png \
-	images/published/monitor-install-win3.png \
 	images/published/monitor-install-win4.png \
-	images/published/monitor-install-win4.png \
-	images/published/monitor-install-win5.png \
 	images/published/monitor-install-win5.png
 install_core_SOURCES = install-core.xml $(install_core_INCLUDES)
 install_core_IDMAPS = \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2010-07-28 13:25:54 UTC (rev 21935)
+++ trunk/refman-5.0/Makefile.depends	2010-07-28 13:36:59 UTC (rev 21936)
Changed blocks: 27, Lines Added: 24, Lines Deleted: 531; 47968 bytes

@@ -1791,30 +1791,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.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/stored-routines.idmap \
-	metadata/tutorial.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)

@@ -1923,79 +1900,7 @@
 	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-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.idmap \
-	metadata/installing-es.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/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/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-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/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.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)

@@ -2104,42 +2009,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/installing-version.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -2248,23 +2118,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -2373,12 +2227,7 @@
 	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 = \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.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)

@@ -2487,11 +2336,7 @@
 	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 = \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.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)

@@ -2600,26 +2445,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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/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)

@@ -2728,79 +2554,7 @@
 	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-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.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/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/installing-cs.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/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/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/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/tutorial.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)

@@ -2909,42 +2663,7 @@
 	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-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.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-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.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/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -3053,25 +2772,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.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)

@@ -3180,19 +2881,7 @@
 	versions.ent
 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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.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)

@@ -3301,68 +2990,7 @@
 	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-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.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/optimization.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/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.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_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)

@@ -3471,56 +3099,7 @@
 	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-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems.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/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/news-5.0-core.idmap \
-	metadata/optimization.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.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/restrictions.idmap \
-	metadata/se-bdb-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory.idmap \
-	metadata/se-myisam-core.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/storage-engines.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -3629,92 +3208,7 @@
 	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 = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.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-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.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/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-es.idmap \
-	metadata/installing-outline.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-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-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/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)

@@ -3877,6 +3371,7 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/license-apache-2-0.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \

@@ -3898,11 +3393,16 @@
 	../common/license-tomcat.xml \
 	../common/license-zlib.xml \
 	../common/phrases.ent \
+	../common/phrases.ent \
 	../common/product-versions.ent \
+	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
+	../workbench/workbench.ent \
 	all-entities.ent \
 	preface-core.xml \
 	versions.ent

@@ -3910,6 +3410,7 @@
 dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
 dynxml_local_preface_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -5181,7 +4682,6 @@
 	../mysql-monitor-2.1/monitor-faq-core.xml \
 	../mysql-monitor-2.1/news-monitor-core.xml \
 	../mysql-monitor-2.1/version.ent \
-	../mysql-monitor-2.1/version.ent \
 	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-advisors-core.xml \
 	../mysql-monitor-common/dashboard-configure-core.xml \

@@ -5420,6 +4920,7 @@
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy-core.xml \
 	../refman-common/news-cj-core.xml \

@@ -5910,6 +5411,7 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -5986,7 +5488,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 \

@@ -5999,14 +5500,11 @@
 	../refman-common/metadata/ha-vm.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-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 \

@@ -6024,12 +5522,10 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	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 \

@@ -6064,7 +5560,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 \

@@ -6157,7 +5652,6 @@
 	../mysql-monitor-2.1/mem-reference-advgraph-core.xml \
 	../mysql-monitor-2.1/monitor-faq-core.xml \
 	../mysql-monitor-2.1/version.ent \
-	../mysql-monitor-2.1/version.ent \
 	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-advisors-core.xml \
 	../mysql-monitor-common/dashboard-configure-core.xml \

@@ -6385,7 +5879,6 @@
 	../mysql-monitor-2.1/mem-reference-advgraph-core.xml \
 	../mysql-monitor-2.1/monitor-faq-core.xml \
 	../mysql-monitor-2.1/version.ent \
-	../mysql-monitor-2.1/version.ent \
 	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-advisors-core.xml \
 	../mysql-monitor-common/dashboard-configure-core.xml \

@@ -8410,7 +7903,7 @@
 
 
 # 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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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-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-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent monitor-refman-chapter-base.xml ../common/product-versions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/monitor-install-win3.png ../mysql-!
 monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor!
 -2.0/../
common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.!
 xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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/unknown_alert.png ../mysql-monitor-common/images/publish!
 ed/monitor-migration-progress.png ../mysql-monitor-2.1/metadat!
 a/monito
r-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-2.1/../mysql-monitor-2.1/mem-reference-advgraph-core.xml ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-c!
 ommon/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
+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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/heat-chart-legend.png dynsel-mem21-monit!
 or-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-common/../mysql-monitor-2.1/mem-reference-advgraph-core.xml versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-common/../mysql-monitor-2!
 .1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../!
 mysql-mo
nitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/success_alert_21.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 monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../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 ../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-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-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../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/../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent monitor-refman-chapter-base.xml ../common/product-versions.ent ../mysql-monitor-common!
 /images/published/monitor-install-win3.png ../mysql-monitor-2.!
 0/metada
ta/install-user-roles.idmap ../mysql-monitor-2.0/../common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap dynsel-mem21-monitor-insta!
 ll-server.xml ../mysql-monitor-common/../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.1/monitor-faq-core.xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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/unknown_alert.!
 png ../mysql-monitor-common/images/published/monitor-migration!
 -progres
s.png ../mysql-monitor-2.1/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-common/../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/../mysql-monitor-2.1/all-entities.ent ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-!
 common/images/published/mem-quan-item-example.png ../mysql-monitor-common/../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-common/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.!
 png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2010-07-28 13:25:54 UTC (rev 21935)
+++ trunk/refman-5.1/Makefile.depends	2010-07-28 13:36:59 UTC (rev 21936)
Changed blocks: 23, Lines Added: 22, Lines Deleted: 592; 49206 bytes

@@ -2025,30 +2025,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.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/stored-routines.idmap \
-	metadata/tutorial.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)

@@ -2170,91 +2147,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.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/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/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/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-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/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.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)

@@ -2376,46 +2269,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -2537,26 +2391,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -2678,13 +2513,7 @@
 	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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.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)

@@ -2806,11 +2635,7 @@
 	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 = \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.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)

@@ -2932,27 +2757,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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/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)

@@ -3074,91 +2879,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.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/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-replication-core.idmap \
-	metadata/mysql-cluster.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-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/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/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/tutorial.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)

@@ -3280,44 +3001,7 @@
 	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-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.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-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -3439,27 +3123,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.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)

@@ -3581,21 +3245,7 @@
 	versions.ent
 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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.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)

@@ -3717,73 +3367,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-generic-binary.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-multi-computer.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/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-installation.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/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.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_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)

@@ -3905,60 +3489,7 @@
 	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-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-generic-binary.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-replication-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-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -4080,105 +3611,7 @@
 	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 = \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.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-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.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/errors-problems-core.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-generic-binary.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.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/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)

@@ -4475,8 +3908,8 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/license-apache-2-0.xml \
-	../common/license-apache-commons-logging.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \
 	../common/license-dbug.xml \

@@ -4502,11 +3935,16 @@
 	../common/license-tomcat.xml \
 	../common/license-zlib.xml \
 	../common/phrases.ent \
+	../common/phrases.ent \
 	../common/product-versions.ent \
+	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
+	../workbench/workbench.ent \
 	all-entities.ent \
 	preface-core.xml \
 	versions.ent

@@ -6414,7 +5852,6 @@
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
 	../common/license-apache-2-0.xml \
-	../common/license-apache-commons-logging.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \
 	../common/license-dbug.xml \

@@ -6776,6 +6213,7 @@
 	../refman-common/images/published/se-federated-structure.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy-core.xml \
 	../refman-common/news-ccpp-core.xml \

@@ -7421,9 +6859,6 @@
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-5.0/metadata/installing-version.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \
 	../refman-5.0/metadata/windows-config-wizard.idmap \

@@ -7452,7 +6887,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 \

@@ -7465,15 +6899,12 @@
 	../refman-common/metadata/ha-vm.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 \

@@ -7492,7 +6923,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \
 	metadata/installing-bsd.idmap \

@@ -9973,7 +9403,7 @@
 
 
 # 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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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-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-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent monitor-refman-chapter-base.xml ../common/product-versions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/monitor-install-win3.png ../mysql-!
 monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor!
 -2.0/../
common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.!
 xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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/unknown_alert.png ../mysql-monitor-common/images/publish!
 ed/monitor-migration-progress.png ../mysql-monitor-2.1/metadat!
 a/monito
r-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-2.1/../mysql-monitor-2.1/mem-reference-advgraph-core.xml ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-c!
 ommon/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
+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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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.1/metadata/mem-reference-advgraph-core.idmap ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysq!
 l-monitor-common/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent ../mysql-monitor-2.1/mem-reference-advgraph-core.xml monitor-refman-chapter-base.xml ../common/product-vers!
 ions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-com!
 mon/imag
es/published/monitor-install-win3.png ../mysql-monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor-2.0/../common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-co!
 mmon/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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-s!
 ettings-servers.png ../mysql-monitor-common/images/published/u!
 nknown_a
lert.png ../mysql-monitor-common/images/published/monitor-migration-progress.png ../mysql-monitor-2.1/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/m!
 em-quan-item-example.png ../mysql-monitor-common/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2010-07-28 13:25:54 UTC (rev 21935)
+++ trunk/refman-5.5/Makefile.depends	2010-07-28 13:36:59 UTC (rev 21936)
Changed blocks: 26, Lines Added: 26, Lines Deleted: 522; 47637 bytes

@@ -1840,6 +1840,7 @@
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.0-beta \
+	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.0-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.1-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.2-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.3-m3 \

@@ -1971,31 +1972,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.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-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.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)

@@ -2096,73 +2073,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/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-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/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-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/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.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)

@@ -2263,45 +2174,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.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/errors-problems-core.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/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -2402,25 +2275,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -2521,12 +2376,7 @@
 	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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.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)

@@ -2627,10 +2477,7 @@
 	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 = \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.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)

@@ -2731,27 +2578,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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/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)

@@ -2852,74 +2679,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.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-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/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/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/tutorial.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)

@@ -3020,43 +2780,7 @@
 	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-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.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-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -3157,27 +2881,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.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)

@@ -3278,21 +2982,7 @@
 	versions.ent
 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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.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)

@@ -3393,65 +3083,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems-core.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/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.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_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)

@@ -3552,56 +3184,7 @@
 	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-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/errors-problems-core.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-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -3702,88 +3285,7 @@
 	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 = \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.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-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.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/errors-problems-core.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/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)

@@ -3884,6 +3386,7 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/license-apache-2-0.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \

@@ -3910,11 +3413,16 @@
 	../common/license-tomcat.xml \
 	../common/license-zlib.xml \
 	../common/phrases.ent \
+	../common/phrases.ent \
 	../common/product-versions.ent \
+	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
+	../workbench/workbench.ent \
 	all-entities.ent \
 	preface-core.xml \
 	versions.ent

@@ -3922,6 +3430,7 @@
 dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
 dynxml_local_preface_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -5306,6 +4815,7 @@
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.0-beta \
+	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.0-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.1-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.2-m2 \
 	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.5.3-m3 \

@@ -5675,6 +5185,7 @@
 	../refman-common/images/published/se-federated-structure.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy-core.xml \
 	../refman-common/news-ccpp-core.xml \

@@ -6185,6 +5696,7 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -6246,9 +5758,6 @@
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-5.0/metadata/installing-version.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \
 	../refman-5.0/metadata/windows-config-wizard.idmap \

@@ -6285,7 +5794,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 \

@@ -6298,15 +5806,12 @@
 	../refman-common/metadata/ha-vm.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 \

@@ -6326,7 +5831,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-core.idmap \
 	metadata/installing-updowngrade.idmap \

@@ -8434,7 +7938,7 @@
 
 
 # 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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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-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-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent monitor-refman-chapter-base.xml ../common/product-versions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/monitor-install-win3.png ../mysql-!
 monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor!
 -2.0/../
common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.!
 xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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/unknown_alert.png ../mysql-monitor-common/images/publish!
 ed/monitor-migration-progress.png ../mysql-monitor-2.1/metadat!
 a/monito
r-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-2.1/../mysql-monitor-2.1/mem-reference-advgraph-core.xml ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-c!
 ommon/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
+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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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.1/metadata/mem-reference-advgraph-core.idmap ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysq!
 l-monitor-common/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent ../mysql-monitor-2.1/mem-reference-advgraph-core.xml monitor-refman-chapter-base.xml ../common/product-vers!
 ions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-com!
 mon/imag
es/published/monitor-install-win3.png ../mysql-monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor-2.0/../common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-co!
 mmon/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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-s!
 ettings-servers.png ../mysql-monitor-common/images/published/u!
 nknown_a
lert.png ../mysql-monitor-common/images/published/monitor-migration-progress.png ../mysql-monitor-2.1/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/m!
 em-quan-item-example.png ../mysql-monitor-common/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2010-07-28 13:25:54 UTC (rev 21935)
+++ trunk/refman-6.0/Makefile.depends	2010-07-28 13:36:59 UTC (rev 21936)
Changed blocks: 25, Lines Added: 24, Lines Deleted: 530; 47157 bytes

@@ -1875,31 +1875,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.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-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.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)

@@ -2004,74 +1980,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-cpp-core.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/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-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/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-maria-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/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.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)

@@ -2176,45 +2085,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.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/errors-problems.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/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -2319,25 +2190,7 @@
 	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 = \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -2442,13 +2295,7 @@
 	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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/optimization.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/sql-syntax-transactions.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)

@@ -2553,10 +2400,7 @@
 	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 = \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.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)

@@ -2661,28 +2505,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.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/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)

@@ -2787,75 +2610,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.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/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.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-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/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-maria-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-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/tutorial.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)

@@ -2960,43 +2715,7 @@
 	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-common/metadata/connector-net-connection-options.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.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-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.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)

@@ -3101,27 +2820,7 @@
 	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 = \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-updowngrade.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/tutorial.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)

@@ -3226,20 +2925,7 @@
 	versions.ent
 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 = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/optimization.idmap \
-	metadata/performance-schema-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.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)

@@ -3344,66 +3030,7 @@
 	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-5.0/metadata/installing-version.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.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/errors-problems.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/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.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/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)

@@ -3508,57 +3135,7 @@
 	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-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.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/errors-problems.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-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-federated.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/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.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)

@@ -3663,90 +3240,7 @@
 	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 = \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.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-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.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/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-updowngrade.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/news-5.2-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-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_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)

@@ -3885,6 +3379,7 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/license-apache-2-0.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \

@@ -3912,11 +3407,16 @@
 	../common/license-unicode.xml \
 	../common/license-zlib.xml \
 	../common/phrases.ent \
+	../common/phrases.ent \
 	../common/product-versions.ent \
+	../common/product-versions.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
+	../workbench/workbench.ent \
 	all-entities.ent \
 	preface-core.xml \
 	versions.ent

@@ -3924,6 +3424,7 @@
 dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
 dynxml_local_preface_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -5528,6 +5029,7 @@
 	../refman-common/images/published/se-federated-structure.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \
+	../refman-common/license-apache-commons-logging.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy-core.xml \
 	../refman-common/news-ccpp-core.xml \

@@ -6039,6 +5541,7 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-logging.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-dbug.idmap \

@@ -6088,9 +5591,6 @@
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/installing-cs.idmap \
-	../refman-5.0/metadata/installing-es.idmap \
-	../refman-5.0/metadata/installing-version.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \
 	../refman-5.0/metadata/windows-config-wizard.idmap \

@@ -6124,7 +5624,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 \

@@ -6137,15 +5636,12 @@
 	../refman-common/metadata/ha-vm.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 \

@@ -6165,7 +5661,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-core.idmap \
 	metadata/installing-updowngrade.idmap \

@@ -6173,7 +5668,6 @@
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \
-	metadata/news-5.2-core.idmap \
 	metadata/news-6.0-core.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \

@@ -8365,7 +7859,7 @@
 
 
 # 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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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-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-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent monitor-refman-chapter-base.xml ../common/product-versions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/monitor-install-win3.png ../mysql-!
 monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor!
 -2.0/../
common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-common/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.!
 xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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/unknown_alert.png ../mysql-monitor-common/images/publish!
 ed/monitor-migration-progress.png ../mysql-monitor-2.1/metadat!
 a/monito
r-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-2.1/../mysql-monitor-2.1/mem-reference-advgraph-core.xml ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-c!
 ommon/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
+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-2.1/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.1/../common/phrases.ent ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/publish!
 ed/heat-chart-legend.png dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-2.0/images/published/mem-settings-group.png ../mysql-monitor-common/install-core.xml ../mysql-monitor-2.0/images/published/agent-install-osx3.png versions.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.1/dashboard-whatsnew.xml ../mysql-monitor-2.0/images/published/agent-install-win3.png ../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-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/images/published/suc!
 cess_alert_21.png ../mysql-monitor-2.0/dashboard-replication.x!
 ml ../my
sql-monitor-common/images/published/warning_alert.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-core.idmap ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-2.1/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.1/../mysql-monitor-common/enterprise.ent ../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 ../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.1/metadata/mem-reference-advgraph-core.idmap ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysq!
 l-monitor-common/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-common/metadata/install-agent-core.idmap ../mysql-monitor-common/metadata/dashboard-overview-core.idmap ../mysql-monitor-2.1/dynxml-local-mem-reference-advgraph.xml ../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.1/all-entities.ent ../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-osx2.png ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../workbench/workbench.ent ../mysql-monitor-2.1/mem-reference-advgraph-core.xml monitor-refman-chapter-base.xml ../common/product-vers!
 ions.ent ../mysql-monitor-2.1/version.ent ../mysql-monitor-com!
 mon/imag
es/published/monitor-install-win3.png ../mysql-monitor-2.0/metadata/install-user-roles.idmap ../mysql-monitor-2.0/../common/fixedchars.ent dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-common/metadata/dashboard-query-analyzer-note.idmap ../mysql-monitor-common/metadata/dashboard-graphs-core.idmap ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-common/images/published/monitor-install-osx1.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-common/images/published/monitor-install-osx4.png ../mysql-monitor-common/dashboard-overview-core.xml ../mysql-monitor-co!
 mmon/metadata/mem-reference-core.idmap dynsel-mem21-monitor-install-server.xml ../mysql-monitor-2.1/monitor-faq-core.xml ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.1/images/published/mem-quan-config.png ../common/phrases.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.1/../../mysqldoc/dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.1/images/published/first-dashboard-login.png ../mysql-monitor-common/metadata/install-upgrades-core.idmap ../mysql-monitor-2.0/all-entities.ent ../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-s!
 ettings-servers.png ../mysql-monitor-common/images/published/u!
 nknown_a
lert.png ../mysql-monitor-common/images/published/monitor-migration-progress.png ../mysql-monitor-2.1/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-graphs-core.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.1/images/published/mem-settings-notification.png ../mysql-monitor-common/images/published/monitor-install-win5.png ../mysql-monitor-common/mem-reference-core.xml ../common/fixedchars.ent ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/install-agent-core.xml ../mysql-monitor-2.1/images/published/monitor-migration-check.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.1/../refman-common/urls.ent ../mysql-monitor-common/images/published/monitor-install-win1.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/m!
 em-quan-item-example.png ../mysql-monitor-common/dashboard-advisors-core.xml ../mysql-monitor-2.1/images/published/dashboard-whatsnew.png ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-quan-graph.png ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-common/dashboard-query-analyzer-core.xml ../mysql-monitor-common/images/published/info_alert.png ../mysql-monitor-2.1/images/published/server-rename.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/metadata/dashboard-advisors-core.idmap ../mysql-monitor-common/dashboard-query-analyzer-note.xml ../mysql-monitor-common/metadata/install-unattended-core.idmap ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Thread
svn commit - mysqldoc@docsrva: r21936 - in trunk: mysql-monitor-common refman-5.0 refman-5.1 refman-5.5 refman-6.0mc.brown28 Jul