List:Commits« Previous MessageNext Message »
From:jon.stephens Date:November 18 2010 12:13am
Subject:svn commit - mysqldoc@docsrva: r23820 - in trunk: . mysql-monitor-2.0 mysql-monitor-2.1 refman-5.1
View as plain text  
Author: jstephens
Date: 2010-11-18 01:13:00 +0100 (Thu, 18 Nov 2010)
New Revision: 23820

Log:

Uncommented pointers to MCM-1.1 docs in Cluster Overview

Fixed Makefiles

Rebuilt dependencies



Modified:
   trunk/Makefile
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysql-monitor-2.1/Makefile.depends
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/mysql-cluster-overview.xml


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/Makefile	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 329 bytes

@@ -10,7 +10,7 @@
 
 SUBDIRS = \
 	common \
-	cluster-manager-1.0 \
+	cluster-manager-1.1 \
 	falcon \
 	internals \
 	innodb-plugin-1.0 \


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 4; 1654 bytes

@@ -451,7 +451,6 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
-	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \

@@ -483,7 +482,6 @@
 dynxml_local_licenses_third_party_IMAGES =
 dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
 dynxml_local_licenses_third_party_IDMAPS = \
-	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \

@@ -673,7 +671,6 @@
 	../common/fixedchars.ent \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
-	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \

@@ -870,7 +867,6 @@
 	images/published/usage-advisor-configuration.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
-	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \


Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/mysql-monitor-2.1/Makefile.depends	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 4, Lines Added: 0, Lines Deleted: 4; 1640 bytes

@@ -458,7 +458,6 @@
 	../../mysqldoc/dynamic-docs/licenses/products.xml \
 	../common/all-entities.ent \
 	../common/fixedchars.ent \
-	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \

@@ -492,7 +491,6 @@
 dynxml_local_licenses_third_party_IMAGES =
 dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
 dynxml_local_licenses_third_party_IDMAPS = \
-	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \

@@ -666,7 +664,6 @@
 	../common/fixedchars.ent \
 	../common/gpl-notice.en.xml \
 	../common/legalnotice-misc-refman.en.xml \
-	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \

@@ -877,7 +874,6 @@
 	images/published/server-rename.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
-	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/refman-5.1/Makefile	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 522 bytes

@@ -35,7 +35,8 @@
 		$(REPO_ROOT)/mysql-monitor-2.1 \
 		$(REPO_ROOT)/mysql-monitor-2.0 \
 		$(REPO_ROOT)/innodb-plugin-1.0 \
-		$(REPO_ROOT)/innodb-plugin-1.1
+		$(REPO_ROOT)/innodb-plugin-1.1 \
+		$(REPO_ROOT)/cluster-manager-1.1
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/refman-5.1/Makefile.depends	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 20, Lines Added: 17, Lines Deleted: 568; 31105 bytes

@@ -2114,30 +2114,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)

@@ -2261,90 +2238,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-generic-binary.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/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/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)

@@ -2468,44 +2362,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-postinstall.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)

@@ -2629,25 +2486,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)

@@ -2771,13 +2610,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)

@@ -2901,11 +2734,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)

@@ -3029,27 +2858,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-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -3173,88 +2982,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-connection-options.idmap \
-	../refman-common/metadata/connector-net-tutorials-mysqlscript.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/help-metadata.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/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/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication-solutions.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-db2-core.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -3378,43 +3106,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)

@@ -3538,26 +3230,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)

@@ -3681,21 +3354,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)

@@ -3819,70 +3478,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-postinstall.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)

@@ -4006,58 +3602,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-generic-binary.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)

@@ -4181,101 +3726,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-net-core.idmap \
-	../refman-common/metadata/connector-net-support.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-envvar.idmap \
-	metadata/installing-general.idmap \
-	metadata/installing-generic-binary.idmap \
-	metadata/installing-i5os.idmap \
-	metadata/installing-linux.idmap \
-	metadata/installing-macosx.idmap \
-	metadata/installing-perl.idmap \
-	metadata/installing-postinstall.idmap \
-	metadata/installing-solaris.idmap \
-	metadata/installing-source-core.idmap \
-	metadata/installing.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-news-core.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-replication-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news-5.1-core.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/precision-math.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-compound-statements.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -7480,6 +6931,7 @@
 	images/published/install-osx-startup-5.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
+	../cluster-manager-1.1/metadata/cluster-manager.idmap \
 	../common/metadata/license-ant-contrib.idmap \
 	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \

@@ -7600,7 +7052,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 \

@@ -7613,15 +7064,12 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
-	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \
 	../refman-common/metadata/news-codbc-core.idmap \
-	../refman-common/metadata/news-innodb.idmap \
 	../refman-common/metadata/what-is.en.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-libmysqld.idmap \

@@ -7640,7 +7088,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 \

@@ -8297,6 +7744,7 @@
 	../refman-common/images/published/replicas-groups-1-2.png
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml $(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
+	../cluster-manager-1.1/metadata/cluster-manager.idmap \
 	../ndbapi/metadata/mccj-overview.idmap \
 	../ndbapi/metadata/mccj-using.idmap \
 	../ndbapi/metadata/mccj.idmap \

@@ -8443,6 +7891,7 @@
 	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
+	../cluster-manager-1.1/metadata/cluster-manager.idmap \
 	../ndbapi/metadata/mccj-overview.idmap \
 	../ndbapi/metadata/mccj-using.idmap \
 	../ndbapi/metadata/mccj.idmap \


Modified: trunk/refman-5.1/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-overview.xml	2010-11-18 00:12:27 UTC (rev 23819)
+++ trunk/refman-5.1/mysql-cluster-overview.xml	2010-11-18 00:13:00 UTC (rev 23820)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 14; 2293 bytes

@@ -465,7 +465,6 @@
 
     </formalpara>
 
-<!--
     <para>
       Oracle also makes available &mcm;, which provides an advanced
       command-line interface simplifying many complex MySQL Cluster

@@ -474,10 +473,9 @@
       getting and setting the values of most node configuration
       parameters as well as <command>mysqld</command> server options and
       variables relating to MySQL Cluster. &mcm; 1.1 provides support
-      for adding data nodes online. See <xref linkend="mcm-1.1"/>, for
-      more information.
+      for adding data nodes online. See <xref linkend="mcm"/>, for more
+      information.
     </para>
--->
 
 <!--
     <para>

@@ -1833,15 +1831,13 @@
 
       </itemizedlist>
 
-<!--
       <para>
         MySQL Cluster NDB 7.1 (actually, MySQL Cluster NDB 6.3 and
         later) is also supported by &mcm;, which provides an advanced
         command-line interface that can simplify many complex MySQL
-        Cluster management tasks. See <xref linkend="mcm-1.1"/>, for
-        more information.
+        Cluster management tasks. See <xref linkend="mcm"/>, for more
+        information.
       </para>
--->
 
     </section>
 

@@ -2725,15 +2721,13 @@
 
       </itemizedlist>
 
-<!--
       <para>
         MySQL Cluster NDB 6.3, MySQL Cluster NDB 6.3, and later are also
         supported by &mcm;, which provides an advanced command-line
         interface that can simplify many complex MySQL Cluster
-        management tasks. See <xref linkend="mcm-1.1"/>, for more
+        management tasks. See <xref linkend="mcm"/>, for more
         information.
       </para>
--->
 
     </section>
 

@@ -3626,14 +3620,12 @@
         </itemizedlist>
       </para>
 
-<!--
       <para>
         MySQL Cluster NDB 6.3 and later is also supported by &mcm;,
         which provides an advanced command-line interface that can
         simplify many complex MySQL Cluster management tasks. See
-        <xref linkend="mcm-1.1"/>, for more information.
+        <xref linkend="mcm"/>, for more information.
       </para>
--->
 
     </section>
 


Thread
svn commit - mysqldoc@docsrva: r23820 - in trunk: . mysql-monitor-2.0 mysql-monitor-2.1 refman-5.1jon.stephens18 Nov