List:Commits« Previous MessageNext Message »
From:tony.bedford Date:March 2 2011 5:41pm
Subject:svn commit - mysqldoc@oter02: r25224 - in trunk: refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 workbench
View as plain text  
Author: ab226828
Date: 2011-03-02 18:41:16 +0100 (Wed, 02 Mar 2011)
New Revision: 25224

Log:
Added initial info on new sidebar layout. Removed redundant info. Updated dependencies.

Modified:
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.5/Makefile.depends
   trunk/refman-5.6/Makefile.depends
   trunk/refman-6.0/Makefile.depends
   trunk/workbench/Makefile.depends
   trunk/workbench/sql-development.xml


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/refman-5.0/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 18, Lines Added: 14, Lines Deleted: 514; 27899 bytes

@@ -1900,29 +1900,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/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)

@@ -2037,77 +2015,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 \
-	../refman-common/metadata/mysql-proxy-core.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-source-core.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-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)

@@ -2222,40 +2130,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-source-core.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)

@@ -2370,22 +2245,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/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)

@@ -2500,12 +2360,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)

@@ -2620,11 +2475,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)

@@ -2739,25 +2590,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-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)

@@ -2872,79 +2705,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-pdo-mysql.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-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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/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/triggers.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)

@@ -3059,41 +2820,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/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)

@@ -3208,24 +2935,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/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)

@@ -3340,19 +3050,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)

@@ -3467,68 +3165,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-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/information-schema.idmap \
-	metadata/installing-source-core.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-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)

@@ -3643,56 +3280,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-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/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)

@@ -3807,90 +3395,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 \
-	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-outline.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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)

@@ -6476,7 +5981,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 \

@@ -6489,10 +5993,8 @@
 	../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 \

@@ -6513,7 +6015,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-es.idmap \

@@ -6559,7 +6060,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 \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/refman-5.1/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 17, Lines Added: 14, Lines Deleted: 554; 29372 bytes

@@ -2186,30 +2186,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/extending-mysql.idmap \
-	metadata/functions-core.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)

@@ -2334,86 +2311,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 \
-	../refman-common/metadata/mysql-proxy-core.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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-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)

@@ -2538,43 +2436,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-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-source-core.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)

@@ -2699,25 +2561,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/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)

@@ -2842,13 +2686,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)

@@ -2973,11 +2811,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)

@@ -3102,26 +2936,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/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-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)

@@ -3246,86 +3061,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-pdo-mysql.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-envvar.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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/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/triggers.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)

@@ -3450,43 +3186,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/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)

@@ -3611,26 +3311,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/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)

@@ -3755,21 +3436,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/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)

@@ -3894,69 +3561,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-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/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-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)

@@ -4081,57 +3686,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-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-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)

@@ -4256,98 +3811,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 \
-	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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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)

@@ -7712,7 +7176,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 \

@@ -7725,11 +7188,9 @@
 	../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 \

@@ -7751,7 +7212,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-envvar.idmap \


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/refman-5.5/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 24, Lines Added: 21, Lines Deleted: 529; 54879 bytes

@@ -1967,31 +1967,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/extending-mysql.idmap \
-	metadata/functions-core.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)

@@ -2105,77 +2081,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 \
-	../refman-common/metadata/mysql-proxy-core.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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.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)

@@ -2289,44 +2195,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-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-source-core.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/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)

@@ -2440,25 +2309,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/dba-user-management-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.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)

@@ -2572,12 +2423,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)

@@ -2691,10 +2537,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)

@@ -2808,26 +2651,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/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.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)

@@ -2941,78 +2765,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-pdo-mysql.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-envvar.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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-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/triggers.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)

@@ -3126,42 +2879,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/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)

@@ -3275,26 +2993,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/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)

@@ -3408,21 +3107,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/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)

@@ -3536,64 +3221,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-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/information-schema.idmap \
-	metadata/installing-source-core.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)

@@ -3707,55 +3335,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-source-core.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)

@@ -3869,91 +3449,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 \
-	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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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)

@@ -6520,12 +6016,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -7162,12 +6658,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -7370,7 +6866,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 \

@@ -7383,11 +6878,9 @@
 	../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 \

@@ -7437,7 +6930,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \

@@ -9594,12 +9086,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -9728,12 +9220,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -9884,12 +9376,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -10018,12 +9510,12 @@
 	../workbench/images/published/wb-sakila-tutorial.png \
 	../workbench/images/published/wb-schema-privileges.png \
 	../workbench/images/published/wb-scripting-shell.png \
+	../workbench/images/published/wb-sql-editor-actions-screenshot.png \
 	../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-controls-screenshot.png \
 	../workbench/images/published/wb-sql-editor-results-screenshot.png \
 	../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	../workbench/images/published/wb-sql-editor-screenshot.png \
 	../workbench/images/published/wb-sql-editor-snippets-screenshot.png \
 	../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -10078,7 +9570,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-workbench-refman-chapter-aspec.xml.workbench-faq.none.section.xml workbench-refman-chapter-aspec.xml.wb-keys.none.section.xml workbench-refman-chapter-aspec.xml.wb-server-administration.none.section.xml workbench-refman-chapter-aspec.xml.wb-extending.none.section.xml workbench-refman-chapter-aspec.xml.wb-installing.none.section.xml workbench-refman-chapter-aspec.xml.wb-getting-started-tutorial.none.section.xml workbench-refman-chapter-aspec.xml.wb-editions.none.section.xml workbench-refman-chapter-aspec.xml.wb-sql-development.none.section.xml workbench-refman-chapter-aspec.xml.wb-home.none.section.xml workbench-refman-chapter-aspec.xml.wb-intro.none.chapter.xml workbench-refman-chapter-aspec.xml.wb-data-modeling.none.section.xml: ../workbench/images/published/wb-forward-engineer-to-database-wizard-options.png ../workbench/images/published/wb-drawSplit.png ../workbench/intro.xml ../workbench/images/published/wb-forward-engineer-sql-script-wizard-review-script.png ../workbench
 /images/published/wb-database-synchronize-wizard-diff-direction-arrow.png ../workbench/images/published/wb-getting-started-tutorial-manage-connections.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction.png ../workbench/images/published/wb-sql-editor-tabsheets-screenshot.png ../workbench/tutorial-plugins.xml ../workbench/images/published/wb-vertical-toolbar.png ../workbench/images/published/wb-reverse-engineer-database-wizard-progress.png ../workbench/images/published/wb-manage-server-admin.png ../workbench/metadata/documenting-sakila.idmap ../workbench/images/published/wb-manage-server-logs-tab.png ../workbench/metadata/notes.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-home.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-ignore.png ../workbench/images/published/wb-getting-started-tutorial-results.png ../workbench/keys.xml ../workbench/images/published/wb-manage-server-data-dump-tab.png ../
 workbench/metadata/data-modeling.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-test-connection.png versions.ent ../workbench/images/published/wb-sakila-eer.png ../workbench/images/published/wb-reverse-engineer-database-wizard-show-filter.png ../workbench/validation-plugins.xml ../workbench/images/published/wb-scripting-shell.png ../workbench/metadata/stored-procedures.idmap ../workbench/documenting-sakila.xml ../workbench/version.ent ../workbench/manage-db-connections.xml ../workbench/extending.xml ../workbench/home.xml ../workbench/images/published/wb-getting-started-tutorial-edit-data.png ../workbench/foreign-key-relationships.xml ../workbench/images/published/wb-forward-engineer-to-database-wizard-connect.png ../workbench/metadata/dbdoc-templates.idmap ../workbench/images/published/wb-foreign-key.png ../workbench/images/published/wb-getting-started-tutorial-columns.png workbench-refman-chapter-base.xml ../workbench/metadata/getting-started-tutorial
 .idmap ../workbench/images/published/wb-manage-db-connections-socket-parameters.png ../workbench/images/published/wb-find-window.png ../workbench/installing.xml ../workbench/printing.xml ../workbench/images/published/wb-reverse-engineer-database-wizard.png ../workbench/sql-development.xml ../workbench/editions.xml ../workbench/images/published/wb-sql-editor-snippets-screenshot.png ../workbench/model-editor.xml ../workbench/images/published/wb-reverse-engineer-database-wizard-results.png ../workbench/metadata/forward-engineering.idmap ../workbench/preferences.xml ../workbench/forward-engineering.xml ../workbench/metadata/validation-plugins.idmap ../workbench/images/published/wb-manage-server-accounts-tab.png ../workbench/metadata/sql-development.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-connection.png ../workbench/images/published/wb-table-editor-indexes-tab.png ../workbench/server-administration.xml ../mysql-monitor-2.3/enterprise.ent ../workbench
 /views.xml ../workbench/images/published/wb-add-eer-diagram.png ../workbench/images/published/wb-schema-privileges.png ../workbench/images/published/wb-getting-started-tutorial-admin-review.png ../workbench/metadata/intro.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-home-screen-instance.png ../workbench/metadata/table-editor.idmap ../workbench/images/published/wb-manage-db-connections-ssh-parameters.png ../workbench/metadata/eer-diagram-editor.idmap ../workbench/images/published/wb-forward-engineer-to-database-wizard-select-objects.png ../workbench/images/published/wb-layer.png ../workbench/metadata/preferences.idmap ../workbench/images/published/wb-getting-started-tutorial-eer-diagram.png ../workbench/workbench.ent ../workbench/../refman-common/urls.ent ../workbench/metadata/working-with-models.idmap ../common/product-versions.ent ../workbench/metadata/editions.idmap ../workbench/metadata/reverse-engineering.idmap ../workbench/images/published/wb-ma
 nage-server-connections-tab.png ../workbench/metadata/keys.idmap ../workbench/images/published/wb-sql-editor-results-screenshot.png ../workbench/metadata/tables.idmap ../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png ../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png ../workbench/metadata/printing.idmap ../workbench/eer-diagram-editor.xml ../workbench/images/published/wb-sql-editor-toolbar-screenshot.png ../workbench/images/published/wb-reverse-engineer-database-wizard-fetch-object-info.png ../workbench/images/published/wb-manage-server-instances-connections.png ../workbench/images/published/wb-getting-started-tutorial-home-screen.png ../workbench/images/published/wb-manage-server-data-import.png ../workbench/images/published/wb-table-eer-view.png ../workbench/images/published/wb-getting-started-tutorial-admin-os.png ../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png ../workbench/
 images/published/wb-database-diff-report-wizard-sources.png ../workbench/images/published/wb-sql-editor-results-controls-screenshot.png ../workbench/images/published/wb-getting-started-tutorial-admin-specify-host.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-source.png ../workbench/toolbar.xml ../workbench/metadata/foreign-key-relationships.idmap ../workbench/../common/fixedchars.ent ../workbench/images/published/wb-getting-started-tutorial-new-schema.png ../workbench/images/published/wb-sakila-tutorial.png ../workbench/working-with-models.xml ../workbench/images/published/wb-sql-editor-screenshot.png ../workbench/../common/phrases.ent ../workbench/metadata/server-administration.idmap ../common/phrases.ent ../workbench/images/published/wb-forward-engineer-sql-script-wizard-export-options.png ../workbench/images/published/wb-manage-db-connections-dialog.png ../workbench/menus.xml ../workbench/images/published/wb-getting-started-tutorial-admin
 -instance-name.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-model.png ../workbench/images/published/wb-navigator.png ../workbench/images/published/wb-reverse-engineer-database-wizard-select-objects.png ../workbench/images/published/wb-database-diff-report-wizard-report.png ../workbench/images/published/wb-getting-started-tutorial-admin-test-host.png ../workbench/metadata/manage-db-connections.idmap ../workbench/metadata/toolbar.idmap ../workbench/images/published/wb-getting-started-tutorial-edit-table-data.png ../workbench/metadata/model-editor.idmap ../workbench/images/published/wb-manage-db-connections-advanced.png ../workbench/metadata/home.idmap ../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png ../workbench/metadata/data-modeling-tutorial.idmap ../workbench/images/published/wb-mysql-model-page.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-progress.png ../workbench/images.xml ../workbe
 nch/tables.xml ../workbench/images/published/wb-preferences.png ../workbench/notes.xml ../workbench/text-objects.xml ../workbench/images/published/wb-table-editor-overview.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-catalog.png workbench-refman-chapter-aspec.xml ../workbench/reverse-engineering.xml ../common/fixedchars.ent ../workbench/layers.xml ../workbench/images/published/wb-forward-engineer-sql-alter-script-wizard-options.png ../workbench/getting-started-tutorial.xml ../workbench/images/published/wb-getting-started-tutorial-admin-startup.png ../workbench/images/published/wb-installing-mac-install-screen.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-review-script.png ../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png ../workbench/images/published/wb-table-editor-columns-tab.png ../workbench/images/published/wb-homepage.png ../workbench/images/published/wb-manage-server-data-options.png ../wo
 rkbench/images/published/wb-forward-engineer-sql-alter-script-wizard-script.png ../workbench/images/published/wb-reverse-engineer-database-wizard-logs.png ../refman-common/urls.ent all-entities.ent ../workbench/images/published/wb-forward-engineer-sql-script-wizard-filter.png ../workbench/metadata/views.idmap ../mysql-monitor-2.3/version.ent ../workbench/images/published/wb-database-synchronize-wizard-diff.png ../workbench/images/published/wb-manage-server-configuration-tab.png ../workbench/images/published/wb-manage-server-startup-tab.png ../workbench/images/published/wb-reverse-engineer-database-wizard-connect-dbms.png ../workbench/dbdoc-templates.xml ../workbench/metadata/images.idmap ../workbench/all-entities.ent ../workbench/metadata/text-objects.idmap ../workbench/data-modeling-tutorial.xml ../workbench/faq.xml ../workbench/data-modeling.xml ../workbench/metadata/faq.idmap ../workbench/metadata/installing.idmap ../workbench/stored-procedures.xml ../workbench/images/pub
 lished/wb-manage-server-instances-system-profile.png ../workbench/table-editor.xml ../workbench/images/published/wb-manage-server-variables-tab.png ../workbench/images/published/wb-default-schema.png ../workbench/metadata/extending.idmap ../workbench/images/published/wb-roles.png ../workbench/images/published/wb-getting-started-tutorial-review-script.png ../workbench/metadata/tutorial-plugins.idmap ../workbench/metadata/menus.idmap ../workbench/metadata/layers.idmap ../workbench/images/published/wb-reverse-engineer-database-wizard-select-schemata.png
+workbench-refman-chapter-aspec.xml.workbench-faq.none.section.xml workbench-refman-chapter-aspec.xml.wb-keys.none.section.xml workbench-refman-chapter-aspec.xml.wb-server-administration.none.section.xml workbench-refman-chapter-aspec.xml.wb-extending.none.section.xml workbench-refman-chapter-aspec.xml.wb-installing.none.section.xml workbench-refman-chapter-aspec.xml.wb-getting-started-tutorial.none.section.xml workbench-refman-chapter-aspec.xml.wb-editions.none.section.xml workbench-refman-chapter-aspec.xml.wb-sql-development.none.section.xml workbench-refman-chapter-aspec.xml.wb-home.none.section.xml workbench-refman-chapter-aspec.xml.wb-intro.none.chapter.xml workbench-refman-chapter-aspec.xml.wb-data-modeling.none.section.xml: ../workbench/images/published/wb-forward-engineer-to-database-wizard-options.png ../workbench/images/published/wb-drawSplit.png ../workbench/intro.xml ../workbench/images/published/wb-forward-engineer-sql-script-wizard-review-script.png ../workbench
 /images/published/wb-database-synchronize-wizard-diff-direction-arrow.png ../workbench/images/published/wb-getting-started-tutorial-manage-connections.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction.png ../workbench/images/published/wb-sql-editor-tabsheets-screenshot.png ../workbench/tutorial-plugins.xml ../workbench/images/published/wb-vertical-toolbar.png ../workbench/images/published/wb-reverse-engineer-database-wizard-progress.png ../workbench/images/published/wb-manage-server-admin.png ../workbench/metadata/documenting-sakila.idmap ../workbench/images/published/wb-manage-server-logs-tab.png ../workbench/metadata/notes.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-home.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-ignore.png ../workbench/images/published/wb-getting-started-tutorial-results.png ../workbench/keys.xml ../workbench/images/published/wb-manage-server-data-dump-tab.png ../
 workbench/metadata/data-modeling.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-test-connection.png versions.ent ../workbench/images/published/wb-sakila-eer.png ../workbench/images/published/wb-reverse-engineer-database-wizard-show-filter.png ../workbench/validation-plugins.xml ../workbench/images/published/wb-scripting-shell.png ../workbench/metadata/stored-procedures.idmap ../workbench/documenting-sakila.xml ../workbench/version.ent ../workbench/manage-db-connections.xml ../workbench/extending.xml ../workbench/home.xml ../workbench/images/published/wb-getting-started-tutorial-edit-data.png ../workbench/foreign-key-relationships.xml ../workbench/images/published/wb-forward-engineer-to-database-wizard-connect.png ../workbench/metadata/dbdoc-templates.idmap ../workbench/images/published/wb-foreign-key.png ../workbench/images/published/wb-getting-started-tutorial-columns.png workbench-refman-chapter-base.xml ../workbench/metadata/getting-started-tutorial
 .idmap ../workbench/images/published/wb-manage-db-connections-socket-parameters.png ../workbench/images/published/wb-find-window.png ../workbench/installing.xml ../workbench/printing.xml ../workbench/images/published/wb-reverse-engineer-database-wizard.png ../workbench/sql-development.xml ../workbench/editions.xml ../workbench/images/published/wb-sql-editor-snippets-screenshot.png ../workbench/model-editor.xml ../workbench/images/published/wb-reverse-engineer-database-wizard-results.png ../workbench/metadata/forward-engineering.idmap ../workbench/preferences.xml ../workbench/forward-engineering.xml ../workbench/metadata/validation-plugins.idmap ../workbench/images/published/wb-manage-server-accounts-tab.png ../workbench/metadata/sql-development.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-connection.png ../workbench/images/published/wb-table-editor-indexes-tab.png ../workbench/server-administration.xml ../mysql-monitor-2.3/enterprise.ent ../workbench
 /views.xml ../workbench/images/published/wb-add-eer-diagram.png ../workbench/images/published/wb-schema-privileges.png ../workbench/images/published/wb-getting-started-tutorial-admin-review.png ../workbench/metadata/intro.idmap ../workbench/images/published/wb-getting-started-tutorial-admin-home-screen-instance.png ../workbench/metadata/table-editor.idmap ../workbench/images/published/wb-manage-db-connections-ssh-parameters.png ../workbench/metadata/eer-diagram-editor.idmap ../workbench/images/published/wb-forward-engineer-to-database-wizard-select-objects.png ../workbench/images/published/wb-layer.png ../workbench/metadata/preferences.idmap ../workbench/images/published/wb-getting-started-tutorial-eer-diagram.png ../workbench/workbench.ent ../workbench/../refman-common/urls.ent ../workbench/metadata/working-with-models.idmap ../common/product-versions.ent ../workbench/metadata/editions.idmap ../workbench/metadata/reverse-engineering.idmap ../workbench/images/published/wb-ma
 nage-server-connections-tab.png ../workbench/metadata/keys.idmap ../workbench/images/published/wb-sql-editor-results-screenshot.png ../workbench/metadata/tables.idmap ../workbench/images/published/wb-sql-editor-connection-information-palette-screenshot.png ../workbench/images/published/wb-sql-editor-schemata-explorer-screenshot.png ../workbench/metadata/printing.idmap ../workbench/eer-diagram-editor.xml ../workbench/images/published/wb-sql-editor-toolbar-screenshot.png ../workbench/images/published/wb-reverse-engineer-database-wizard-fetch-object-info.png ../workbench/images/published/wb-manage-server-instances-connections.png ../workbench/images/published/wb-getting-started-tutorial-home-screen.png ../workbench/images/published/wb-manage-server-data-import.png ../workbench/images/published/wb-table-eer-view.png ../workbench/images/published/wb-getting-started-tutorial-admin-os.png ../workbench/images/published/wb-sql-editor-live-editing-controls-screenshot.png ../workbench/
 images/published/wb-database-diff-report-wizard-sources.png ../workbench/images/published/wb-sql-editor-results-controls-screenshot.png ../workbench/images/published/wb-getting-started-tutorial-admin-specify-host.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-source.png ../workbench/toolbar.xml ../workbench/metadata/foreign-key-relationships.idmap ../workbench/../common/fixedchars.ent ../workbench/images/published/wb-getting-started-tutorial-new-schema.png ../workbench/images/published/wb-sakila-tutorial.png ../workbench/working-with-models.xml ../workbench/images/published/wb-sql-editor-screenshot.png ../workbench/../common/phrases.ent ../workbench/metadata/server-administration.idmap ../common/phrases.ent ../workbench/images/published/wb-forward-engineer-sql-script-wizard-export-options.png ../workbench/images/published/wb-manage-db-connections-dialog.png ../workbench/menus.xml ../workbench/images/published/wb-getting-started-tutorial-admin
 -instance-name.png ../workbench/images/published/wb-database-synchronize-wizard-diff-direction-model.png ../workbench/images/published/wb-navigator.png ../workbench/images/published/wb-reverse-engineer-database-wizard-select-objects.png ../workbench/images/published/wb-database-diff-report-wizard-report.png ../workbench/images/published/wb-getting-started-tutorial-admin-test-host.png ../workbench/metadata/manage-db-connections.idmap ../workbench/metadata/toolbar.idmap ../workbench/images/published/wb-getting-started-tutorial-edit-table-data.png ../workbench/metadata/model-editor.idmap ../workbench/images/published/wb-manage-db-connections-advanced.png ../workbench/metadata/home.idmap ../workbench/images/published/wb-sql-editor-statements-panel-screenshot.png ../workbench/metadata/data-modeling-tutorial.idmap ../workbench/images/published/wb-mysql-model-page.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-progress.png ../workbench/images.xml ../workbe
 nch/tables.xml ../workbench/images/published/wb-preferences.png ../workbench/notes.xml ../workbench/text-objects.xml ../workbench/images/published/wb-table-editor-overview.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-catalog.png workbench-refman-chapter-aspec.xml ../workbench/reverse-engineering.xml ../common/fixedchars.ent ../workbench/layers.xml ../workbench/images/published/wb-forward-engineer-sql-alter-script-wizard-options.png ../workbench/getting-started-tutorial.xml ../workbench/images/published/wb-getting-started-tutorial-admin-startup.png ../workbench/images/published/wb-installing-mac-install-screen.png ../workbench/images/published/wb-forward-engineer-to-database-wizard-review-script.png ../workbench/images/published/wb-table-editor-columns-tab.png ../workbench/images/published/wb-homepage.png ../workbench/images/published/wb-manage-server-data-options.png ../workbench/images/published/wb-forward-engineer-sql-alter-script-wizard-script.
 png ../workbench/images/published/wb-reverse-engineer-database-wizard-logs.png ../refman-common/urls.ent all-entities.ent ../workbench/images/published/wb-forward-engineer-sql-script-wizard-filter.png ../workbench/metadata/views.idmap ../mysql-monitor-2.3/version.ent ../workbench/images/published/wb-database-synchronize-wizard-diff.png ../workbench/images/published/wb-manage-server-configuration-tab.png ../workbench/images/published/wb-manage-server-startup-tab.png ../workbench/images/published/wb-reverse-engineer-database-wizard-connect-dbms.png ../workbench/dbdoc-templates.xml ../workbench/metadata/images.idmap ../workbench/all-entities.ent ../workbench/metadata/text-objects.idmap ../workbench/data-modeling-tutorial.xml ../workbench/faq.xml ../workbench/data-modeling.xml ../workbench/images/published/wb-sql-editor-actions-screenshot.png ../workbench/metadata/faq.idmap ../workbench/metadata/installing.idmap ../workbench/stored-procedures.xml ../workbench/images/published/wb
 -manage-server-instances-system-profile.png ../workbench/table-editor.xml ../workbench/images/published/wb-manage-server-variables-tab.png ../workbench/images/published/wb-default-schema.png ../workbench/metadata/extending.idmap ../workbench/images/published/wb-roles.png ../workbench/images/published/wb-getting-started-tutorial-review-script.png ../workbench/metadata/tutorial-plugins.idmap ../workbench/metadata/menus.idmap ../workbench/metadata/layers.idmap ../workbench/images/published/wb-reverse-engineer-database-wizard-select-schemata.png
 	$(MAKE) workbench-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.6/Makefile.depends
===================================================================
--- trunk/refman-5.6/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/refman-5.6/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 17, Lines Added: 14, Lines Deleted: 521; 27935 bytes

@@ -2030,31 +2030,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/extending-mysql.idmap \
-	metadata/functions-core.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)

@@ -2168,77 +2144,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 \
-	../refman-common/metadata/mysql-proxy-core.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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.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)

@@ -2352,44 +2258,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-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-source-core.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/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)

@@ -2503,25 +2372,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/dba-user-management-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/information-schema.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)

@@ -2635,12 +2486,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)

@@ -2754,10 +2600,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)

@@ -2871,26 +2714,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/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.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)

@@ -3004,78 +2828,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-pdo-mysql.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-envvar.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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-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/triggers.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)

@@ -3189,42 +2942,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/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)

@@ -3338,26 +3056,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/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)

@@ -3471,20 +3170,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)

@@ -3598,64 +3284,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-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/information-schema.idmap \
-	metadata/installing-source-core.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)

@@ -3769,55 +3398,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-source-core.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)

@@ -3931,91 +3512,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 \
-	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-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-core.idmap \
-	metadata/news-5.6-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)

@@ -7075,7 +6572,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 \

@@ -7088,11 +6584,9 @@
 	../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 \

@@ -7115,7 +6609,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/refman-6.0/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 18, Lines Added: 14, Lines Deleted: 526; 28262 bytes

@@ -2018,31 +2018,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/extending-mysql.idmap \
-	metadata/functions-core.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)

@@ -2154,76 +2130,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 \
-	../refman-common/metadata/mysql-proxy-core.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-general.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.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-falcon-core.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)

@@ -2335,44 +2242,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-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-source-core.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/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)

@@ -2484,25 +2354,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/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-falcon-core.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)

@@ -2614,13 +2466,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)

@@ -2732,10 +2578,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)

@@ -2847,26 +2690,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/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.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)

@@ -2978,78 +2802,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-pdo-mysql.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-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_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)

@@ -3161,42 +2914,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/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)

@@ -3308,26 +3026,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/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)

@@ -3439,20 +3138,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)

@@ -3564,67 +3250,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-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/information-schema.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.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-falcon-core.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-maria-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/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)

@@ -3736,58 +3362,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-source-core.idmap \
-	metadata/installing.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-falcon-core.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)

@@ -3899,89 +3474,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 \
-	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-general.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/licenses-third-party-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)

@@ -6670,7 +6163,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 \

@@ -6683,11 +6175,9 @@
 	../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 \

@@ -6710,7 +6200,6 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-generic-binary.idmap \

@@ -6725,7 +6214,6 @@
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \
 	metadata/licenses-third-party-core.idmap \
-	metadata/news-5.2-core.idmap \
 	metadata/news-6.0-core.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \


Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/workbench/Makefile.depends	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 3529 bytes

@@ -1005,12 +1005,12 @@
 	images/published/wb-manage-db-connections-dialog.png \
 	images/published/wb-manage-db-connections-socket-parameters.png \
 	images/published/wb-manage-db-connections-ssh-parameters.png \
+	images/published/wb-sql-editor-actions-screenshot.png \
 	images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	images/published/wb-sql-editor-results-controls-screenshot.png \
 	images/published/wb-sql-editor-results-screenshot.png \
 	images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	images/published/wb-sql-editor-screenshot.png \
 	images/published/wb-sql-editor-snippets-screenshot.png \
 	images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -1024,12 +1024,12 @@
 	images/published/wb-manage-db-connections-dialog.png \
 	images/published/wb-manage-db-connections-socket-parameters.png \
 	images/published/wb-manage-db-connections-ssh-parameters.png \
+	images/published/wb-sql-editor-actions-screenshot.png \
 	images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	images/published/wb-sql-editor-results-controls-screenshot.png \
 	images/published/wb-sql-editor-results-screenshot.png \
 	images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	images/published/wb-sql-editor-screenshot.png \
 	images/published/wb-sql-editor-snippets-screenshot.png \
 	images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -1376,12 +1376,12 @@
 	images/published/wb-sakila-tutorial.png \
 	images/published/wb-schema-privileges.png \
 	images/published/wb-scripting-shell.png \
+	images/published/wb-sql-editor-actions-screenshot.png \
 	images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	images/published/wb-sql-editor-results-controls-screenshot.png \
 	images/published/wb-sql-editor-results-screenshot.png \
 	images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	images/published/wb-sql-editor-screenshot.png \
 	images/published/wb-sql-editor-snippets-screenshot.png \
 	images/published/wb-sql-editor-statements-panel-screenshot.png \

@@ -1498,12 +1498,12 @@
 	images/published/wb-sakila-tutorial.png \
 	images/published/wb-schema-privileges.png \
 	images/published/wb-scripting-shell.png \
+	images/published/wb-sql-editor-actions-screenshot.png \
 	images/published/wb-sql-editor-connection-information-palette-screenshot.png \
 	images/published/wb-sql-editor-live-editing-controls-screenshot.png \
 	images/published/wb-sql-editor-results-controls-screenshot.png \
 	images/published/wb-sql-editor-results-screenshot.png \
 	images/published/wb-sql-editor-schemata-explorer-screenshot.png \
-	images/published/wb-sql-editor-schemata-listbox-screenshot.png \
 	images/published/wb-sql-editor-screenshot.png \
 	images/published/wb-sql-editor-snippets-screenshot.png \
 	images/published/wb-sql-editor-statements-panel-screenshot.png \


Modified: trunk/workbench/sql-development.xml
===================================================================
--- trunk/workbench/sql-development.xml	2011-03-02 17:37:36 UTC (rev 25223)
+++ trunk/workbench/sql-development.xml	2011-03-02 17:41:16 UTC (rev 25224)
Changed blocks: 3, Lines Added: 87, Lines Deleted: 43; 6118 bytes

@@ -997,57 +997,20 @@
         <title>Object Browser</title>
 
         <para>
-          The Object Browser contains a drop down listbox and a schemata
-          explorer control.
+          The Object Browser contains an actions menu and a schemata
+          list.
         </para>
 
         <para>
-          <emphasis role="bold">Default Schema Listbox</emphasis>
+          <emphasis role="bold">Schemata List</emphasis>
         </para>
 
         <para>
-          The drop down listbox lists the schema that are available on
-          the currently connected server. It is possible to select a
-          schema to become the currently active schema using this
-          facility.
+          The schemata list shows available schemata on the currently
+          connected server. These can be explored to show tables, views
+          and routines within the schema.
         </para>
 
-        <para>
-          This selector executes a <literal>USE
-          <replaceable>DB</replaceable></literal> statement. Once set,
-          subsequent statements without schema qualifiers will be
-          executed against this default schema. Note that this will only
-          be set for the query session. If you wish to set a default
-          schema for multiple &workbench; sessions, you will need to set
-          the default schema for the stored connection. To do this from
-          the Home screen click <guilabel>Manage Connections</guilabel>,
-          then in the <guilabel>Manage DB Connection</guilabel> dialog
-          set the desired default schema on the
-          <guilabel>Parameters</guilabel> tab.
-        </para>
-
-        <figure id="wb-sql-editor-schemata-listbox-screenshot">
-          <title>SQL Editor - Default Schema Listbox</title>
-          <mediaobject>
-            <imageobject>
-              <imagedata contentwidth="202" contentdepth="102" fileref="../workbench/images/published/wb-sql-editor-schemata-listbox-screenshot.png" format="PNG" lang="en"/>
-            </imageobject>
-            <textobject>
-              <phrase lang="en">SQL Editor - Default Schema
-              Listbox</phrase>
-            </textobject>
-          </mediaobject>
-        </figure>
-
-        <para>
-          <emphasis role="bold">Schemata Explorer</emphasis>
-        </para>
-
-        <para>
-          This area enables you to explore the schemata available on the
-          currently connected server.
-        </para>
-
         <figure id="wb-sql-editor-schemata-explorer-screenshot">
           <title>SQL Editor - Schemata Explorer</title>
           <mediaobject>

@@ -1061,6 +1024,22 @@
         </figure>
 
         <para>
+          It is possible to set a schema as the default schema by
+          right-clicking on the schema and selecting the menu item
+          <guimenu>Set As Default Schema</guimenu>. This executes a
+          <literal>USE <replaceable>DB</replaceable></literal>
+          statement. Once set, subsequent statements without schema
+          qualifiers will be executed against this default schema. Note
+          that this will only be set for the query session. If you wish
+          to set a default schema for multiple &workbench; sessions, you
+          will need to set the default schema for the stored connection.
+          To do this from the Home screen click <guilabel>Manage
+          Connections</guilabel>, then in the <guilabel>Manage DB
+          Connection</guilabel> dialog set the desired default schema on
+          the <guilabel>Parameters</guilabel> tab.
+        </para>
+
+        <para>
           A useful feature that was introduced in &workbench; 5.2.9 is
           the ability to rapidly enter the names of columns, tables and
           views into the SQL Statement area. Double-clicking views,

@@ -1228,6 +1207,71 @@
 
         </itemizedlist>
 
+        <para>
+          <emphasis role="bold"> Object Browser Actions </emphasis>
+        </para>
+
+        <para>
+          The Object Browser also contains an Actions area. The actions
+          are:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <guilabel>Execute SQL File</guilabel> - Clicking this
+              action opens a file chooser dialog. You can then select
+              the SQL script you want to execute.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <guilabel>Add Schema</guilabel> - Clicking this action
+              allows you to add a new schema to your server.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <guilabel>Add Table</guilabel> - Clicking this action
+              allows you to create a new table via the
+              <guilabel>new_table</guilabel> dialog.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <guilabel>Add View</guilabel> - Clicking this action
+              allows you to create a new view via the
+              <guilabel>new_view</guilabel> dialog.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <guilabel>Add Routine</guilabel> - Clicking this action
+              allows you to create a new routine via the
+              <guilabel>new_routine</guilabel> dialog.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
+        <figure id="wb-sql-editor-actions-screenshot">
+          <title>SQL Editor - Object Browser Actions</title>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="../workbench/images/published/wb-sql-editor-actions-screenshot.png" format="PNG" lang="en"/>
+            </imageobject>
+            <textobject>
+              <phrase lang="en">SQL Editor - Object Browser
+              Actions</phrase>
+            </textobject>
+          </mediaobject>
+        </figure>
+
       </section>
 
     </section>


Thread
svn commit - mysqldoc@oter02: r25224 - in trunk: refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 workbenchtony.bedford2 Mar