List:Commits« Previous MessageNext Message »
From:martin.brown Date:July 21 2009 12:22pm
Subject:svn commit - mysqldoc@docsrva: r15785 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysql-monitor-common mysqlqb refman-5.0 refman-5.1 refman-5.1-ma...
View as plain text  
Author: mcbrown
Date: 2009-07-21 14:22:55 +0200 (Tue, 21 Jul 2009)
New Revision: 15785

Log:
Updating dependencies


Modified:
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysql-monitor-2.1/Makefile.depends
   trunk/mysql-monitor-common/Makefile.depends
   trunk/mysql-monitor-common/install-unattended-core.xml
   trunk/mysqlqb/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.4/Makefile.depends
   trunk/refman-6.0/Makefile.depends


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 13, Lines Added: 104, Lines Deleted: 18; 11715 bytes

@@ -15,7 +15,7 @@
 	metadata/dashboard-advisors.idmap \
 	metadata/data-items-core.idmap \
 	metadata/dynsel-default-monitor-dashboard-configure.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/install-server.idmap
 dashboard-advisors.validpure: $(dashboard_advisors_SOURCES)
 dashboard-advisors.titles: $(dashboard_advisors_SOURCES)

@@ -69,7 +69,7 @@
 	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/dynsel-default-monitor-dashboard-events.idmap \
 	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/install-server.idmap
 dashboard-overview.validpure: $(dashboard_overview_SOURCES)
 dashboard-overview.titles: $(dashboard_overview_SOURCES)

@@ -171,7 +171,7 @@
 	metadata/deployment.idmap \
 	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/log-files.idmap
 dynsel-default-monitor-dashboard-configure.validpure: $(dynsel_default_monitor_dashboard_configure_SOURCES)

@@ -235,7 +235,7 @@
 	../refman-5.1/metadata/tutorial.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/monitor-faq-core.idmap
 dynsel-default-monitor-dashboard-query-analysis.validpure: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES)
 dynsel-default-monitor-dashboard-query-analysis.titles: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES)

@@ -246,6 +246,53 @@
 dynsel-default-monitor-dashboard-query-analysis-manprepped.xml: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES) $(dynsel_default_monitor_dashboard_query_analysis_IDMAPS)
 dynsel-default-monitor-dashboard-query-analysis-remprepped.xml: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES) $(dynsel_default_monitor_dashboard_query_analysis_IDMAPS)
 
+dynsel_default_monitor_install_agent_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	images/published/agent-install-osx1.png \
+	images/published/agent-install-osx3.png \
+	images/published/agent-install-osx4.png \
+	images/published/agent-install-osx5.png \
+	images/published/agent-install-osx6.png \
+	images/published/agent-install-osx7.png \
+	images/published/agent-install-win1.png \
+	images/published/agent-install-win3.png \
+	images/published/agent-install-win4.png \
+	images/published/agent-install-win5.png \
+	images/published/agent-install-win6.png \
+	version.ent
+dynsel_default_monitor_install_agent_IMAGES = \
+	images/published/agent-install-osx1.png \
+	images/published/agent-install-osx3.png \
+	images/published/agent-install-osx4.png \
+	images/published/agent-install-osx5.png \
+	images/published/agent-install-osx6.png \
+	images/published/agent-install-osx7.png \
+	images/published/agent-install-win1.png \
+	images/published/agent-install-win3.png \
+	images/published/agent-install-win4.png \
+	images/published/agent-install-win5.png \
+	images/published/agent-install-win6.png
+dynsel_default_monitor_install_agent_SOURCES = dynsel-default-monitor-install-agent.xml $(dynsel_default_monitor_install_agent_INCLUDES)
+dynsel_default_monitor_install_agent_IDMAPS = \
+	metadata/dashboard-overview.idmap \
+	metadata/dashboard-replication.idmap \
+	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
+	metadata/dynsel-default-monitor-install-unattended.idmap \
+	metadata/log-files.idmap
+dynsel-default-monitor-install-agent.validpure: $(dynsel_default_monitor_install_agent_SOURCES)
+dynsel-default-monitor-install-agent.titles: $(dynsel_default_monitor_install_agent_SOURCES)
+dynsel-default-monitor-install-agent.useless: $(dynsel_default_monitor_install_agent_SOURCES)
+dynsel-default-monitor-install-agent.valid: $(dynsel_default_monitor_install_agent_SOURCES) $(dynsel_default_monitor_install_agent_IDMAPS)
+dynsel-default-monitor-install-agent.validwarn: $(dynsel_default_monitor_install_agent_SOURCES) $(dynsel_default_monitor_install_agent_IDMAPS)
+dynsel-default-monitor-install-agent-prepped.xml: $(dynsel_default_monitor_install_agent_SOURCES) $(dynsel_default_monitor_install_agent_IDMAPS)
+dynsel-default-monitor-install-agent-manprepped.xml: $(dynsel_default_monitor_install_agent_SOURCES) $(dynsel_default_monitor_install_agent_IDMAPS)
+dynsel-default-monitor-install-agent-remprepped.xml: $(dynsel_default_monitor_install_agent_SOURCES) $(dynsel_default_monitor_install_agent_IDMAPS)
+
 dynsel_default_monitor_install_unattended_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -256,9 +303,8 @@
 dynsel_default_monitor_install_unattended_IMAGES =
 dynsel_default_monitor_install_unattended_SOURCES = dynsel-default-monitor-install-unattended.xml $(dynsel_default_monitor_install_unattended_INCLUDES)
 dynsel_default_monitor_install_unattended_IDMAPS = \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/install-server.idmap \
-	metadata/install-unattended.idmap \
 	metadata/log-files.idmap
 dynsel-default-monitor-install-unattended.validpure: $(dynsel_default_monitor_install_unattended_SOURCES)
 dynsel-default-monitor-install-unattended.titles: $(dynsel_default_monitor_install_unattended_SOURCES)

@@ -280,7 +326,9 @@
 	../refman-common/urls.ent \
 	all-entities.ent \
 	all-entities.ent \
+	dynsel-default-monitor-install-agent.xml \
 	dynsel-default-monitor-install-unattended.xml \
+	dynsel-mem21-monitor-install-upgrades.xml \
 	images/published/agent-install-osx1.png \
 	images/published/agent-install-osx3.png \
 	images/published/agent-install-osx4.png \

@@ -308,11 +356,10 @@
 	images/published/monitor-update-install-4.png \
 	images/published/monitor-update-install-7.png \
 	images/published/monitor-update-install-9.png \
-	install-agent.xml \
 	install-postinstall.xml \
 	install-server.xml \
 	install-uninstall.xml \
-	install-upgrades.xml \
+	install-user-roles.xml \
 	version.ent \
 	version.ent
 dynsel_default_monitor_install_IMAGES = \

@@ -351,12 +398,12 @@
 	metadata/deployment.idmap \
 	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
+	metadata/dynsel-default-monitor-install-unattended.idmap \
+	metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	metadata/install-server.idmap \
-	metadata/install-unattended.idmap \
 	metadata/install-uninstall.idmap \
-	metadata/install-upgrades.idmap \
-	metadata/install.idmap \
+	metadata/install-user-roles.idmap \
 	metadata/log-files.idmap
 dynsel-default-monitor-install.validpure: $(dynsel_default_monitor_install_SOURCES)
 dynsel-default-monitor-install.titles: $(dynsel_default_monitor_install_SOURCES)

@@ -367,6 +414,44 @@
 dynsel-default-monitor-install-manprepped.xml: $(dynsel_default_monitor_install_SOURCES) $(dynsel_default_monitor_install_IDMAPS)
 dynsel-default-monitor-install-remprepped.xml: $(dynsel_default_monitor_install_SOURCES) $(dynsel_default_monitor_install_IDMAPS)
 
+dynsel_mem21_monitor_install_upgrades_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	images/published/monitor-update-install-1.png \
+	images/published/monitor-update-install-3.png \
+	images/published/monitor-update-install-4.png \
+	images/published/monitor-update-install-7.png \
+	images/published/monitor-update-install-9.png \
+	version.ent
+dynsel_mem21_monitor_install_upgrades_IMAGES = \
+	images/published/monitor-update-install-1.png \
+	images/published/monitor-update-install-3.png \
+	images/published/monitor-update-install-4.png \
+	images/published/monitor-update-install-7.png \
+	images/published/monitor-update-install-9.png
+dynsel_mem21_monitor_install_upgrades_SOURCES = dynsel-mem21-monitor-install-upgrades.xml $(dynsel_mem21_monitor_install_upgrades_INCLUDES)
+dynsel_mem21_monitor_install_upgrades_IDMAPS = \
+	metadata/dashboard-advisors.idmap \
+	metadata/deployment.idmap \
+	metadata/dynsel-default-monitor-dashboard-configure.idmap \
+	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
+	metadata/dynsel-default-monitor-install-unattended.idmap \
+	metadata/dynsel-mem21-monitor-install-upgrades.idmap \
+	metadata/install-server.idmap \
+	metadata/install-uninstall.idmap
+dynsel-mem21-monitor-install-upgrades.validpure: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
+dynsel-mem21-monitor-install-upgrades.titles: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
+dynsel-mem21-monitor-install-upgrades.useless: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
+dynsel-mem21-monitor-install-upgrades.valid: $(dynsel_mem21_monitor_install_upgrades_SOURCES) $(dynsel_mem21_monitor_install_upgrades_IDMAPS)
+dynsel-mem21-monitor-install-upgrades.validwarn: $(dynsel_mem21_monitor_install_upgrades_SOURCES) $(dynsel_mem21_monitor_install_upgrades_IDMAPS)
+dynsel-mem21-monitor-install-upgrades-prepped.xml: $(dynsel_mem21_monitor_install_upgrades_SOURCES) $(dynsel_mem21_monitor_install_upgrades_IDMAPS)
+dynsel-mem21-monitor-install-upgrades-manprepped.xml: $(dynsel_mem21_monitor_install_upgrades_SOURCES) $(dynsel_mem21_monitor_install_upgrades_IDMAPS)
+dynsel-mem21-monitor-install-upgrades-remprepped.xml: $(dynsel_mem21_monitor_install_upgrades_SOURCES) $(dynsel_mem21_monitor_install_upgrades_IDMAPS)
+
 dynxml_local_data_items_INCLUDES = \
 	../../mysqldoc/dynamic-docs/mem-data-items/mem-data-items.xml \
 	../common/fixedchars.ent \

@@ -560,8 +645,10 @@
 	dynsel-default-monitor-dashboard-configure.xml \
 	dynsel-default-monitor-dashboard-events.xml \
 	dynsel-default-monitor-dashboard-query-analysis.xml \
+	dynsel-default-monitor-install-agent.xml \
 	dynsel-default-monitor-install-unattended.xml \
 	dynsel-default-monitor-install.xml \
+	dynsel-mem21-monitor-install-upgrades.xml \
 	dynxml-local-data-items.xml \
 	dynxml-local-monitor-faq.xml \
 	dynxml-local-news-monitor.xml \

@@ -603,11 +690,10 @@
 	images/published/replication.png \
 	images/published/server-graphs.png \
 	images/published/usage-advisor-configuration.png \
-	install-agent.xml \
 	install-postinstall.xml \
 	install-server.xml \
 	install-uninstall.xml \
-	install-upgrades.xml \
+	install-user-roles.xml \
 	introduction.xml \
 	legalnotice.en.xml \
 	log-files.xml \

@@ -683,12 +769,12 @@
 	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/dynsel-default-monitor-dashboard-events.idmap \
 	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	metadata/install-agent.idmap \
+	metadata/dynsel-default-monitor-install-agent.idmap \
+	metadata/dynsel-default-monitor-install-unattended.idmap \
+	metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	metadata/install-server.idmap \
-	metadata/install-unattended.idmap \
 	metadata/install-uninstall.idmap \
-	metadata/install-upgrades.idmap \
-	metadata/install.idmap \
+	metadata/install-user-roles.idmap \
 	metadata/log-files.idmap \
 	metadata/monitor-faq-core.idmap
 monitor.validpure: $(monitor_SOURCES)


Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/mysql-monitor-2.1/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 7, Lines Added: 20, Lines Deleted: 21; 7364 bytes

@@ -51,11 +51,11 @@
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
 	metadata/dashboard-whatsnew.idmap
 dynsel-mem21-monitor-dashboard-configure.validpure: $(dynsel_mem21_monitor_dashboard_configure_SOURCES)
 dynsel-mem21-monitor-dashboard-configure.titles: $(dynsel_mem21_monitor_dashboard_configure_SOURCES)

@@ -113,9 +113,9 @@
 	../mysql-monitor-common/images/published/quan-layout2.png
 dynsel_mem21_monitor_dashboard_query_analysis_SOURCES = dynsel-mem21-monitor-dashboard-query-analysis.xml $(dynsel_mem21_monitor_dashboard_query_analysis_INCLUDES)
 dynsel_mem21_monitor_dashboard_query_analysis_IDMAPS = \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../refman-5.1/metadata/tutorial.idmap \

@@ -163,10 +163,10 @@
 dynsel_mem21_monitor_install_agent_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
-	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap
 dynsel-mem21-monitor-install-agent.validpure: $(dynsel_mem21_monitor_install_agent_SOURCES)
 dynsel-mem21-monitor-install-agent.titles: $(dynsel_mem21_monitor_install_agent_SOURCES)
 dynsel-mem21-monitor-install-agent.useless: $(dynsel_mem21_monitor_install_agent_SOURCES)

@@ -186,10 +186,9 @@
 dynsel_mem21_monitor_install_unattended_IMAGES =
 dynsel_mem21_monitor_install_unattended_SOURCES = dynsel-mem21-monitor-install-unattended.xml $(dynsel_mem21_monitor_install_unattended_INCLUDES)
 dynsel_mem21_monitor_install_unattended_IDMAPS = \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
-	../mysql-monitor-2.0/metadata/log-files.idmap
+	../mysql-monitor-2.0/metadata/log-files.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap
 dynsel-mem21-monitor-install-unattended.validpure: $(dynsel_mem21_monitor_install_unattended_SOURCES)
 dynsel-mem21-monitor-install-unattended.titles: $(dynsel_mem21_monitor_install_unattended_SOURCES)
 dynsel-mem21-monitor-install-unattended.useless: $(dynsel_mem21_monitor_install_unattended_SOURCES)

@@ -221,13 +220,13 @@
 dynsel_mem21_monitor_install_upgrades_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap
 dynsel-mem21-monitor-install-upgrades.validpure: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
 dynsel-mem21-monitor-install-upgrades.titles: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
 dynsel-mem21-monitor-install-upgrades.useless: $(dynsel_mem21_monitor_install_upgrades_SOURCES)

@@ -318,15 +317,15 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
-	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap
 dynsel-mem21-monitor-install.validpure: $(dynsel_mem21_monitor_install_SOURCES)
 dynsel-mem21-monitor-install.titles: $(dynsel_mem21_monitor_install_SOURCES)
 dynsel-mem21-monitor-install.useless: $(dynsel_mem21_monitor_install_SOURCES)

@@ -535,17 +534,17 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../refman-5.1/metadata/tutorial.idmap \


Modified: trunk/mysql-monitor-common/Makefile.depends
===================================================================
--- trunk/mysql-monitor-common/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/mysql-monitor-common/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 14, Lines Added: 56, Lines Deleted: 59; 14217 bytes

@@ -29,7 +29,7 @@
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.1/metadata/dashboard-whatsnew.idmap

@@ -92,7 +92,7 @@
 dashboard_query_analysis_core_SOURCES = dashboard-query-analysis-core.xml $(dashboard_query_analysis_core_INCLUDES)
 dashboard_query_analysis_core_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \

@@ -142,8 +142,8 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 dynsel-default-monitor-install-agent.validpure: $(dynsel_default_monitor_install_agent_SOURCES)
 dynsel-default-monitor-install-agent.titles: $(dynsel_default_monitor_install_agent_SOURCES)

@@ -164,9 +164,8 @@
 dynsel_default_monitor_install_unattended_IMAGES =
 dynsel_default_monitor_install_unattended_SOURCES = dynsel-default-monitor-install-unattended.xml $(dynsel_default_monitor_install_unattended_INCLUDES)
 dynsel_default_monitor_install_unattended_IDMAPS = \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 dynsel-default-monitor-install-unattended.validpure: $(dynsel_default_monitor_install_unattended_SOURCES)
 dynsel-default-monitor-install-unattended.titles: $(dynsel_default_monitor_install_unattended_SOURCES)

@@ -212,8 +211,8 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 dynsel-mem21-monitor-install-agent.validpure: $(dynsel_mem21_monitor_install_agent_SOURCES)
 dynsel-mem21-monitor-install-agent.titles: $(dynsel_mem21_monitor_install_agent_SOURCES)

@@ -234,9 +233,8 @@
 dynsel_mem21_monitor_install_unattended_IMAGES =
 dynsel_mem21_monitor_install_unattended_SOURCES = dynsel-mem21-monitor-install-unattended.xml $(dynsel_mem21_monitor_install_unattended_INCLUDES)
 dynsel_mem21_monitor_install_unattended_IDMAPS = \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 dynsel-mem21-monitor-install-unattended.validpure: $(dynsel_mem21_monitor_install_unattended_SOURCES)
 dynsel-mem21-monitor-install-unattended.titles: $(dynsel_mem21_monitor_install_unattended_SOURCES)

@@ -250,32 +248,32 @@
 dynsel_mem21_monitor_install_upgrades_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png \
 	../mysql-monitor-2.1/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	enterprise.ent \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	enterprise.ent
 dynsel_mem21_monitor_install_upgrades_IMAGES = \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png
 dynsel_mem21_monitor_install_upgrades_SOURCES = dynsel-mem21-monitor-install-upgrades.xml $(dynsel_mem21_monitor_install_upgrades_INCLUDES)
 dynsel_mem21_monitor_install_upgrades_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
-	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap
+	../mysql-monitor-2.0/metadata/install-uninstall.idmap
 dynsel-mem21-monitor-install-upgrades.validpure: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
 dynsel-mem21-monitor-install-upgrades.titles: $(dynsel_mem21_monitor_install_upgrades_SOURCES)
 dynsel-mem21-monitor-install-upgrades.useless: $(dynsel_mem21_monitor_install_upgrades_SOURCES)

@@ -320,8 +318,8 @@
 	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 install-agent-core.validpure: $(install_agent_core_SOURCES)
 install-agent-core.titles: $(install_agent_core_SOURCES)

@@ -360,6 +358,11 @@
 	../mysql-monitor-2.0/images/published/monitor-install-win3.png \
 	../mysql-monitor-2.0/images/published/monitor-install-win4.png \
 	../mysql-monitor-2.0/images/published/monitor-install-win5.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \

@@ -375,12 +378,7 @@
 	dynsel-mem21-monitor-install-unattended.xml \
 	dynsel-mem21-monitor-install-upgrades.xml \
 	enterprise.ent \
-	enterprise.ent \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	enterprise.ent
 install_core_IMAGES = \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -404,11 +402,11 @@
 	../mysql-monitor-2.0/images/published/monitor-install-win3.png \
 	../mysql-monitor-2.0/images/published/monitor-install-win4.png \
 	../mysql-monitor-2.0/images/published/monitor-install-win5.png \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png
 install_core_SOURCES = install-core.xml $(install_core_INCLUDES)
 install_core_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \

@@ -417,12 +415,12 @@
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 install-core.validpure: $(install_core_SOURCES)
 install-core.titles: $(install_core_SOURCES)

@@ -443,9 +441,8 @@
 install_unattended_core_IMAGES =
 install_unattended_core_SOURCES = install-unattended-core.xml $(install_unattended_core_INCLUDES)
 install_unattended_core_IDMAPS = \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap
 install-unattended-core.validpure: $(install_unattended_core_SOURCES)
 install-unattended-core.titles: $(install_unattended_core_SOURCES)

@@ -459,32 +456,32 @@
 install_upgrades_core_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png \
 	../mysql-monitor-2.1/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	enterprise.ent \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	enterprise.ent
 install_upgrades_core_IMAGES = \
-	images/published/monitor-update-install-1.png \
-	images/published/monitor-update-install-3.png \
-	images/published/monitor-update-install-4.png \
-	images/published/monitor-update-install-7.png \
-	images/published/monitor-update-install-9.png
+	../mysql-monitor-2.0/images/published/monitor-update-install-1.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-3.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-4.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-7.png \
+	../mysql-monitor-2.0/images/published/monitor-update-install-9.png
 install_upgrades_core_SOURCES = install-upgrades-core.xml $(install_upgrades_core_INCLUDES)
 install_upgrades_core_IDMAPS = \
 	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-2.0/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
-	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap
+	../mysql-monitor-2.0/metadata/install-uninstall.idmap
 install-upgrades-core.validpure: $(install_upgrades_core_SOURCES)
 install-upgrades-core.titles: $(install_upgrades_core_SOURCES)
 install-upgrades-core.useless: $(install_upgrades_core_SOURCES)


Modified: trunk/mysql-monitor-common/install-unattended-core.xml
===================================================================
--- trunk/mysql-monitor-common/install-unattended-core.xml	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/mysql-monitor-common/install-unattended-core.xml	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 811 bytes

@@ -391,8 +391,7 @@
         To view all the options available for an unattended
         <emphasis>agent</emphasis> installation, invoke the agent
         installer file passing in the <option>help</option> option.
-        (Under Windows you must redirect the output to a file as shown
-        in <xref linkend="mem-command-line-options-monitoring"/>). You
+        (Under Windows you must redirect the output to a file. You
         should see a listing similar to the following:
       </para>
 


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/mysqlqb/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 2; 923 bytes

@@ -37,7 +37,6 @@
 	../refman-5.0/metadata/dba.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/extending-mysql.idmap \
-	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
 	../refman-5.0/metadata/internationalization.idmap \

@@ -80,7 +79,7 @@
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	metadata/mysqlqb_functions.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/refman-5.0/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 12, Lines Added: 59, Lines Deleted: 17; 23617 bytes

@@ -2542,11 +2542,16 @@
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -2589,22 +2594,28 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -2620,6 +2631,7 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \
 	../refman-common/apis-eiffel.xml \

@@ -2805,6 +2817,8 @@
 	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	../refman-common/what-is.en.xml \
 	all-entities.ent \
 	apis-c.xml \

@@ -3172,17 +3186,17 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../ndbapi/metadata/getting-started.idmap \
 	../ndbapi/metadata/mgm-api.idmap \
 	../ndbapi/metadata/ndb-errors.idmap \

@@ -3336,9 +3350,14 @@
 monitor_refman_chapter_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3381,21 +3400,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3411,8 +3436,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -3520,9 +3548,14 @@
 monitor_refman_chapter_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3565,21 +3598,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3595,8 +3634,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -5585,7 +5627,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-gra!
 phs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-2.0/install-unattended.xml ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/images/published/monitor-install-osx4.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-2.0/install-upgrades.xml ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-2.0/metadata/install-unattended.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/metadata/install-agent.idmap ../mysql-monitor-2.0/metadata/install.idmap ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png !
 ../mysql-monitor-2.0/images/published/agent-install-win4.png .!
 ./mysql-
monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/monitor-install-win3.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/images/published!
 /replication.png ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/images/published/mem-settings-notification.png monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-2.0/metadata/dashboard-advis!
 ors.idmap ../mysql-monitor-2.0/metadata/install-upgrades.idmap!
  ../mysq
l-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-2.0/install-server.xml monitor-refman-chapter-base.!
 xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-2.0/install.xml ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/publ!
 ished/agent-install-osx4.png
+monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monito!
 r-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/../mysql-monitor-2.0/all-entities.ent ../!
 mysql-monitor-2.0/images/published/monitor-install-osx4.png ..!
 /mysql-m
onitor-common/metadata/dynsel-mem21-monitor-install-agent.idmap versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-commo!
 n/../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-unattended.idmap ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/publi!
 shed/monitor-install-win3.png ../mysql-monitor-2.0/images/publ!
 ished/re
plication.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/all-entities.ent ../mysql-monitor-common/images/published/mem-settings-notification.png monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-common/metadata/d!
 ynsel-default-monitor-install-agent.idmap ../mysql-monitor-common/../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-common/dynsel-default-monitor-install-agent.xml ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../!
 mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/u!
 rls.ent 
all-entities.ent ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/install-server.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-!
 migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/refman-5.1/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 12, Lines Added: 59, Lines Deleted: 17; 23846 bytes

@@ -3051,12 +3051,17 @@
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3099,22 +3104,28 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3130,6 +3141,7 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \
 	../refman-common/apis-eiffel.xml \

@@ -3350,6 +3362,8 @@
 	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	../refman-common/what-is.en.xml \
 	all-entities.ent \
 	apis-c.xml \

@@ -3754,18 +3768,18 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/introduction.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../ndbapi/metadata/class-dictionary.idmap \
 	../ndbapi/metadata/class-ndb-cluster-connection.idmap \
 	../ndbapi/metadata/class-ndb.idmap \

@@ -3932,10 +3946,15 @@
 monitor_refman_chapter_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3978,21 +3997,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -4008,8 +4033,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -4117,10 +4145,15 @@
 monitor_refman_chapter_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -4163,21 +4196,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -4193,8 +4232,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -6387,7 +6429,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-gra!
 phs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/install-unattended.xml ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/images/published/monitor-install-osx4.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-2.0/install-upgrades.xml ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-2.0/metadata/install-unattended.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/metadata/install-agent.idmap ../mysql-monitor-2.0/metadata/install.idmap ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/image!
 s/published/quan-layout2.png ../mysql-monitor-2.0/images/publi!
 shed/age
nt-install-win4.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/monitor-install-win3.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql!
 -monitor-2.0/images/published/replication.png ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-2.0/images/published/monitor-install-osx5.png monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor!
 -2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-2.0/me!
 tadata/i
nstall-upgrades.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-2.0/install-server.xml!
  monitor-refman-chapter-base.xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-2.0/install.xml ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../!
 mysql-monitor-2.0/images/published/agent-install-osx4.png
+monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monito!
 r-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx1.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/../mysql-mon!
 itor-2.0/all-entities.ent ../mysql-monitor-2.0/images/publishe!
 d/monito
r-install-osx4.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-agent.idmap versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-use!
 rs.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-unattended.idmap ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../m!
 ysql-monitor-2.0/images/published/monitor-install-win3.png ../!
 mysql-mo
nitor-2.0/images/published/replication.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../my!
 sql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap ../mysql-monitor-common/../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-common/dynsel-default-monitor-install-agent.xml ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/publ!
 ished/mem-quan-config.png ../mysql-monitor-2.0/metadata/deploy!
 ment.idm
ap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/install-server.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-!
 2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 12, Lines Added: 59, Lines Deleted: 17; 23870 bytes

@@ -405,15 +405,20 @@
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -456,24 +461,30 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -489,6 +500,7 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-5.1/all-entities.ent \
 	../refman-5.1/apis-c.xml \
 	../refman-5.1/apis-libmysqld.xml \

@@ -792,6 +804,8 @@
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	../refman-common/what-is.en.xml \
 	all-entities.ent \
 	dynxml-common-news-cj.xml \

@@ -1045,18 +1059,18 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/introduction.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../ndbapi/metadata/class-ndboperation.idmap \
 	../ndbapi/metadata/class-ndbtransaction.idmap \
 	../ndbapi/metadata/class-table.idmap \

@@ -1212,9 +1226,14 @@
 monitor_refman_chapter_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -1257,21 +1276,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -1287,8 +1312,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -1396,9 +1424,14 @@
 monitor_refman_chapter_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -1441,21 +1474,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -1471,8 +1510,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -1830,7 +1872,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-gra!
 phs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-2.0/install-unattended.xml ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/images/published/monitor-install-osx4.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-2.0/install-upgrades.xml ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-2.0/metadata/install-unattended.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/metadata/install-agent.idmap ../mysql-monitor-2.0/metadata/install.idmap ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png !
 ../mysql-monitor-2.0/images/published/agent-install-win4.png .!
 ./mysql-
monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/monitor-install-win3.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/images/published!
 /replication.png ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/images/published/mem-settings-notification.png monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-2.0/metadata/dashboard-advis!
 ors.idmap ../mysql-monitor-2.0/metadata/install-upgrades.idmap!
  ../mysq
l-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-2.0/install-server.xml monitor-refman-chapter-base.!
 xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-2.0/install.xml ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/publ!
 ished/agent-install-osx4.png
+monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monito!
 r-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/../mysql-monitor-2.0/all-entities.ent ../!
 mysql-monitor-2.0/images/published/monitor-install-osx4.png ..!
 /mysql-m
onitor-common/metadata/dynsel-mem21-monitor-install-agent.idmap versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-commo!
 n/../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-unattended.idmap ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/publi!
 shed/monitor-install-win3.png ../mysql-monitor-2.0/images/publ!
 ished/re
plication.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/all-entities.ent ../mysql-monitor-common/images/published/mem-settings-notification.png monitor-refman-chapter-aspec.xml ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-common/metadata/d!
 ynsel-default-monitor-install-agent.idmap ../mysql-monitor-common/../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-common/dynsel-default-monitor-install-agent.xml ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../!
 mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/u!
 rls.ent 
all-entities.ent ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/install-server.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-!
 migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-5.4/Makefile.depends
===================================================================
--- trunk/refman-5.4/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/refman-5.4/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 17, Lines Added: 65, Lines Deleted: 39; 27888 bytes

@@ -1783,13 +1783,16 @@
 dynxml_local_news_5_4_SOURCES = dynxml-local-news-5.4.xml $(dynxml_local_news_5_4_INCLUDES)
 dynxml_local_news_5_4_IDMAPS = \
 	metadata/apis-c.idmap \
+	metadata/dba-mysqld-server-core.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing-core.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-using.idmap \
+	metadata/replication-options-core.idmap \
 	metadata/sql-syntax-compound-statements.idmap \
 	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
 	metadata/sql-syntax-transactions.idmap
 dynxml-local-news-5.4.validpure: $(dynxml_local_news_5_4_SOURCES)
 dynxml-local-news-5.4.titles: $(dynxml_local_news_5_4_SOURCES)

@@ -2359,21 +2362,8 @@
 	../refman-common/images/published/active-master-mysql-server.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/overview.idmap \
-	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
-	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
-	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
-	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
-	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-	../refman-5.1/metadata/mysql-cluster-news-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/faqs.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
-	../refman-5.1/metadata/mysql-cluster-security.idmap \
-	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-6.0/metadata/manual.idmap \
 	../refman-common/metadata/apis-php.idmap \

@@ -2399,7 +2389,6 @@
 	metadata/replication-notes.idmap \
 	metadata/se-archive-core.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 \

@@ -2687,12 +2676,17 @@
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -2735,22 +2729,28 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -2766,6 +2766,7 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \
 	../refman-common/apis-eiffel.xml \

@@ -2968,6 +2969,8 @@
 	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	../refman-common/what-is.en.xml \
 	all-entities.ent \
 	apis-c.xml \

@@ -3336,40 +3339,35 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
-	../ndbapi/metadata/ndb-internals.idmap \
-	../ndbapi/metadata/overview.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/faqs.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
-	../refman-5.1/metadata/mysql-cluster-interconnects.idmap \
 	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
 	../refman-5.1/metadata/mysql-cluster-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-	../refman-5.1/metadata/mysql-cluster-news-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-overview.idmap \
 	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
-	../refman-5.1/metadata/mysql-cluster-security.idmap \
-	../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-6.0/metadata/introduction.idmap \

@@ -3499,10 +3497,15 @@
 monitor_refman_chapter_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3545,21 +3548,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3575,8 +3584,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -3684,10 +3696,15 @@
 monitor_refman_chapter_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3730,21 +3747,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3760,8 +3783,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -4304,7 +4330,6 @@
 	../refman-5.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
 	metadata/apis-c.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \

@@ -4999,6 +5024,7 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/functions-core.idmap \
 	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
 	metadata/replication-options-core.idmap \
 	metadata/sql-syntax-replication.idmap \
 	metadata/sql-syntax-server-administration.idmap

@@ -5359,7 +5385,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-gra!
 phs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/install-unattended.xml ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/images/published/monitor-install-osx4.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-2.0/install-upgrades.xml ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-2.0/metadata/install-unattended.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/metadata/install-agent.idmap ../mysql-monitor-2.0/metadata/install.idmap ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/image!
 s/published/quan-layout2.png ../mysql-monitor-2.0/images/publi!
 shed/age
nt-install-win4.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/monitor-install-win3.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql!
 -monitor-2.0/images/published/replication.png ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-2.0/images/published/monitor-install-osx5.png monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor!
 -2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-2.0/me!
 tadata/i
nstall-upgrades.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-2.0/install-server.xml!
  monitor-refman-chapter-base.xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-2.0/install.xml ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../!
 mysql-monitor-2.0/images/published/agent-install-osx4.png
+monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monito!
 r-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx1.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/../mysql-mon!
 itor-2.0/all-entities.ent ../mysql-monitor-2.0/images/publishe!
 d/monito
r-install-osx4.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-agent.idmap versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-use!
 rs.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-unattended.idmap ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../m!
 ysql-monitor-2.0/images/published/monitor-install-win3.png ../!
 mysql-mo
nitor-2.0/images/published/replication.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../my!
 sql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap ../mysql-monitor-common/../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-common/dynsel-default-monitor-install-agent.xml ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/publ!
 ished/mem-quan-config.png ../mysql-monitor-2.0/metadata/deploy!
 ment.idm
ap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/install-server.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-!
 2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-07-21 12:17:31 UTC (rev 15784)
+++ trunk/refman-6.0/Makefile.depends	2009-07-21 12:22:55 UTC (rev 15785)
Changed blocks: 12, Lines Added: 59, Lines Deleted: 17; 23801 bytes

@@ -2697,12 +2697,17 @@
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -2745,22 +2750,28 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -2776,6 +2787,7 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \
 	../refman-common/apis-eiffel.xml \

@@ -2990,6 +3002,8 @@
 	../refman-common/news-vstudioplugin-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	../refman-common/what-is.en.xml \
 	all-entities.ent \
 	apis-c.xml \

@@ -3373,17 +3387,17 @@
 	../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
 	../mysql-monitor-2.0/metadata/data-items-core.idmap \
 	../mysql-monitor-2.0/metadata/deployment.idmap \
-	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
-	../mysql-monitor-2.0/metadata/install-unattended.idmap \
 	../mysql-monitor-2.0/metadata/install-uninstall.idmap \
-	../mysql-monitor-2.0/metadata/install-upgrades.idmap \
-	../mysql-monitor-2.0/metadata/install.idmap \
+	../mysql-monitor-2.0/metadata/install-user-roles.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap \
+	../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap \
+	../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap \
 	../query-browser/metadata/query-browser.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \

@@ -3525,10 +3539,15 @@
 monitor_refman_chapter_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3571,21 +3590,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3601,8 +3626,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -3710,10 +3738,15 @@
 monitor_refman_chapter_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
+	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \
 	../mysql-monitor-2.0/dashboard-overview.xml \

@@ -3756,21 +3789,27 @@
 	../mysql-monitor-2.0/images/published/replication.png \
 	../mysql-monitor-2.0/images/published/server-graphs.png \
 	../mysql-monitor-2.0/images/published/usage-advisor-configuration.png \
-	../mysql-monitor-2.0/install-agent.xml \
 	../mysql-monitor-2.0/install-postinstall.xml \
 	../mysql-monitor-2.0/install-server.xml \
-	../mysql-monitor-2.0/install-unattended.xml \
 	../mysql-monitor-2.0/install-uninstall.xml \
-	../mysql-monitor-2.0/install-upgrades.xml \
-	../mysql-monitor-2.0/install.xml \
+	../mysql-monitor-2.0/install-user-roles.xml \
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/version.ent \
+	../mysql-monitor-common/all-entities.ent \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/dashboard-events-core.xml \
 	../mysql-monitor-common/dashboard-query-analysis-core.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml \
+	../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
+	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \
 	../mysql-monitor-common/images/published/mem-quan-config.png \
 	../mysql-monitor-common/images/published/mem-quan-item-example.png \

@@ -3786,8 +3825,11 @@
 	../mysql-monitor-common/images/published/quan-layout1.png \
 	../mysql-monitor-common/images/published/quan-layout2.png \
 	../mysql-monitor-common/images/published/server-rename.png \
+	../mysql-monitor-common/install-core.xml \
 	../refman-common/urls.ent \
 	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
 	all-entities.ent \
 	monitor-refman-chapter-aspec.xml \
 	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \

@@ -5464,7 +5506,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-gra!
 phs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/install-unattended.xml ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/images/published/monitor-install-osx4.png versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-2.0/install-upgrades.xml ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-2.0/metadata/install-unattended.idmap ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-2.0/metadata/install-agent.idmap ../mysql-monitor-2.0/metadata/install.idmap ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/image!
 s/published/quan-layout2.png ../mysql-monitor-2.0/images/publi!
 shed/age
nt-install-win4.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-users.png ../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../mysql-monitor-2.0/images/published/monitor-install-win3.png ../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql!
 -monitor-2.0/images/published/replication.png ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-2.0/images/published/monitor-install-osx5.png monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor!
 -2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-2.0/me!
 tadata/i
nstall-upgrades.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/published/mem-quan-config.png ../mysql-monitor-2.0/metadata/deployment.idmap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-2.0/install-server.xml!
  monitor-refman-chapter-base.xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-2.0/install.xml ../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../!
 mysql-monitor-2.0/images/published/agent-install-osx4.png
+monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-common/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/first-dashboard-login.png ../mysql-monitor-common/../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/dashboard-events-core.xml ../mysql-monitor-2.0/images/published/monito!
 r-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.xml ../mysql-monitor-2.0/images/published/heat-chart-legend.png ../mysql-monitor-common/dynsel-mem21-monitor-install-upgrades.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-9.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx1.png ../gui-common/gui-common.ent ../mysql-monitor-2.0/images/published/monitor-install-osx1.png ../mysql-monitor-2.0/images/published/email-settings.png ../mysql-monitor-2.0/metadata/install-uninstall.idmap ../mysql-monitor-common/install-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win6.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx6.png ../mysql-monitor-common/../mysql-mon!
 itor-2.0/all-entities.ent ../mysql-monitor-2.0/images/publishe!
 d/monito
r-install-osx4.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-agent.idmap versions.ent ../common/phrases.ent ../mysql-monitor-common/metadata/dashboard-events-core.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx7.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.1/version.ent ../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/images/published/quan-layout1.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx4.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-common/images/published/mem-settings-user.png ../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap ../mysql-monitor-common/images/published/quan-layout2.png ../mysql-monitor-common/metadata/dashboard-configure-core.idmap ../mysql-monitor-common/images/published/mem-settings-use!
 rs.png ../mysql-monitor-common/../mysql-monitor-2.0/../common/phrases.ent ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-1.png ../mysql-monitor-2.0/install-uninstall.xml ../mysql-monitor-2.0/../mysql-monitor-common/enterprise.ent ../mysql-monitor-2.0/metadata/dashboard-overview.idmap ../mysql-monitor-2.0/images/published/monitor-install-osx2.png ../mysql-monitor-2.0/dashboard-advisors.xml ../mysql-monitor-2.0/metadata/monitor-faq-core.idmap ../mysql-monitor-common/dashboard-query-analysis-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/monitor-update-install-3.png ../mysql-monitor-common/images/published/mem-quan-main.png ../mysql-monitor-common/dynsel-mem21-monitor-install-unattended.xml ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-unattended.idmap ../mysql-monitor-2.0/all-entities.ent ../mysql-monitor-2.0/metadata/dashboard-graphs.idmap ../mysql-monitor-2.0/images/published/mem-overview.png ../m!
 ysql-monitor-2.0/images/published/monitor-install-win3.png ../!
 mysql-mo
nitor-2.0/images/published/replication.png ../mysql-monitor-common/metadata/dynsel-mem21-monitor-install-upgrades.idmap ../mysql-monitor-2.0/images/published/monitor-migration-check.png ../mysql-monitor-2.0/dashboard-replication.xml ../mysql-monitor-2.0/monitor-faq-core.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win3.png ../mysql-monitor-2.0/images/published/monitor-install-osx5.png ../mysql-monitor-common/all-entities.ent monitor-refman-chapter-aspec.xml ../mysql-monitor-common/images/published/mem-settings-notification.png ../mysql-monitor-2.0/images/published/advisors-edit.png ../mysql-monitor-2.0/images/published/usage-advisor-configuration.png ../mysql-monitor-2.0/../refman-common/urls.ent ../mysql-monitor-common/enterprise.ent ../common/fixedchars.ent ../mysql-monitor-common/images/published/mem-settings-logs.png ../mysql-monitor-common/dashboard-configure-core.xml ../mysql-monitor-2.0/images/published/monitor-install-win4.png ../my!
 sql-monitor-common/metadata/dynsel-default-monitor-install-agent.idmap ../mysql-monitor-common/../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/metadata/dashboard-replication.idmap ../mysql-monitor-2.0/images/published/monitor-install-win5.png ../mysql-monitor-common/../common/phrases.ent ../mysql-monitor-2.0/metadata/dashboard-advisors.idmap ../mysql-monitor-common/images/published/mem-settings-global.png ../mysql-monitor-common/../refman-common/urls.ent ../mysql-monitor-common/images/published/events-screen.png ../mysql-monitor-common/dynsel-default-monitor-install-agent.xml ../mysql-monitor-common/images/published/mem-quan-item-explain.png ../mysql-monitor-common/images/published/mem-settings-servers.png ../mysql-monitor-2.0/install-postinstall.xml ../mysql-monitor-common/dynsel-mem21-monitor-install-agent.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx3.png ../mysql-monitor-2.0/introduction.xml ../mysql-monitor-common/images/publ!
 ished/mem-quan-config.png ../mysql-monitor-2.0/metadata/deploy!
 ment.idm
ap ../refman-common/urls.ent all-entities.ent ../mysql-monitor-common/images/published/server-rename.png ../mysql-monitor-common/images/published/mem-quan-item-example.png ../mysql-monitor-common/dynsel-default-monitor-install-unattended.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/install-server.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win5.png ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win4.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-common/../mysql-monitor-2.0/install-user-roles.xml ../mysql-monitor-2.0/images/published/monitor-install-osx6.png ../mysql-monitor-common/images/published/mem-quan-item-summary.png ../mysql-monitor-2.0/images/published/server-graphs.png ../mysql-monitor-common/metadata/install-core.idmap ../mysql-monitor-2.0/metadata/install-server.idmap ../mysql-monitor-!
 2.0/images/published/monitor-migration-progress.png ../mysql-monitor-2.0/images/published/heat-chart.png ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-win1.png ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-common/../mysql-monitor-2.0/images/published/agent-install-osx5.png ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/metadata/dynsel-default-monitor-install-unattended.idmap ../mysql-monitor-2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Thread
svn commit - mysqldoc@docsrva: r15785 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysql-monitor-common mysqlqb refman-5.0 refman-5.1 refman-5.1-ma...martin.brown21 Jul