List:Commits« Previous MessageNext Message »
From:martin.brown Date:June 25 2009 12:11pm
Subject:svn commit - mysqldoc@docsrva: r15433 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysql-monitor-common mysqlqb quick-guides refman-4.1 refman-5.0 ...
View as plain text  
Author: mcbrown
Date: 2009-06-25 14:11:47 +0200 (Thu, 25 Jun 2009)
New Revision: 15433

Log:
Dependency update



Modified:
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysql-monitor-2.1/Makefile.depends
   trunk/mysql-monitor-common/dashboard-configure-core.xml
   trunk/mysqlqb/Makefile.depends
   trunk/quick-guides/Makefile.depends
   trunk/refman-4.1/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
   trunk/refman-common/Makefile.depends
   trunk/topic-guides/topics-5.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile.depends
   trunk/topic-guides/topics-5.4/Makefile.depends
   trunk/topic-guides/topics-6.0/Makefile.depends
   trunk/topic-guides/topics-common/Makefile.depends
   trunk/workbench/Makefile.depends


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 19, Lines Added: 29, Lines Deleted: 30; 11141 bytes

@@ -12,9 +12,9 @@
 	images/published/usage-advisor-configuration.png
 dashboard_advisors_SOURCES = dashboard-advisors.xml $(dashboard_advisors_INCLUDES)
 dashboard_advisors_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	metadata/dashboard-advisors.idmap \
 	metadata/data-items-core.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap
 dashboard-advisors.validpure: $(dashboard_advisors_SOURCES)

@@ -62,13 +62,13 @@
 	images/published/server-graphs.png
 dashboard_overview_SOURCES = dashboard-overview.xml $(dashboard_overview_INCLUDES)
 dashboard_overview_IDMAPS = \
+	../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 \
 	metadata/dashboard-advisors.idmap \
 	metadata/dashboard-graphs.idmap \
 	metadata/dashboard-overview.idmap \
 	metadata/dashboard-replication.idmap \
-	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/install-server.idmap
 dashboard-overview.validpure: $(dashboard_overview_SOURCES)

@@ -92,7 +92,7 @@
 	images/published/replication.png
 dashboard_replication_SOURCES = dashboard-replication.xml $(dashboard_replication_INCLUDES)
 dashboard_replication_IDMAPS = \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap
 dashboard-replication.validpure: $(dashboard_replication_SOURCES)
 dashboard-replication.titles: $(dashboard_replication_SOURCES)
 dashboard-replication.useless: $(dashboard_replication_SOURCES)

@@ -131,7 +131,7 @@
 	images/published/monitor-migration-progress.png
 deployment_SOURCES = deployment.xml $(deployment_INCLUDES)
 deployment_IDMAPS = \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap
 deployment.validpure: $(deployment_SOURCES)
 deployment.titles: $(deployment_SOURCES)
 deployment.useless: $(deployment_SOURCES)

@@ -166,11 +166,11 @@
 	../mysql-monitor-common/images/published/server-rename.png
 dynsel_default_monitor_dashboard_configure_SOURCES = dynsel-default-monitor-dashboard-configure.xml $(dynsel_default_monitor_dashboard_configure_INCLUDES)
 dynsel_default_monitor_dashboard_configure_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	metadata/dashboard-advisors.idmap \
 	metadata/dashboard-replication.idmap \
 	metadata/deployment.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
-	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/log-files.idmap

@@ -195,8 +195,8 @@
 	../mysql-monitor-common/images/published/events-screen.png
 dynsel_default_monitor_dashboard_events_SOURCES = dynsel-default-monitor-dashboard-events.xml $(dynsel_default_monitor_dashboard_events_INCLUDES)
 dynsel_default_monitor_dashboard_events_IDMAPS = \
-	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-events-core.idmap
 dynsel-default-monitor-dashboard-events.validpure: $(dynsel_default_monitor_dashboard_events_SOURCES)
 dynsel-default-monitor-dashboard-events.titles: $(dynsel_default_monitor_dashboard_events_SOURCES)
 dynsel-default-monitor-dashboard-events.useless: $(dynsel_default_monitor_dashboard_events_SOURCES)

@@ -230,11 +230,11 @@
 	../mysql-monitor-common/images/published/quan-layout2.png
 dynsel_default_monitor_dashboard_query_analysis_SOURCES = dynsel-default-monitor-dashboard-query-analysis.xml $(dynsel_default_monitor_dashboard_query_analysis_INCLUDES)
 dynsel_default_monitor_dashboard_query_analysis_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../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/monitor-faq-core.idmap
 dynsel-default-monitor-dashboard-query-analysis.validpure: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES)

@@ -247,9 +247,9 @@
 dynsel-default-monitor-dashboard-query-analysis-remprepped.xml: $(dynsel_default_monitor_dashboard_query_analysis_SOURCES) $(dynsel_default_monitor_dashboard_query_analysis_IDMAPS)
 
 dynxml_local_data_items_INCLUDES = \
-	../../mysqldoc/dynamic-docs/mem-data-items/mem-data-items.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/mem-data-items/mem-data-items.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -269,9 +269,9 @@
 dynxml-local-data-items-remprepped.xml: $(dynxml_local_data_items_SOURCES) $(dynxml_local_data_items_IDMAPS)
 dynxml-local-data-items.xml: $(dynxml_local_data_items_INCLUDES)
 dynxml_local_monitor_faq_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -280,8 +280,8 @@
 dynxml_local_monitor_faq_IMAGES =
 dynxml_local_monitor_faq_SOURCES = dynxml-local-monitor-faq.xml $(dynxml_local_monitor_faq_INCLUDES)
 dynxml_local_monitor_faq_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	metadata/deployment.idmap \
-	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
 	metadata/monitor-faq-core.idmap
 dynxml-local-monitor-faq.validpure: $(dynxml_local_monitor_faq_SOURCES)
 dynxml-local-monitor-faq.titles: $(dynxml_local_monitor_faq_SOURCES)

@@ -293,10 +293,10 @@
 dynxml-local-monitor-faq-remprepped.xml: $(dynxml_local_monitor_faq_SOURCES) $(dynxml_local_monitor_faq_IDMAPS)
 dynxml-local-monitor-faq.xml: $(dynxml_local_monitor_faq_INCLUDES)
 dynxml_local_news_monitor_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -365,9 +365,9 @@
 	images/published/agent-install-win6.png
 install_agent_SOURCES = install-agent.xml $(install_agent_INCLUDES)
 install_agent_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	metadata/dashboard-overview.idmap \
 	metadata/dashboard-replication.idmap \
-	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-unattended.idmap \
 	metadata/log-files.idmap

@@ -390,7 +390,7 @@
 install_postinstall_IMAGES =
 install_postinstall_SOURCES = install-postinstall.xml $(install_postinstall_INCLUDES)
 install_postinstall_IDMAPS = \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-upgrades.idmap \
 	metadata/log-files.idmap

@@ -435,8 +435,8 @@
 	images/published/monitor-install-win5.png
 install_server_SOURCES = install-server.xml $(install_server_INCLUDES)
 install_server_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
 	metadata/dashboard-overview.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended.idmap \
 	metadata/install.idmap

@@ -514,10 +514,10 @@
 	images/published/monitor-update-install-9.png
 install_upgrades_SOURCES = install-upgrades.xml $(install_upgrades_INCLUDES)
 install_upgrades_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	metadata/dashboard-advisors.idmap \
 	metadata/deployment.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
-	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended.idmap \

@@ -602,12 +602,12 @@
 	images/published/monitor-update-install-9.png
 install_SOURCES = install.xml $(install_INCLUDES)
 install_IDMAPS = \
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	metadata/dashboard-advisors.idmap \
 	metadata/dashboard-overview.idmap \
 	metadata/dashboard-replication.idmap \
 	metadata/deployment.idmap \
-	metadata/dynsel-default-monitor-dashboard-configure.idmap \
-	metadata/dynsel-default-monitor-dashboard-query-analysis.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended.idmap \

@@ -691,12 +691,12 @@
 monitor-faq-core-remprepped.xml: $(monitor_faq_core_SOURCES) $(monitor_faq_core_IDMAPS)
 
 monitor_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/mem-data-items/mem-data-items.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/mem-data-items/mem-data-items.xml \
 	../mysql-monitor-common/dashboard-configure-core.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -834,7 +834,9 @@
 	images/published/usage-advisor-configuration.png
 monitor_SOURCES = monitor.xml $(monitor_INCLUDES)
 monitor_IDMAPS = \
+	../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 \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../refman-5.1/metadata/tutorial.idmap \

@@ -845,9 +847,6 @@
 	metadata/dashboard-replication.idmap \
 	metadata/data-items-core.idmap \
 	metadata/deployment.idmap \
-	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/install-server.idmap \
 	metadata/install-unattended.idmap \


Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/mysql-monitor-2.1/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 8, Lines Added: 20, Lines Deleted: 21; 6200 bytes

@@ -12,8 +12,8 @@
 	images/published/dashboard-whatsnew.png
 dashboard_whatsnew_SOURCES = dashboard-whatsnew.xml $(dashboard_whatsnew_INCLUDES)
 dashboard_whatsnew_IDMAPS = \
-	metadata/dashboard-whatsnew.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	metadata/dashboard-whatsnew.idmap
 dashboard-whatsnew.validpure: $(dashboard_whatsnew_SOURCES)
 dashboard-whatsnew.titles: $(dashboard_whatsnew_SOURCES)
 dashboard-whatsnew.useless: $(dashboard_whatsnew_SOURCES)

@@ -54,9 +54,9 @@
 	../mysql-monitor-2.0/metadata/install-agent.idmap \
 	../mysql-monitor-2.0/metadata/install-server.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
-	metadata/dashboard-whatsnew.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-configure.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-query-analysis.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-query-analysis-core.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)
 dynsel-mem21-monitor-dashboard-configure.useless: $(dynsel_mem21_monitor_dashboard_configure_SOURCES)

@@ -78,8 +78,8 @@
 	images/published/events-screen.png
 dynsel_mem21_monitor_dashboard_events_SOURCES = dynsel-mem21-monitor-dashboard-events.xml $(dynsel_mem21_monitor_dashboard_events_INCLUDES)
 dynsel_mem21_monitor_dashboard_events_IDMAPS = \
-	../mysql-monitor-common/metadata/dashboard-events-core.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	../mysql-monitor-common/metadata/dashboard-events-core.idmap
 dynsel-mem21-monitor-dashboard-events.validpure: $(dynsel_mem21_monitor_dashboard_events_SOURCES)
 dynsel-mem21-monitor-dashboard-events.titles: $(dynsel_mem21_monitor_dashboard_events_SOURCES)
 dynsel-mem21-monitor-dashboard-events.useless: $(dynsel_mem21_monitor_dashboard_events_SOURCES)

@@ -115,11 +115,11 @@
 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 \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../refman-5.1/metadata/tutorial.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-query-analysis.idmap
+	../refman-common/metadata/mysql-proxy-core.idmap
 dynsel-mem21-monitor-dashboard-query-analysis.validpure: $(dynsel_mem21_monitor_dashboard_query_analysis_SOURCES)
 dynsel-mem21-monitor-dashboard-query-analysis.titles: $(dynsel_mem21_monitor_dashboard_query_analysis_SOURCES)
 dynsel-mem21-monitor-dashboard-query-analysis.useless: $(dynsel_mem21_monitor_dashboard_query_analysis_SOURCES)

@@ -130,10 +130,10 @@
 dynsel-mem21-monitor-dashboard-query-analysis-remprepped.xml: $(dynsel_mem21_monitor_dashboard_query_analysis_SOURCES) $(dynsel_mem21_monitor_dashboard_query_analysis_IDMAPS)
 
 dynxml_local_news_monitor_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -142,8 +142,8 @@
 dynxml_local_news_monitor_IMAGES =
 dynxml_local_news_monitor_SOURCES = dynxml-local-news-monitor.xml $(dynxml_local_news_monitor_INCLUDES)
 dynxml_local_news_monitor_IDMAPS = \
-	metadata/dashboard-whatsnew.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-configure.idmap
+	../mysql-monitor-common/metadata/dashboard-configure-core.idmap \
+	metadata/dashboard-whatsnew.idmap
 dynxml-local-news-monitor.validpure: $(dynxml_local_news_monitor_SOURCES)
 dynxml-local-news-monitor.titles: $(dynxml_local_news_monitor_SOURCES)
 dynxml-local-news-monitor.useless: $(dynxml_local_news_monitor_SOURCES)

@@ -167,14 +167,14 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 monitor_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/mem-data-items/mem-data-items.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/mem-data-items/mem-data-items.xml \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \

@@ -335,15 +335,14 @@
 	../mysql-monitor-2.0/metadata/install.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 \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/sql-syntax-utility.idmap \
 	../refman-5.1/metadata/tutorial.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
-	metadata/dashboard-whatsnew.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-configure.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-events.idmap \
-	metadata/dynsel-mem21-monitor-dashboard-query-analysis.idmap
+	metadata/dashboard-whatsnew.idmap
 monitor.validpure: $(monitor_SOURCES)
 monitor.titles: $(monitor_SOURCES)
 monitor.useless: $(monitor_SOURCES)


Modified: trunk/mysql-monitor-common/dashboard-configure-core.xml
===================================================================
--- trunk/mysql-monitor-common/dashboard-configure-core.xml	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/mysql-monitor-common/dashboard-configure-core.xml	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 492 bytes

@@ -172,7 +172,7 @@
       </listitem>
 
       <listitem>
-        <para>
+        <para id="mem-server-locale">
           <guilabel>Server Locale</guilabel>
         </para>
 


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/mysqlqb/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 652 bytes

@@ -1,8 +1,8 @@
 mysqlqb_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-5.0/all-entities.ent \


Modified: trunk/quick-guides/Makefile.depends
===================================================================
--- trunk/quick-guides/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/quick-guides/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 7, Lines Added: 264, Lines Deleted: 264; 31437 bytes

@@ -25,9 +25,9 @@
 changelog-core-remprepped.xml: $(changelog_core_SOURCES) $(changelog_core_IDMAPS)
 
 dynxml_local_buildopts_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	buildopts-core.xml

@@ -44,11 +44,11 @@
 dynxml-local-buildopts-remprepped.xml: $(dynxml_local_buildopts_SOURCES) $(dynxml_local_buildopts_IDMAPS)
 dynxml-local-buildopts.xml: $(dynxml_local_buildopts_INCLUDES)
 dynxml_local_changelog_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	changelog-core.xml

@@ -91,10 +91,10 @@
 dynxml-local-changelog-remprepped.xml: $(dynxml_local_changelog_SOURCES) $(dynxml_local_changelog_IDMAPS)
 dynxml-local-changelog.xml: $(dynxml_local_changelog_INCLUDES)
 dynxml_local_mysqld_optvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	mysqld-optvar-core.xml

@@ -111,10 +111,10 @@
 dynxml-local-mysqld-optvar-remprepped.xml: $(dynxml_local_mysqld_optvar_SOURCES) $(dynxml_local_mysqld_optvar_IDMAPS)
 dynxml-local-mysqld-optvar.xml: $(dynxml_local_mysqld_optvar_INCLUDES)
 dynxml_local_opfuncs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	opfuncs-core.xml

@@ -137,12 +137,12 @@
 dynxml-local-opfuncs-remprepped.xml: $(dynxml_local_opfuncs_SOURCES) $(dynxml_local_opfuncs_IDMAPS)
 dynxml-local-opfuncs.xml: $(dynxml_local_opfuncs_INCLUDES)
 dynxml_local_rchangelog_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/bugversions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/bugversions.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	rchangelog-core.xml

@@ -163,130 +163,130 @@
 dynxml-local-rchangelog-remprepped.xml: $(dynxml_local_rchangelog_SOURCES) $(dynxml_local_rchangelog_IDMAPS)
 dynxml-local-rchangelog.xml: $(dynxml_local_rchangelog_INCLUDES)
 dynxml_local_reservedwords_INCLUDES = \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.13-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.14-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.15-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.16-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.17-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.18-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.19-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.20-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.21-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.22-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.23-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.24-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.25-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.26-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.28-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.29-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.35 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.4.0-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.4.1-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.0-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.1-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.10-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.11-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.7-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.8-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.9-alpha \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.0-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.1-beta \
+	../dynamic-docs/reserved-words/mysql-6.0.0-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.1-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.10-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.11-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.3-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.4-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.5-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.6-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.7-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.8-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.9-alpha \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	reservedwords-core.xml

@@ -330,138 +330,138 @@
 mysqld-optvar-core-remprepped.xml: $(mysqld_optvar_core_SOURCES) $(mysqld_optvar_core_IDMAPS)
 
 mysqld_version_reference_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/bugversions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.13-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.14-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.15-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.16-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.17-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.18-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.19-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.20-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.21-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.22-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.23-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.24-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.25-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.26-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.28-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.29-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.35 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.4.0-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.4.1-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.0-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.1-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.10-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.11-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.7-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.8-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-6.0.9-alpha \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../dynamic-docs/changelog/bugversions.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.0-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.1-beta \
+	../dynamic-docs/reserved-words/mysql-6.0.0-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.1-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.10-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.11-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.3-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.4-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.5-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.6-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.7-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.8-alpha \
+	../dynamic-docs/reserved-words/mysql-6.0.9-alpha \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	buildopts-core.xml \


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-4.1/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 24, Lines Added: 134, Lines Deleted: 134; 23790 bytes

@@ -88,11 +88,11 @@
 backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
 
 connectors_apis_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \

@@ -541,10 +541,10 @@
 dba-user-management-core-remprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
 
 dba_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dba-log-files.xml \

@@ -571,11 +571,11 @@
 dba-remprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
 
 dynxml_common_connector_net_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/connector-net-core.xml \

@@ -703,10 +703,10 @@
 dynxml-common-connector-net-remprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
 dynxml-common-connector-net.xml: $(dynxml_common_connector_net_INCLUDES)
 dynxml_common_news_cj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
 	../refman-common/news-cj-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -724,10 +724,10 @@
 dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
 dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
 dynxml_common_news_cmxj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
 	../refman-common/news-cmxj-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -745,10 +745,10 @@
 dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
 dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
 dynxml_common_news_cnet_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
 	../refman-common/news-cnet-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -766,10 +766,10 @@
 dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
 dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
 dynxml_common_news_codbc_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
 	../refman-common/news-codbc-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -789,10 +789,10 @@
 dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
 dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
 dynxml_common_news_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
 	../refman-common/news-mysql-proxy-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -810,10 +810,10 @@
 dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
 dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
 dynxml_local_dba_mysqld_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dba-mysqld-server-core.xml \

@@ -854,10 +854,10 @@
 dynxml-local-dba-mysqld-server-remprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
 dynxml-local-dba-mysqld-server.xml: $(dynxml_local_dba_mysqld_server_INCLUDES)
 dynxml_local_dba_security_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dba-security-core.xml \

@@ -884,10 +884,10 @@
 dynxml-local-dba-security-remprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
 dynxml-local-dba-security.xml: $(dynxml_local_dba_security_INCLUDES)
 dynxml_local_dba_user_management_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dba-user-management-core.xml \

@@ -919,10 +919,10 @@
 dynxml-local-dba-user-management-remprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
 dynxml-local-dba-user-management.xml: $(dynxml_local_dba_user_management_INCLUDES)
 dynxml_local_functions_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	functions-core.xml \

@@ -954,10 +954,10 @@
 dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
 dynxml-local-functions.xml: $(dynxml_local_functions_INCLUDES)
 dynxml_local_mysql_cluster_optvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	mysql-cluster-optvar-core.xml \

@@ -979,18 +979,18 @@
 dynxml-local-mysql-cluster-optvar-remprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
 dynxml-local-mysql-cluster-optvar.xml: $(dynxml_local_mysql_cluster_optvar_INCLUDES)
 dynxml_local_mysql_cluster_programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \

@@ -1020,11 +1020,11 @@
 dynxml-local-mysql-cluster-programs-remprepped.xml: $(dynxml_local_mysql_cluster_programs_SOURCES) $(dynxml_local_mysql_cluster_programs_IDMAPS)
 dynxml-local-mysql-cluster-programs.xml: $(dynxml_local_mysql_cluster_programs_INCLUDES)
 dynxml_local_news_4_1_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	news-4.1-core.xml \

@@ -1065,15 +1065,15 @@
 dynxml-local-news-4.1-remprepped.xml: $(dynxml_local_news_4_1_SOURCES) $(dynxml_local_news_4_1_IDMAPS)
 dynxml-local-news-4.1.xml: $(dynxml_local_news_4_1_INCLUDES)
 dynxml_local_programs_admin_util_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	programs-admin-util-core.xml \

@@ -1103,15 +1103,15 @@
 dynxml-local-programs-admin-util-remprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
 dynxml-local-programs-admin-util.xml: $(dynxml_local_programs_admin_util_INCLUDES)
 dynxml_local_programs_client_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	programs-client-core.xml \

@@ -1143,10 +1143,10 @@
 dynxml-local-programs-client-remprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
 dynxml-local-programs-client.xml: $(dynxml_local_programs_client_INCLUDES)
 dynxml_local_programs_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	programs-server-core.xml \

@@ -1172,10 +1172,10 @@
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
 dynxml_local_replication_options_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	replication-options-core.xml \

@@ -1508,49 +1508,49 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../gui-common/gui-common.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/apis-cplusplus.xml \

@@ -2294,19 +2294,19 @@
 mysql-cluster-upgrade-downgrade-remprepped.xml: $(mysql_cluster_upgrade_downgrade_SOURCES) $(mysql_cluster_upgrade_downgrade_IDMAPS)
 
 mysql_cluster_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/images/published/cluster-components-1.png \
 	../refman-common/images/published/cluster-security-network-1.png \
 	../refman-common/images/published/cluster-security-network-2.png \

@@ -2469,23 +2469,23 @@
 news-4.1-core-remprepped.xml: $(news_4_1_core_SOURCES) $(news_4_1_core_IDMAPS)
 
 news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/news-cj-core.xml \

@@ -2709,22 +2709,22 @@
 programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
 
 programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-programs-admin-util.xml \

@@ -2790,10 +2790,10 @@
 replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
 
 replication_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-5.0/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 40, Lines Added: 335, Lines Deleted: 322; 64381 bytes

@@ -91,12 +91,12 @@
 backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
 
 connectors_apis_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -556,10 +556,10 @@
 dba-user-management-core-remprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
 
 dba_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -587,9 +587,9 @@
 dba-remprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
 
 dynxml_common_connector_c_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/connector-c-core.xml \

@@ -609,11 +609,11 @@
 dynxml-common-connector-c-remprepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
 dynxml-common-connector-c.xml: $(dynxml_common_connector_c_INCLUDES)
 dynxml_common_connector_net_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -743,10 +743,10 @@
 dynxml-common-connector-net-remprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
 dynxml-common-connector-net.xml: $(dynxml_common_connector_net_INCLUDES)
 dynxml_common_news_cj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cj-core.xml \

@@ -766,10 +766,10 @@
 dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
 dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
 dynxml_common_news_cmxj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cmxj-core.xml \

@@ -789,10 +789,10 @@
 dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
 dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
 dynxml_common_news_cnet_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cnet-core.xml \

@@ -812,10 +812,10 @@
 dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
 dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
 dynxml_common_news_codbc_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-codbc-core.xml \

@@ -837,10 +837,10 @@
 dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
 dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
 dynxml_common_news_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-mysql-proxy-core.xml \

@@ -860,10 +860,10 @@
 dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
 dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
 dynxml_common_news_vstudioplugin_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-vstudioplugin-core.xml \

@@ -884,10 +884,10 @@
 dynxml-common-news-vstudioplugin-remprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
 dynxml-common-news-vstudioplugin.xml: $(dynxml_common_news_vstudioplugin_INCLUDES)
 dynxml_local_dba_mysqld_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -935,10 +935,10 @@
 dynxml-local-dba-mysqld-server-remprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
 dynxml-local-dba-mysqld-server.xml: $(dynxml_local_dba_mysqld_server_INCLUDES)
 dynxml_local_dba_security_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -968,10 +968,10 @@
 dynxml-local-dba-security-remprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
 dynxml-local-dba-security.xml: $(dynxml_local_dba_security_INCLUDES)
 dynxml_local_dba_user_management_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1005,10 +1005,10 @@
 dynxml-local-dba-user-management-remprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
 dynxml-local-dba-user-management.xml: $(dynxml_local_dba_user_management_INCLUDES)
 dynxml_local_functions_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1145,84 +1145,84 @@
 dynxml-local-installing-remprepped.xml: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
 dynxml-local-installing.xml: $(dynxml_local_installing_INCLUDES)
 dynxml_local_language_structure_INCLUDES = \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-4.1.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/reserved-words/mysql-4.1.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1253,10 +1253,10 @@
 dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_mysql_cluster_optvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1280,18 +1280,18 @@
 dynxml-local-mysql-cluster-optvar-remprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
 dynxml-local-mysql-cluster-optvar.xml: $(dynxml_local_mysql_cluster_optvar_INCLUDES)
 dynxml_local_mysql_cluster_programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/images/published/ndb-size-pl-1.png \

@@ -1324,11 +1324,11 @@
 dynxml-local-mysql-cluster-programs-remprepped.xml: $(dynxml_local_mysql_cluster_programs_SOURCES) $(dynxml_local_mysql_cluster_programs_IDMAPS)
 dynxml-local-mysql-cluster-programs.xml: $(dynxml_local_mysql_cluster_programs_INCLUDES)
 dynxml_local_news_5_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1387,15 +1387,15 @@
 dynxml-local-news-5.0-remprepped.xml: $(dynxml_local_news_5_0_SOURCES) $(dynxml_local_news_5_0_IDMAPS)
 dynxml-local-news-5.0.xml: $(dynxml_local_news_5_0_INCLUDES)
 dynxml_local_programs_admin_util_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1429,15 +1429,15 @@
 dynxml-local-programs-admin-util-remprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
 dynxml-local-programs-admin-util.xml: $(dynxml_local_programs_admin_util_INCLUDES)
 dynxml_local_programs_client_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1473,10 +1473,10 @@
 dynxml-local-programs-client-remprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
 dynxml-local-programs-client.xml: $(dynxml_local_programs_client_INCLUDES)
 dynxml_local_programs_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1505,9 +1505,9 @@
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
 dynxml_local_quickref_INCLUDES = \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1553,10 +1553,10 @@
 dynxml-local-quickref-remprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
 dynxml-local-quickref.xml: $(dynxml_local_quickref_INCLUDES)
 dynxml_local_replication_options_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1588,10 +1588,10 @@
 dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
 dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
 dynxml_local_se_bdb_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1618,10 +1618,10 @@
 dynxml-local-se-bdb-remprepped.xml: $(dynxml_local_se_bdb_SOURCES) $(dynxml_local_se_bdb_IDMAPS)
 dynxml-local-se-bdb.xml: $(dynxml_local_se_bdb_INCLUDES)
 dynxml_local_se_innodb_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -1655,10 +1655,10 @@
 dynxml-local-se-innodb-remprepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
 dynxml-local-se-innodb.xml: $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_myisam_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -2111,136 +2111,136 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-4.1.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/reserved-words/mysql-4.1.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \

@@ -3001,11 +3001,11 @@
 manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 
 monitor_refman_chapter_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \

@@ -3190,11 +3190,11 @@
 monitor-refman-chapter-base-remprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
 
 monitor_refman_chapter_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \
 	../mysql-monitor-2.0/dashboard-graphs.xml \

@@ -3655,19 +3655,19 @@
 mysql-cluster-upgrade-downgrade-remprepped.xml: $(mysql_cluster_upgrade_downgrade_SOURCES) $(mysql_cluster_upgrade_downgrade_IDMAPS)
 
 mysql_cluster_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/images/published/cluster-components-1.png \

@@ -3761,10 +3761,10 @@
 news-5.0-core-remprepped.xml: $(news_5_0_core_SOURCES) $(news_5_0_core_IDMAPS)
 
 news_monitor_2_0_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -3813,10 +3813,10 @@
 news-monitor-2.0-base-remprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
 
 news_monitor_2_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -3839,27 +3839,27 @@
 news-monitor-2.0-remprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
 
 news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -4173,22 +4173,22 @@
 programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
 
 programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysql_tableinfo.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -4258,10 +4258,10 @@
 quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
 
 replication_configuration_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -4355,6 +4355,19 @@
 replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
 replication_solutions_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4391,10 +4404,10 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/images/published/multi-db.png \

@@ -5008,10 +5021,10 @@
 sql-syntax-remprepped.xml: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
 
 storage_engines_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/images/published/blackhole-1.png \

@@ -5235,7 +5248,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../../mysqldoc/dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent all-entities.ent news-monitor-2.0-aspec.xml ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
+news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent all-entities.ent news-monitor-2.0-aspec.xml ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
 	$(MAKE) news-monitor-2.0.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -5245,7 +5258,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 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-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 ../../mysqldoc/dynamic-docs/faq/monitor.xml ../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/ins!
 tall-server.xml monitor-refman-chapter-base.xml ../mysql-monitor-2.0/deployment.xml ../mysql-monitor-2.0/metadata/introduction.idmap ../mysql-monitor-2.1/images/published/mem-settings-global.png ../mysql-monitor-2.0/../common/fixedchars.ent ../mysql-monitor-2.0/images/published/agent-install-osx1.png ../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.1/images/published/events-screen.png ../mysql-monitor-2.0/metadata/ins!
 tall-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-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 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-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.1/images/published/mem-settings-global.png ../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 ../dynamic-docs/faq/monitor.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.0/metadata/install-postins!
 tall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-mon!
 itor-2.0
/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-osx4.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-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-5.1/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 73, Lines Added: 454, Lines Deleted: 987; 112696 bytes

@@ -98,13 +98,13 @@
 backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
 
 connectors_apis_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -618,10 +618,10 @@
 dba-user-management-core-remprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
 
 dba_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -650,9 +650,9 @@
 dba-remprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
 
 dynxml_common_connector_c_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -673,9 +673,9 @@
 dynxml-common-connector-c-remprepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
 dynxml-common-connector-c.xml: $(dynxml_common_connector_c_INCLUDES)
 dynxml_common_connector_cpp_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-cpp.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -742,11 +742,11 @@
 dynxml-common-connector-cpp-remprepped.xml: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
 dynxml-common-connector-cpp.xml: $(dynxml_common_connector_cpp_INCLUDES)
 dynxml_common_connector_net_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -877,10 +877,10 @@
 dynxml-common-connector-net-remprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
 dynxml-common-connector-net.xml: $(dynxml_common_connector_net_INCLUDES)
 dynxml_common_news_ccpp_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -901,10 +901,10 @@
 dynxml-common-news-ccpp-remprepped.xml: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
 dynxml-common-news-ccpp.xml: $(dynxml_common_news_ccpp_INCLUDES)
 dynxml_common_news_cj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -925,10 +925,10 @@
 dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
 dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
 dynxml_common_news_cmxj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -949,10 +949,10 @@
 dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
 dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
 dynxml_common_news_cnet_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -973,10 +973,10 @@
 dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
 dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
 dynxml_common_news_codbc_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -999,10 +999,10 @@
 dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
 dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
 dynxml_common_news_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1023,10 +1023,10 @@
 dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
 dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
 dynxml_common_news_vstudioplugin_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1048,10 +1048,10 @@
 dynxml-common-news-vstudioplugin-remprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
 dynxml-common-news-vstudioplugin.xml: $(dynxml_common_news_vstudioplugin_INCLUDES)
 dynxml_local_dba_mysqld_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1104,10 +1104,10 @@
 dynxml-local-dba-mysqld-server-remprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
 dynxml-local-dba-mysqld-server.xml: $(dynxml_local_dba_mysqld_server_INCLUDES)
 dynxml_local_dba_security_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1138,10 +1138,10 @@
 dynxml-local-dba-security-remprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
 dynxml-local-dba-security.xml: $(dynxml_local_dba_security_INCLUDES)
 dynxml_local_dba_user_management_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1176,10 +1176,10 @@
 dynxml-local-dba-user-management-remprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
 dynxml-local-dba-user-management.xml: $(dynxml_local_dba_user_management_INCLUDES)
 dynxml_local_errors_problems_INCLUDES = \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/open-bugs/mysqld-versions.xml \
+	../dynamic-docs/open-bugs/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1225,10 +1225,10 @@
 dynxml-local-errors-problems-remprepped.xml: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
 dynxml-local-errors-problems.xml: $(dynxml_local_errors_problems_INCLUDES)
 dynxml_local_functions_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1273,9 +1273,9 @@
 dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
 dynxml-local-functions.xml: $(dynxml_local_functions_INCLUDES)
 dynxml_local_installing_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1354,116 +1354,116 @@
 dynxml-local-installing-remprepped.xml: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
 dynxml-local-installing.xml: $(dynxml_local_installing_INCLUDES)
 dynxml_local_language_structure_INCLUDES = \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.13-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.14-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.15-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.16-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.17-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.18-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.19-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.20-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.21-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.22-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.23-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.24-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.25-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.26-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.28-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.29-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.35 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1506,31 +1506,7 @@
 	versions.ent
 dynxml_local_manual_index_cfunc_IMAGES =
 dynxml_local_manual_index_cfunc_SOURCES = dynxml-local-manual-index-cfunc.xml $(dynxml_local_manual_index_cfunc_INCLUDES)
-dynxml_local_manual_index_cfunc_IDMAPS = \
-	../refman-6.0/metadata/apis-c.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_cfunc_IDMAPS =
 dynxml-local-manual-index-cfunc.validpure: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.titles: $(dynxml_local_manual_index_cfunc_SOURCES)
 dynxml-local-manual-index-cfunc.useless: $(dynxml_local_manual_index_cfunc_SOURCES)

@@ -1551,79 +1527,7 @@
 	versions.ent
 dynxml_local_manual_index_command_IMAGES =
 dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
-dynxml_local_manual_index_command_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-4.1-core.idmap \
-	../refman-6.0/metadata/backup.idmap \
-	../refman-6.0/metadata/internationalization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/ha-heartbeat.idmap \
-	../refman-common/metadata/ha-memcached-core.idmap \
-	../refman-common/metadata/ha.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/dba.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_command_IDMAPS =
 dynxml-local-manual-index-command.validpure: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.titles: $(dynxml_local_manual_index_command_SOURCES)
 dynxml-local-manual-index-command.useless: $(dynxml_local_manual_index_command_SOURCES)

@@ -1644,46 +1548,7 @@
 	versions.ent
 dynxml_local_manual_index_function_IMAGES =
 dynxml_local_manual_index_function_SOURCES = dynxml-local-manual-index-function.xml $(dynxml_local_manual_index_function_INCLUDES)
-dynxml_local_manual_index_function_IDMAPS = \
-	../refman-4.1/metadata/news-4.1-core.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_function_IDMAPS =
 dynxml-local-manual-index-function.validpure: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.titles: $(dynxml_local_manual_index_function_SOURCES)
 dynxml-local-manual-index-function.useless: $(dynxml_local_manual_index_function_SOURCES)

@@ -1704,26 +1569,7 @@
 	versions.ent
 dynxml_local_manual_index_is_IMAGES =
 dynxml_local_manual_index_is_SOURCES = dynxml-local-manual-index-is.xml $(dynxml_local_manual_index_is_INCLUDES)
-dynxml_local_manual_index_is_IDMAPS = \
-	../refman-6.0/metadata/information-schema.idmap \
-	metadata/apis-c.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_is_IDMAPS =
 dynxml-local-manual-index-is.validpure: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.titles: $(dynxml_local_manual_index_is_SOURCES)
 dynxml-local-manual-index-is.useless: $(dynxml_local_manual_index_is_SOURCES)

@@ -1744,12 +1590,7 @@
 	versions.ent
 dynxml_local_manual_index_isolevel_IMAGES =
 dynxml_local_manual_index_isolevel_SOURCES = dynxml-local-manual-index-isolevel.xml $(dynxml_local_manual_index_isolevel_INCLUDES)
-dynxml_local_manual_index_isolevel_IDMAPS = \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-transactions.idmap
+dynxml_local_manual_index_isolevel_IDMAPS =
 dynxml-local-manual-index-isolevel.validpure: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.titles: $(dynxml_local_manual_index_isolevel_SOURCES)
 dynxml-local-manual-index-isolevel.useless: $(dynxml_local_manual_index_isolevel_SOURCES)

@@ -1770,11 +1611,7 @@
 	versions.ent
 dynxml_local_manual_index_jointype_IMAGES =
 dynxml_local_manual_index_jointype_SOURCES = dynxml-local-manual-index-jointype.xml $(dynxml_local_manual_index_jointype_INCLUDES)
-dynxml_local_manual_index_jointype_IDMAPS = \
-	../refman-6.0/metadata/optimization.idmap \
-	metadata/optimization.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-manipulation.idmap
+dynxml_local_manual_index_jointype_IDMAPS =
 dynxml-local-manual-index-jointype.validpure: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.titles: $(dynxml_local_manual_index_jointype_SOURCES)
 dynxml-local-manual-index-jointype.useless: $(dynxml_local_manual_index_jointype_SOURCES)

@@ -1795,27 +1632,7 @@
 	versions.ent
 dynxml_local_manual_index_operator_IMAGES =
 dynxml_local_manual_index_operator_SOURCES = dynxml-local-manual-index-operator.xml $(dynxml_local_manual_index_operator_INCLUDES)
-dynxml_local_manual_index_operator_IDMAPS = \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_operator_IDMAPS =
 dynxml-local-manual-index-operator.validpure: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.titles: $(dynxml_local_manual_index_operator_SOURCES)
 dynxml-local-manual-index-operator.useless: $(dynxml_local_manual_index_operator_SOURCES)

@@ -1836,76 +1653,7 @@
 	versions.ent
 dynxml_local_manual_index_option_IMAGES =
 dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
-dynxml_local_manual_index_option_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-6.0/metadata/backup.idmap \
-	../refman-6.0/metadata/information-schema.idmap \
-	../refman-6.0/metadata/internationalization.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap
+dynxml_local_manual_index_option_IDMAPS =
 dynxml-local-manual-index-option.validpure: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.titles: $(dynxml_local_manual_index_option_SOURCES)
 dynxml-local-manual-index-option.useless: $(dynxml_local_manual_index_option_SOURCES)

@@ -1926,43 +1674,7 @@
 	versions.ent
 dynxml_local_manual_index_priv_IMAGES =
 dynxml_local_manual_index_priv_SOURCES = dynxml-local-manual-index-priv.xml $(dynxml_local_manual_index_priv_INCLUDES)
-dynxml_local_manual_index_priv_IDMAPS = \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-6.0/metadata/storage-engines-core.idmap \
-	metadata/apis-c.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap
+dynxml_local_manual_index_priv_IDMAPS =
 dynxml-local-manual-index-priv.validpure: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.titles: $(dynxml_local_manual_index_priv_SOURCES)
 dynxml-local-manual-index-priv.useless: $(dynxml_local_manual_index_priv_SOURCES)

@@ -1983,23 +1695,7 @@
 	versions.ent
 dynxml_local_manual_index_sqlmode_IMAGES =
 dynxml_local_manual_index_sqlmode_SOURCES = dynxml-local-manual-index-sqlmode.xml $(dynxml_local_manual_index_sqlmode_INCLUDES)
-dynxml_local_manual_index_sqlmode_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_sqlmode_IDMAPS =
 dynxml-local-manual-index-sqlmode.validpure: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.titles: $(dynxml_local_manual_index_sqlmode_SOURCES)
 dynxml-local-manual-index-sqlmode.useless: $(dynxml_local_manual_index_sqlmode_SOURCES)

@@ -2020,19 +1716,7 @@
 	versions.ent
 dynxml_local_manual_index_statvar_IMAGES =
 dynxml_local_manual_index_statvar_SOURCES = dynxml-local-manual-index-statvar.xml $(dynxml_local_manual_index_statvar_INCLUDES)
-dynxml_local_manual_index_statvar_IDMAPS = \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-server-administration.idmap
+dynxml_local_manual_index_statvar_IDMAPS =
 dynxml-local-manual-index-statvar.validpure: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.titles: $(dynxml_local_manual_index_statvar_SOURCES)
 dynxml-local-manual-index-statvar.useless: $(dynxml_local_manual_index_statvar_SOURCES)

@@ -2053,74 +1737,7 @@
 	versions.ent
 dynxml_local_manual_index_stmt_IMAGES =
 dynxml_local_manual_index_stmt_SOURCES = dynxml-local-manual-index-stmt.xml $(dynxml_local_manual_index_stmt_INCLUDES)
-dynxml_local_manual_index_stmt_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/news-4.1-core.idmap \
-	../refman-6.0/metadata/apis-c.idmap \
-	../refman-6.0/metadata/backup.idmap \
-	../refman-6.0/metadata/information-schema.idmap \
-	../refman-6.0/metadata/internationalization.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-6.0/metadata/storage-engines-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	metadata/apis-c.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_stmt_IDMAPS =
 dynxml-local-manual-index-stmt.validpure: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.titles: $(dynxml_local_manual_index_stmt_SOURCES)
 dynxml-local-manual-index-stmt.useless: $(dynxml_local_manual_index_stmt_SOURCES)

@@ -2141,55 +1758,7 @@
 	versions.ent
 dynxml_local_manual_index_sysvar_IMAGES =
 dynxml_local_manual_index_sysvar_SOURCES = dynxml-local-manual-index-sysvar.xml $(dynxml_local_manual_index_sysvar_INCLUDES)
-dynxml_local_manual_index_sysvar_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-6.0/metadata/backup.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-6.0/metadata/storage-engines-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_sysvar_IDMAPS =
 dynxml-local-manual-index-sysvar.validpure: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.titles: $(dynxml_local_manual_index_sysvar_SOURCES)
 dynxml-local-manual-index-sysvar.useless: $(dynxml_local_manual_index_sysvar_SOURCES)

@@ -2210,101 +1779,7 @@
 	versions.ent
 dynxml_local_manual_index_IMAGES =
 dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
-dynxml_local_manual_index_IDMAPS = \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/news-4.1-core.idmap \
-	../refman-6.0/metadata/apis-c.idmap \
-	../refman-6.0/metadata/information-schema.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-common/metadata/apis-cplusplus.idmap \
-	../refman-common/metadata/apis-eiffel.idmap \
-	../refman-common/metadata/apis-perl.idmap \
-	../refman-common/metadata/apis-php.idmap \
-	../refman-common/metadata/apis-python.idmap \
-	../refman-common/metadata/apis-ruby.idmap \
-	../refman-common/metadata/apis-tcl.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/manual-conventions.en.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	../refman-common/metadata/news-innodb.idmap \
-	metadata/apis-c.idmap \
-	metadata/apis-libmysqld.idmap \
-	metadata/backup.idmap \
-	metadata/connectors-apis.idmap \
-	metadata/data-types.idmap \
-	metadata/dba-log-files.idmap \
-	metadata/dba-multiple-servers.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/dba-privilege-system.idmap \
-	metadata/dba-security-core.idmap \
-	metadata/dba-user-management-core.idmap \
-	metadata/errors-problems-core.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/faqs.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/installing-core.idmap \
-	metadata/internationalization.idmap \
-	metadata/introduction.idmap \
-	metadata/language-structure-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-glossary.idmap \
-	metadata/mysql-cluster-interconnects.idmap \
-	metadata/mysql-cluster-limitations.idmap \
-	metadata/mysql-cluster-management.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/mysql-cluster-overview.idmap \
-	metadata/mysql-cluster-programs-core.idmap \
-	metadata/mysql-cluster-security.idmap \
-	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/news.idmap \
-	metadata/optimization.idmap \
-	metadata/partitioning.idmap \
-	metadata/programs-admin-util-core.idmap \
-	metadata/programs-client-core.idmap \
-	metadata/programs-development.idmap \
-	metadata/programs-installation.idmap \
-	metadata/programs-miscellaneous.idmap \
-	metadata/programs-server-core.idmap \
-	metadata/programs-using.idmap \
-	metadata/programs.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication-options-core.idmap \
-	metadata/replication.idmap \
-	metadata/restrictions.idmap \
-	metadata/se-archive-core.idmap \
-	metadata/se-blackhole.idmap \
-	metadata/se-csv.idmap \
-	metadata/se-example.idmap \
-	metadata/se-federated.idmap \
-	metadata/se-innodb-core.idmap \
-	metadata/se-memory-core.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-myisam-core.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax-data-definition.idmap \
-	metadata/sql-syntax-data-manipulation.idmap \
-	metadata/sql-syntax-prepared-statements.idmap \
-	metadata/sql-syntax-replication.idmap \
-	metadata/sql-syntax-server-administration.idmap \
-	metadata/sql-syntax-transactions.idmap \
-	metadata/sql-syntax-utility.idmap \
-	metadata/storage-engines-core.idmap \
-	metadata/stored-programs-views.idmap \
-	metadata/stored-routines.idmap \
-	metadata/triggers.idmap \
-	metadata/tutorial.idmap \
-	metadata/views.idmap
+dynxml_local_manual_index_IDMAPS =
 dynxml-local-manual-index.validpure: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.titles: $(dynxml_local_manual_index_SOURCES)
 dynxml-local-manual-index.useless: $(dynxml_local_manual_index_SOURCES)

@@ -2315,11 +1790,11 @@
 dynxml-local-manual-index-remprepped.xml: $(dynxml_local_manual_index_SOURCES) $(dynxml_local_manual_index_IDMAPS)
 dynxml-local-manual-index.xml: $(dynxml_local_manual_index_INCLUDES)
 dynxml_local_mysql_cluster_news_combined_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2366,11 +1841,11 @@
 dynxml-local-mysql-cluster-news-combined-remprepped.xml: $(dynxml_local_mysql_cluster_news_combined_SOURCES) $(dynxml_local_mysql_cluster_news_combined_IDMAPS)
 dynxml-local-mysql-cluster-news-combined.xml: $(dynxml_local_mysql_cluster_news_combined_INCLUDES)
 dynxml_local_mysql_cluster_news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2420,10 +1895,10 @@
 dynxml-local-mysql-cluster-news-remprepped.xml: $(dynxml_local_mysql_cluster_news_SOURCES) $(dynxml_local_mysql_cluster_news_IDMAPS)
 dynxml-local-mysql-cluster-news.xml: $(dynxml_local_mysql_cluster_news_INCLUDES)
 dynxml_local_mysql_cluster_optvar_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2450,19 +1925,19 @@
 dynxml-local-mysql-cluster-optvar-remprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
 dynxml-local-mysql-cluster-optvar.xml: $(dynxml_local_mysql_cluster_optvar_INCLUDES)
 dynxml_local_mysql_cluster_programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2498,11 +1973,11 @@
 dynxml-local-mysql-cluster-programs-remprepped.xml: $(dynxml_local_mysql_cluster_programs_SOURCES) $(dynxml_local_mysql_cluster_programs_IDMAPS)
 dynxml-local-mysql-cluster-programs.xml: $(dynxml_local_mysql_cluster_programs_INCLUDES)
 dynxml_local_news_5_1_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2564,14 +2039,14 @@
 dynxml-local-news-5.1-remprepped.xml: $(dynxml_local_news_5_1_SOURCES) $(dynxml_local_news_5_1_IDMAPS)
 dynxml-local-news-5.1.xml: $(dynxml_local_news_5_1_INCLUDES)
 dynxml_local_programs_admin_util_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2605,16 +2080,16 @@
 dynxml-local-programs-admin-util-remprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
 dynxml-local-programs-admin-util.xml: $(dynxml_local_programs_admin_util_INCLUDES)
 dynxml_local_programs_client_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2652,10 +2127,10 @@
 dynxml-local-programs-client-remprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
 dynxml-local-programs-client.xml: $(dynxml_local_programs_client_INCLUDES)
 dynxml_local_programs_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2685,9 +2160,9 @@
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
 dynxml_local_quickref_INCLUDES = \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2737,10 +2212,10 @@
 dynxml-local-quickref-remprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
 dynxml-local-quickref.xml: $(dynxml_local_quickref_INCLUDES)
 dynxml_local_replication_options_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2774,9 +2249,9 @@
 dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
 dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
 dynxml_local_se_archive_INCLUDES = \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2800,10 +2275,10 @@
 dynxml-local-se-archive-remprepped.xml: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
 dynxml-local-se-archive.xml: $(dynxml_local_se_archive_INCLUDES)
 dynxml_local_se_db2_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/ibmdb2i.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2825,11 +2300,11 @@
 dynxml-local-se-db2-remprepped.xml: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
 dynxml-local-se-db2.xml: $(dynxml_local_se_db2_INCLUDES)
 dynxml_local_se_innodb_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2862,9 +2337,9 @@
 dynxml-local-se-innodb-remprepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
 dynxml-local-se-innodb.xml: $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_memory_INCLUDES = \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2888,11 +2363,11 @@
 dynxml-local-se-memory-remprepped.xml: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
 dynxml-local-se-memory.xml: $(dynxml_local_se_memory_INCLUDES)
 dynxml_local_se_myisam_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2924,12 +2399,12 @@
 dynxml-local-se-myisam-remprepped.xml: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
 dynxml-local-se-myisam.xml: $(dynxml_local_se_myisam_INCLUDES)
 dynxml_local_storage_engines_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/ibmdb2i.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -3383,177 +2858,177 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ibmdb2i.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.13-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.14-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.15-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.16-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.17-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.18-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.19-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.20-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.21-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.22-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.23-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.24-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.25-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.26-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.28-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.29-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.35 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/open-bugs/mysqld-versions.xml \
+	../dynamic-docs/open-bugs/mysqld.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/storage-engines/engines.xml \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \

@@ -3562,9 +3037,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -3613,7 +3085,11 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -4049,6 +3525,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -4248,6 +3726,7 @@
 	../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-2.1/metadata/dashboard-whatsnew.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 \

@@ -4270,27 +3749,12 @@
 	../ndbapi/metadata/struct-partitionspec.idmap \
 	../ndbapi/metadata/struct-recordspecification.idmap \
 	../quick-guides/metadata/reservedwords-core.idmap \
-	../refman-4.1/metadata/dba-mysqld-max.idmap \
 	../refman-4.1/metadata/installing.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-4.1/metadata/mysql-cluster-faq.idmap \
-	../refman-4.1/metadata/news-3.23.idmap \
-	../refman-4.1/metadata/news-4.0.idmap \
-	../refman-4.1/metadata/news-4.1-core.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/introduction.idmap \
-	../refman-6.0/metadata/apis-c.idmap \
-	../refman-6.0/metadata/backup.idmap \
-	../refman-6.0/metadata/information-schema.idmap \
-	../refman-6.0/metadata/internationalization.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-6.0/metadata/manual.idmap \
-	../refman-6.0/metadata/optimization.idmap \
-	../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../refman-6.0/metadata/restrictions.idmap \
-	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-6.0/metadata/storage-engines-core.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \
 	../refman-common/metadata/apis-eiffel.idmap \
 	../refman-common/metadata/apis-perl.idmap \

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

@@ -4429,11 +3890,11 @@
 manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 
 monitor_refman_chapter_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \

@@ -4441,9 +3902,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -4491,7 +3949,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -4563,6 +4025,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -4616,11 +4080,11 @@
 monitor-refman-chapter-base-remprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
 
 monitor_refman_chapter_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \

@@ -4628,9 +4092,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -4678,7 +4139,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -4750,6 +4215,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -5216,23 +4683,23 @@
 mysql-cluster-upgrade-downgrade-remprepped.xml: $(mysql_cluster_upgrade_downgrade_SOURCES) $(mysql_cluster_upgrade_downgrade_IDMAPS)
 
 mysql_cluster_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/ndb_common.xml \
+	../dynamic-docs/command-optvars/ndb_config.xml \
+	../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../dynamic-docs/command-optvars/ndb_restore.xml \
+	../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../dynamic-docs/command-optvars/ndbd.xml \
+	../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -5372,10 +4839,10 @@
 news-5.1-core-remprepped.xml: $(news_5_1_core_SOURCES) $(news_5_1_core_IDMAPS)
 
 news_monitor_2_0_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -5425,10 +4892,10 @@
 news-monitor-2.0-base-remprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
 
 news_monitor_2_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -5452,27 +4919,27 @@
 news-monitor-2.0-remprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
 
 news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -5791,22 +5258,22 @@
 programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
 
 programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -5879,10 +5346,10 @@
 quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
 
 replication_configuration_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -6040,10 +5507,10 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -6875,7 +6342,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../../mysqldoc/dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent news-monitor-2.0-aspec.xml ../gui-common/gui-common.ent ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
+news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent news-monitor-2.0-aspec.xml ../gui-common/gui-common.ent ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
 	$(MAKE) news-monitor-2.0.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -6885,7 +6352,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-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.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-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/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/im!
 ages/published/mem-settings-users.png ../mysql-monitor-2.0/ima!
 ges/publ
ished/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/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/dynsel-default-monitor-dashboard-configure.xml ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap ../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/metadata/install-upgrades.idmap!
  ../mysql-monitor-common/images/published/mem-settings-global.!
 png ../m
ysql-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 ../../mysqldoc/dynamic-docs/faq/monitor.xml ../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-monit!
 or-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/metadata/dynsel-default-monitor-dashboard-events.idmap ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-q!
 uery-analysis.idmap ../mysql-monitor-2.0/metadata/install-post!
 install.
idmap ../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml ../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-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.1/images/published/mem-settings-global.png ../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 ../dynamic-docs/faq/monitor.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor!
 -2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/i!
 nstall-a
gent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-osx4.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-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 27, Lines Added: 230, Lines Deleted: 220; 48348 bytes

@@ -1,8 +1,8 @@
 dynxml_common_news_cj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cj-core.xml \

@@ -22,10 +22,10 @@
 dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
 dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
 dynxml_common_news_cmxj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cmxj-core.xml \

@@ -45,10 +45,10 @@
 dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
 dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
 dynxml_common_news_cnet_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-cnet-core.xml \

@@ -68,10 +68,10 @@
 dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
 dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
 dynxml_common_news_codbc_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-codbc-core.xml \

@@ -93,10 +93,10 @@
 dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
 dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
 dynxml_common_news_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-mysql-proxy-core.xml \

@@ -116,10 +116,10 @@
 dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
 dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
 dynxml_common_news_vstudioplugin_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/news-vstudioplugin-core.xml \

@@ -140,11 +140,11 @@
 dynxml-common-news-vstudioplugin-remprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
 dynxml-common-news-vstudioplugin.xml: $(dynxml_common_news_vstudioplugin_INCLUDES)
 dynxml_local_news_5_1_maria_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -165,9 +165,9 @@
 dynxml-local-news-5.1-maria-remprepped.xml: $(dynxml_local_news_5_1_maria_SOURCES) $(dynxml_local_news_5_1_maria_IDMAPS)
 dynxml-local-news-5.1-maria.xml: $(dynxml_local_news_5_1_maria_INCLUDES)
 dynxml_local_quickref_INCLUDES = \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -216,11 +216,11 @@
 dynxml-local-quickref-remprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
 dynxml-local-quickref.xml: $(dynxml_local_quickref_INCLUDES)
 dynxml_local_se_maria_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../refman-common/urls.ent \

@@ -244,164 +244,6 @@
 dynxml-local-se-maria-remprepped.xml: $(dynxml_local_se_maria_SOURCES) $(dynxml_local_se_maria_IDMAPS)
 dynxml-local-se-maria.xml: $(dynxml_local_se_maria_INCLUDES)
 manual_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/open-bugs/mysqld.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.10-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.15 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.16 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.17 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.18 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.19 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.2-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.20a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.21 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.22 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.23 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.24a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.25 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.26 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.28 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.3-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.30sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.36sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.37 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.38 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.4-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.40 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.41 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.42 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.44sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.45 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.46 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.48 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.50sp1a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.51b \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.52 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.54a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.56sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.58 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.6-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.60sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.62 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.64 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66a \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.66sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.67 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.68 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.70 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.72sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.74 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.75 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.76 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.77 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.78 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.79 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.80 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.81 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.82 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.83 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.0.9-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.11-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.12-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.13-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.14-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.15-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.16-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.17-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.18-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.19-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.20-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.21-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.22-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.23-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.24-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.25-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.26-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.27 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.28-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.29-rc \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.3-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.30 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.31sp1 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.32 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.33 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.34 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.35 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.36 \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.4-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.5-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.6-alpha \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.7-beta \
-	../../mysqldoc/dynamic-docs/reserved-words/mysql-5.1.9-beta \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \

@@ -412,6 +254,164 @@
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/open-bugs/mysqld-versions.xml \
+	../dynamic-docs/open-bugs/mysqld.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/reserved-words/mysql-5.0.10-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.15 \
+	../dynamic-docs/reserved-words/mysql-5.0.16 \
+	../dynamic-docs/reserved-words/mysql-5.0.17 \
+	../dynamic-docs/reserved-words/mysql-5.0.18 \
+	../dynamic-docs/reserved-words/mysql-5.0.19 \
+	../dynamic-docs/reserved-words/mysql-5.0.2-alpha \
+	../dynamic-docs/reserved-words/mysql-5.0.20 \
+	../dynamic-docs/reserved-words/mysql-5.0.20a \
+	../dynamic-docs/reserved-words/mysql-5.0.21 \
+	../dynamic-docs/reserved-words/mysql-5.0.22 \
+	../dynamic-docs/reserved-words/mysql-5.0.23 \
+	../dynamic-docs/reserved-words/mysql-5.0.24 \
+	../dynamic-docs/reserved-words/mysql-5.0.24a \
+	../dynamic-docs/reserved-words/mysql-5.0.25 \
+	../dynamic-docs/reserved-words/mysql-5.0.26 \
+	../dynamic-docs/reserved-words/mysql-5.0.27 \
+	../dynamic-docs/reserved-words/mysql-5.0.28 \
+	../dynamic-docs/reserved-words/mysql-5.0.3-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.30 \
+	../dynamic-docs/reserved-words/mysql-5.0.30sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.32 \
+	../dynamic-docs/reserved-words/mysql-5.0.33 \
+	../dynamic-docs/reserved-words/mysql-5.0.34 \
+	../dynamic-docs/reserved-words/mysql-5.0.36 \
+	../dynamic-docs/reserved-words/mysql-5.0.36sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.37 \
+	../dynamic-docs/reserved-words/mysql-5.0.38 \
+	../dynamic-docs/reserved-words/mysql-5.0.4-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.40 \
+	../dynamic-docs/reserved-words/mysql-5.0.41 \
+	../dynamic-docs/reserved-words/mysql-5.0.42 \
+	../dynamic-docs/reserved-words/mysql-5.0.44 \
+	../dynamic-docs/reserved-words/mysql-5.0.44sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.45 \
+	../dynamic-docs/reserved-words/mysql-5.0.46 \
+	../dynamic-docs/reserved-words/mysql-5.0.48 \
+	../dynamic-docs/reserved-words/mysql-5.0.50 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.50sp1a \
+	../dynamic-docs/reserved-words/mysql-5.0.51 \
+	../dynamic-docs/reserved-words/mysql-5.0.51a \
+	../dynamic-docs/reserved-words/mysql-5.0.51b \
+	../dynamic-docs/reserved-words/mysql-5.0.52 \
+	../dynamic-docs/reserved-words/mysql-5.0.54 \
+	../dynamic-docs/reserved-words/mysql-5.0.54a \
+	../dynamic-docs/reserved-words/mysql-5.0.56 \
+	../dynamic-docs/reserved-words/mysql-5.0.56sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.58 \
+	../dynamic-docs/reserved-words/mysql-5.0.6-beta \
+	../dynamic-docs/reserved-words/mysql-5.0.60 \
+	../dynamic-docs/reserved-words/mysql-5.0.60sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.62 \
+	../dynamic-docs/reserved-words/mysql-5.0.64 \
+	../dynamic-docs/reserved-words/mysql-5.0.66 \
+	../dynamic-docs/reserved-words/mysql-5.0.66a \
+	../dynamic-docs/reserved-words/mysql-5.0.66sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.67 \
+	../dynamic-docs/reserved-words/mysql-5.0.68 \
+	../dynamic-docs/reserved-words/mysql-5.0.70 \
+	../dynamic-docs/reserved-words/mysql-5.0.72 \
+	../dynamic-docs/reserved-words/mysql-5.0.72sp1 \
+	../dynamic-docs/reserved-words/mysql-5.0.74 \
+	../dynamic-docs/reserved-words/mysql-5.0.75 \
+	../dynamic-docs/reserved-words/mysql-5.0.76 \
+	../dynamic-docs/reserved-words/mysql-5.0.77 \
+	../dynamic-docs/reserved-words/mysql-5.0.78 \
+	../dynamic-docs/reserved-words/mysql-5.0.79 \
+	../dynamic-docs/reserved-words/mysql-5.0.80 \
+	../dynamic-docs/reserved-words/mysql-5.0.81 \
+	../dynamic-docs/reserved-words/mysql-5.0.82 \
+	../dynamic-docs/reserved-words/mysql-5.0.83 \
+	../dynamic-docs/reserved-words/mysql-5.0.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/storage-engines/engines.xml \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \

@@ -421,9 +421,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -473,7 +470,11 @@
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -860,6 +861,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -1041,6 +1044,7 @@
 	../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-2.1/metadata/dashboard-whatsnew.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 \

@@ -1193,20 +1197,17 @@
 manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 
 monitor_refman_chapter_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../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 \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -1254,7 +1255,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -1326,6 +1331,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -1379,20 +1386,17 @@
 monitor-refman-chapter-base-remprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
 
 monitor_refman_chapter_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../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 \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -1440,7 +1444,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -1512,6 +1520,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -1552,10 +1562,10 @@
 news-5.1-maria-core-remprepped.xml: $(news_5_1_maria_core_SOURCES) $(news_5_1_maria_core_IDMAPS)
 
 news_monitor_2_0_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1604,10 +1614,10 @@
 news-monitor-2.0-base-remprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
 
 news_monitor_2_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1630,30 +1640,30 @@
 news-monitor-2.0-remprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
 
 news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -1725,16 +1735,16 @@
 se-maria-core-remprepped.xml: $(se_maria_core_SOURCES) $(se_maria_core_IDMAPS)
 
 storage_engines_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -1815,7 +1825,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../../mysqldoc/dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent all-entities.ent news-monitor-2.0-aspec.xml ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
+news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent all-entities.ent news-monitor-2.0-aspec.xml ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
 	$(MAKE) news-monitor-2.0.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1825,7 +1835,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-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.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-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/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-u!
 sers.png ../mysql-monitor-2.0/images/published/agent-install-w!
 in3.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/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 mon!
 itor-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/dynsel-default-monitor-dashboard-configure.xml ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap ../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/metadata/install-upgrades.idmap ../mysql-monitor-common/imag!
 es/published/mem-settings-global.png ../mysql-monitor-2.0/imag!
 es/publi
shed/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 ../../mysqldoc/dynamic-docs/faq/monitor.xml ../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 ../mysq!
 l-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/metadata/dynsel-default-monitor-dashboard-events.idmap ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-query-analysis.idmap ../mysql-!
 monitor-2.0/metadata/install-postinstall.idmap ../mysql-monito!
 r-2.0/dy
nsel-default-monitor-dashboard-events.xml ../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-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 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-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.1/images/published/mem-settings-global.png ../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 ../dynamic-docs/faq/monitor.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor-2.0/metadata/install-postins!
 tall.idmap ../mysql-monitor-2.0/install-agent.xml ../mysql-mon!
 itor-2.0
/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-osx4.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-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-5.4/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 1, Lines Added: 5024, Lines Deleted: 0; 270709 bytes

@@ -0,0 +1,5024 @@
+apis_c_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+apis_c_IMAGES =
+apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
+apis_c_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis-libmysqld.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-development.idmap \
+	metadata/programs-using.idmap \
+	metadata/programs.idmap \
+	metadata/sql-syntax-prepared-statements.idmap
+apis-c.validpure: $(apis_c_SOURCES)
+apis-c.titles: $(apis_c_SOURCES)
+apis-c.useless: $(apis_c_SOURCES)
+apis-c.valid: $(apis_c_SOURCES) $(apis_c_IDMAPS)
+apis-c.validwarn: $(apis_c_SOURCES) $(apis_c_IDMAPS)
+apis-c-prepped.xml: $(apis_c_SOURCES) $(apis_c_IDMAPS)
+apis-c-manprepped.xml: $(apis_c_SOURCES) $(apis_c_IDMAPS)
+apis-c-remprepped.xml: $(apis_c_SOURCES) $(apis_c_IDMAPS)
+
+apis_libmysqld_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+apis_libmysqld_IMAGES =
+apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES)
+apis_libmysqld_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/installing-core.idmap \
+	metadata/programs-using.idmap
+apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
+apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
+apis-libmysqld.useless: $(apis_libmysqld_SOURCES)
+apis-libmysqld.valid: $(apis_libmysqld_SOURCES) $(apis_libmysqld_IDMAPS)
+apis-libmysqld.validwarn: $(apis_libmysqld_SOURCES) $(apis_libmysqld_IDMAPS)
+apis-libmysqld-prepped.xml: $(apis_libmysqld_SOURCES) $(apis_libmysqld_IDMAPS)
+apis-libmysqld-manprepped.xml: $(apis_libmysqld_SOURCES) $(apis_libmysqld_IDMAPS)
+apis-libmysqld-remprepped.xml: $(apis_libmysqld_SOURCES) $(apis_libmysqld_IDMAPS)
+
+backup_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+backup_IMAGES =
+backup_SOURCES = backup.xml $(backup_INCLUDES)
+backup_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-common/metadata/ha.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax.idmap
+backup.validpure: $(backup_SOURCES)
+backup.titles: $(backup_SOURCES)
+backup.useless: $(backup_SOURCES)
+backup.valid: $(backup_SOURCES) $(backup_IDMAPS)
+backup.validwarn: $(backup_SOURCES) $(backup_IDMAPS)
+backup-prepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
+backup-manprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
+backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
+
+connectors_apis_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../gui-common/gui-common.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/apis-cplusplus.xml \
+	../refman-common/apis-eiffel.xml \
+	../refman-common/apis-perl.xml \
+	../refman-common/apis-php-mysql.xml \
+	../refman-common/apis-php-mysqli.xml \
+	../refman-common/apis-php-pdo-mysql.xml \
+	../refman-common/apis-php.xml \
+	../refman-common/apis-python.xml \
+	../refman-common/apis-ruby.xml \
+	../refman-common/apis-tcl.xml \
+	../refman-common/connector-c-core.xml \
+	../refman-common/connector-cpp-core.xml \
+	../refman-common/connector-j-connprops.xml \
+	../refman-common/connector-j-errormap.xml \
+	../refman-common/connector-j.xml \
+	../refman-common/connector-mxj.xml \
+	../refman-common/connector-net-core.xml \
+	../refman-common/connector-net-install.xml \
+	../refman-common/connector-net-programming-connection-options.xml \
+	../refman-common/connector-net-programming-tutorial.xml \
+	../refman-common/connector-net-programming.xml \
+	../refman-common/connector-net-ref.xml \
+	../refman-common/connector-net-support.xml \
+	../refman-common/connector-net-versions.xml \
+	../refman-common/connector-net-visual-studio.xml \
+	../refman-common/connector-odbc.xml \
+	../refman-common/connector-ooo.xml \
+	../refman-common/connector-vstudioplugin.xml \
+	../refman-common/images/published/cmxj-overview.png \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
+	../refman-common/images/published/connector-ooo-add-extension.png \
+	../refman-common/images/published/connector-ooo-base.png \
+	../refman-common/images/published/connector-ooo-dbwizard1.png \
+	../refman-common/images/published/connector-ooo-dbwizard2.png \
+	../refman-common/images/published/connector-ooo-user-authentication-credentials.png \
+	../refman-common/images/published/connector-ooo-user-authentication.png \
+	../refman-common/images/published/myaccess-odbc.png \
+	../refman-common/images/published/myaccess.png \
+	../refman-common/images/published/myarchitecture.png \
+	../refman-common/images/published/myflowchart.png \
+	../refman-common/images/published/myodbc-crystal-1.png \
+	../refman-common/images/published/myodbc-crystal-2.png \
+	../refman-common/images/published/myodbc-crystal-3.png \
+	../refman-common/images/published/myodbc-crystal-4.png \
+	../refman-common/images/published/myodbc-crystal-5.png \
+	../refman-common/images/published/myodbc-crystal-6.png \
+	../refman-common/images/published/myodbc-excel-step1.png \
+	../refman-common/images/published/myodbc-excel-step2.png \
+	../refman-common/images/published/myodbc-excel-step3.png \
+	../refman-common/images/published/myodbc-excel-step4.png \
+	../refman-common/images/published/myodbc-excel-step5.png \
+	../refman-common/images/published/myodbc-link-step1.png \
+	../refman-common/images/published/myodbc-link-step3.png \
+	../refman-common/images/published/myodbc-link-step4.png \
+	../refman-common/images/published/myodbc-link-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step1.png \
+	../refman-common/images/published/myodbc-macosx-install-step2.png \
+	../refman-common/images/published/myodbc-macosx-install-step3.png \
+	../refman-common/images/published/myodbc-macosx-install-step4.png \
+	../refman-common/images/published/myodbc-macosx-install-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step6.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
+	../refman-common/images/published/myodbc-win-install-step1.png \
+	../refman-common/images/published/myodbc-win-install-step2.png \
+	../refman-common/images/published/myodbc-win-install-step3.png \
+	../refman-common/images/published/myodbc-win-install-step4.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
+	../refman-common/images/published/myodbc-win-tracing.png \
+	../refman-common/images/published/mysql-vstudioplugin-1.png \
+	../refman-common/images/published/mysql-vstudioplugin-3.png \
+	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	apis-c.xml \
+	apis-libmysqld.xml \
+	dynxml-common-connector-c.xml \
+	dynxml-common-connector-cpp.xml \
+	dynxml-common-connector-net.xml \
+	versions.ent
+connectors_apis_IMAGES = \
+	../refman-common/images/published/cmxj-overview.png \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
+	../refman-common/images/published/connector-ooo-add-extension.png \
+	../refman-common/images/published/connector-ooo-base.png \
+	../refman-common/images/published/connector-ooo-dbwizard1.png \
+	../refman-common/images/published/connector-ooo-dbwizard2.png \
+	../refman-common/images/published/connector-ooo-user-authentication-credentials.png \
+	../refman-common/images/published/connector-ooo-user-authentication.png \
+	../refman-common/images/published/myaccess-odbc.png \
+	../refman-common/images/published/myaccess.png \
+	../refman-common/images/published/myarchitecture.png \
+	../refman-common/images/published/myflowchart.png \
+	../refman-common/images/published/myodbc-crystal-1.png \
+	../refman-common/images/published/myodbc-crystal-2.png \
+	../refman-common/images/published/myodbc-crystal-3.png \
+	../refman-common/images/published/myodbc-crystal-4.png \
+	../refman-common/images/published/myodbc-crystal-5.png \
+	../refman-common/images/published/myodbc-crystal-6.png \
+	../refman-common/images/published/myodbc-excel-step1.png \
+	../refman-common/images/published/myodbc-excel-step2.png \
+	../refman-common/images/published/myodbc-excel-step3.png \
+	../refman-common/images/published/myodbc-excel-step4.png \
+	../refman-common/images/published/myodbc-excel-step5.png \
+	../refman-common/images/published/myodbc-link-step1.png \
+	../refman-common/images/published/myodbc-link-step3.png \
+	../refman-common/images/published/myodbc-link-step4.png \
+	../refman-common/images/published/myodbc-link-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step1.png \
+	../refman-common/images/published/myodbc-macosx-install-step2.png \
+	../refman-common/images/published/myodbc-macosx-install-step3.png \
+	../refman-common/images/published/myodbc-macosx-install-step4.png \
+	../refman-common/images/published/myodbc-macosx-install-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step6.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
+	../refman-common/images/published/myodbc-win-install-step1.png \
+	../refman-common/images/published/myodbc-win-install-step2.png \
+	../refman-common/images/published/myodbc-win-install-step3.png \
+	../refman-common/images/published/myodbc-win-install-step4.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
+	../refman-common/images/published/myodbc-win-tracing.png \
+	../refman-common/images/published/mysql-vstudioplugin-1.png \
+	../refman-common/images/published/mysql-vstudioplugin-3.png \
+	../refman-common/images/published/mysql-vstudioplugin-4.png
+connectors_apis_SOURCES = connectors-apis.xml $(connectors_apis_INCLUDES)
+connectors_apis_IDMAPS = \
+	../refman-common/metadata/apis-cplusplus.idmap \
+	../refman-common/metadata/apis-eiffel.idmap \
+	../refman-common/metadata/apis-perl.idmap \
+	../refman-common/metadata/apis-php-mysql.idmap \
+	../refman-common/metadata/apis-php-mysqli.idmap \
+	../refman-common/metadata/apis-php-pdo-mysql.idmap \
+	../refman-common/metadata/apis-php.idmap \
+	../refman-common/metadata/apis-python.idmap \
+	../refman-common/metadata/apis-ruby.idmap \
+	../refman-common/metadata/apis-tcl.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/connector-c-core.idmap \
+	../refman-common/metadata/connector-cpp-core.idmap \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-mxj.idmap \
+	../refman-common/metadata/connector-net-core.idmap \
+	../refman-common/metadata/connector-net-install.idmap \
+	../refman-common/metadata/connector-net-programming-connection-options.idmap \
+	../refman-common/metadata/connector-net-programming-tutorial.idmap \
+	../refman-common/metadata/connector-net-programming.idmap \
+	../refman-common/metadata/connector-net-ref.idmap \
+	../refman-common/metadata/connector-net-support.idmap \
+	../refman-common/metadata/connector-net-visual-studio.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
+	../refman-common/metadata/news-cj-core.idmap \
+	../refman-common/metadata/news-cmxj-core.idmap \
+	../refman-common/metadata/news-cnet-core.idmap \
+	../refman-common/metadata/news-codbc-core.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis-libmysqld.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-development.idmap \
+	metadata/programs-using.idmap \
+	metadata/programs.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/sql-syntax-server-administration.idmap
+connectors-apis.validpure: $(connectors_apis_SOURCES)
+connectors-apis.titles: $(connectors_apis_SOURCES)
+connectors-apis.useless: $(connectors_apis_SOURCES)
+connectors-apis.valid: $(connectors_apis_SOURCES) $(connectors_apis_IDMAPS)
+connectors-apis.validwarn: $(connectors_apis_SOURCES) $(connectors_apis_IDMAPS)
+connectors-apis-prepped.xml: $(connectors_apis_SOURCES) $(connectors_apis_IDMAPS)
+connectors-apis-manprepped.xml: $(connectors_apis_SOURCES) $(connectors_apis_IDMAPS)
+connectors-apis-remprepped.xml: $(connectors_apis_SOURCES) $(connectors_apis_IDMAPS)
+
+data_types_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+data_types_IMAGES =
+data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
+data_types_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/storage-engines-core.idmap
+data-types.validpure: $(data_types_SOURCES)
+data-types.titles: $(data_types_SOURCES)
+data-types.useless: $(data_types_SOURCES)
+data-types.valid: $(data_types_SOURCES) $(data_types_IDMAPS)
+data-types.validwarn: $(data_types_SOURCES) $(data_types_IDMAPS)
+data-types-prepped.xml: $(data_types_SOURCES) $(data_types_IDMAPS)
+data-types-manprepped.xml: $(data_types_SOURCES) $(data_types_IDMAPS)
+data-types-remprepped.xml: $(data_types_SOURCES) $(data_types_IDMAPS)
+
+dba_dtrace_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	images/published/dtrace-groups.png \
+	versions.ent
+dba_dtrace_IMAGES = \
+	images/published/dtrace-groups.png
+dba_dtrace_SOURCES = dba-dtrace.xml $(dba_dtrace_INCLUDES)
+dba_dtrace_IDMAPS = \
+	metadata/dba-dtrace.idmap \
+	metadata/optimization.idmap
+dba-dtrace.validpure: $(dba_dtrace_SOURCES)
+dba-dtrace.titles: $(dba_dtrace_SOURCES)
+dba-dtrace.useless: $(dba_dtrace_SOURCES)
+dba-dtrace.valid: $(dba_dtrace_SOURCES) $(dba_dtrace_IDMAPS)
+dba-dtrace.validwarn: $(dba_dtrace_SOURCES) $(dba_dtrace_IDMAPS)
+dba-dtrace-prepped.xml: $(dba_dtrace_SOURCES) $(dba_dtrace_IDMAPS)
+dba-dtrace-manprepped.xml: $(dba_dtrace_SOURCES) $(dba_dtrace_IDMAPS)
+dba-dtrace-remprepped.xml: $(dba_dtrace_SOURCES) $(dba_dtrace_IDMAPS)
+
+dba_log_files_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dba_log_files_IMAGES =
+dba_log_files_SOURCES = dba-log-files.xml $(dba_log_files_INCLUDES)
+dba_log_files_IDMAPS = \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/replication.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+dba-log-files.validpure: $(dba_log_files_SOURCES)
+dba-log-files.titles: $(dba_log_files_SOURCES)
+dba-log-files.useless: $(dba_log_files_SOURCES)
+dba-log-files.valid: $(dba_log_files_SOURCES) $(dba_log_files_IDMAPS)
+dba-log-files.validwarn: $(dba_log_files_SOURCES) $(dba_log_files_IDMAPS)
+dba-log-files-prepped.xml: $(dba_log_files_SOURCES) $(dba_log_files_IDMAPS)
+dba-log-files-manprepped.xml: $(dba_log_files_SOURCES) $(dba_log_files_IDMAPS)
+dba-log-files-remprepped.xml: $(dba_log_files_SOURCES) $(dba_log_files_IDMAPS)
+
+dba_multiple_servers_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dba_multiple_servers_IMAGES =
+dba_multiple_servers_SOURCES = dba-multiple-servers.xml $(dba_multiple_servers_INCLUDES)
+dba_multiple_servers_IDMAPS = \
+	../refman-common/metadata/apis-perl.idmap \
+	metadata/apis-c.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/installing-core.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap
+dba-multiple-servers.validpure: $(dba_multiple_servers_SOURCES)
+dba-multiple-servers.titles: $(dba_multiple_servers_SOURCES)
+dba-multiple-servers.useless: $(dba_multiple_servers_SOURCES)
+dba-multiple-servers.valid: $(dba_multiple_servers_SOURCES) $(dba_multiple_servers_IDMAPS)
+dba-multiple-servers.validwarn: $(dba_multiple_servers_SOURCES) $(dba_multiple_servers_IDMAPS)
+dba-multiple-servers-prepped.xml: $(dba_multiple_servers_SOURCES) $(dba_multiple_servers_IDMAPS)
+dba-multiple-servers-manprepped.xml: $(dba_multiple_servers_SOURCES) $(dba_multiple_servers_IDMAPS)
+dba-multiple-servers-remprepped.xml: $(dba_multiple_servers_SOURCES) $(dba_multiple_servers_IDMAPS)
+
+dba_mysqld_server_core_INCLUDES =
+dba_mysqld_server_core_IMAGES =
+dba_mysqld_server_core_SOURCES = dba-mysqld-server-core.xml $(dba_mysqld_server_core_INCLUDES)
+dba_mysqld_server_core_IDMAPS =
+dba-mysqld-server-core.validpure: $(dba_mysqld_server_core_SOURCES)
+dba-mysqld-server-core.titles: $(dba_mysqld_server_core_SOURCES)
+dba-mysqld-server-core.useless: $(dba_mysqld_server_core_SOURCES)
+dba-mysqld-server-core.valid: $(dba_mysqld_server_core_SOURCES) $(dba_mysqld_server_core_IDMAPS)
+dba-mysqld-server-core.validwarn: $(dba_mysqld_server_core_SOURCES) $(dba_mysqld_server_core_IDMAPS)
+dba-mysqld-server-core-prepped.xml: $(dba_mysqld_server_core_SOURCES) $(dba_mysqld_server_core_IDMAPS)
+dba-mysqld-server-core-manprepped.xml: $(dba_mysqld_server_core_SOURCES) $(dba_mysqld_server_core_IDMAPS)
+dba-mysqld-server-core-remprepped.xml: $(dba_mysqld_server_core_SOURCES) $(dba_mysqld_server_core_IDMAPS)
+
+dba_privilege_system_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dba_privilege_system_IMAGES =
+dba_privilege_system_SOURCES = dba-privilege-system.xml $(dba_privilege_system_INCLUDES)
+dba_privilege_system_IDMAPS = \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-using.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+dba-privilege-system.validpure: $(dba_privilege_system_SOURCES)
+dba-privilege-system.titles: $(dba_privilege_system_SOURCES)
+dba-privilege-system.useless: $(dba_privilege_system_SOURCES)
+dba-privilege-system.valid: $(dba_privilege_system_SOURCES) $(dba_privilege_system_IDMAPS)
+dba-privilege-system.validwarn: $(dba_privilege_system_SOURCES) $(dba_privilege_system_IDMAPS)
+dba-privilege-system-prepped.xml: $(dba_privilege_system_SOURCES) $(dba_privilege_system_IDMAPS)
+dba-privilege-system-manprepped.xml: $(dba_privilege_system_SOURCES) $(dba_privilege_system_IDMAPS)
+dba-privilege-system-remprepped.xml: $(dba_privilege_system_SOURCES) $(dba_privilege_system_IDMAPS)
+
+dba_security_core_INCLUDES =
+dba_security_core_IMAGES =
+dba_security_core_SOURCES = dba-security-core.xml $(dba_security_core_INCLUDES)
+dba_security_core_IDMAPS =
+dba-security-core.validpure: $(dba_security_core_SOURCES)
+dba-security-core.titles: $(dba_security_core_SOURCES)
+dba-security-core.useless: $(dba_security_core_SOURCES)
+dba-security-core.valid: $(dba_security_core_SOURCES) $(dba_security_core_IDMAPS)
+dba-security-core.validwarn: $(dba_security_core_SOURCES) $(dba_security_core_IDMAPS)
+dba-security-core-prepped.xml: $(dba_security_core_SOURCES) $(dba_security_core_IDMAPS)
+dba-security-core-manprepped.xml: $(dba_security_core_SOURCES) $(dba_security_core_IDMAPS)
+dba-security-core-remprepped.xml: $(dba_security_core_SOURCES) $(dba_security_core_IDMAPS)
+
+dba_user_management_core_INCLUDES =
+dba_user_management_core_IMAGES =
+dba_user_management_core_SOURCES = dba-user-management-core.xml $(dba_user_management_core_INCLUDES)
+dba_user_management_core_IDMAPS =
+dba-user-management-core.validpure: $(dba_user_management_core_SOURCES)
+dba-user-management-core.titles: $(dba_user_management_core_SOURCES)
+dba-user-management-core.useless: $(dba_user_management_core_SOURCES)
+dba-user-management-core.valid: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
+dba-user-management-core.validwarn: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
+dba-user-management-core-prepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
+dba-user-management-core-manprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
+dba-user-management-core-remprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
+
+dba_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dba-dtrace.xml \
+	dba-log-files.xml \
+	dba-multiple-servers.xml \
+	dba-mysqld-server-core.xml \
+	dba-privilege-system.xml \
+	dba-security-core.xml \
+	dba-user-management-core.xml \
+	dynxml-local-dba-mysqld-server.xml \
+	dynxml-local-dba-security.xml \
+	dynxml-local-dba-user-management.xml \
+	images/published/dtrace-groups.png \
+	versions.ent
+dba_IMAGES = \
+	images/published/dtrace-groups.png
+dba_SOURCES = dba.xml $(dba_INCLUDES)
+dba_IDMAPS =
+dba.validpure: $(dba_SOURCES)
+dba.titles: $(dba_SOURCES)
+dba.useless: $(dba_SOURCES)
+dba.valid: $(dba_SOURCES) $(dba_IDMAPS)
+dba.validwarn: $(dba_SOURCES) $(dba_IDMAPS)
+dba-prepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
+dba-manprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
+dba-remprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
+
+dynxml_common_connector_c_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/connector-c-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_connector_c_IMAGES =
+dynxml_common_connector_c_SOURCES = dynxml-common-connector-c.xml $(dynxml_common_connector_c_INCLUDES)
+dynxml_common_connector_c_IDMAPS =
+dynxml-common-connector-c.validpure: $(dynxml_common_connector_c_SOURCES)
+dynxml-common-connector-c.titles: $(dynxml_common_connector_c_SOURCES)
+dynxml-common-connector-c.useless: $(dynxml_common_connector_c_SOURCES)
+dynxml-common-connector-c.valid: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
+dynxml-common-connector-c.validwarn: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
+dynxml-common-connector-c-prepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
+dynxml-common-connector-c-manprepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
+dynxml-common-connector-c-remprepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
+dynxml-common-connector-c.xml: $(dynxml_common_connector_c_INCLUDES)
+dynxml_common_connector_cpp_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/connector-cpp-core.xml \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_connector_cpp_IMAGES = \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png
+dynxml_common_connector_cpp_SOURCES = dynxml-common-connector-cpp.xml $(dynxml_common_connector_cpp_INCLUDES)
+dynxml_common_connector_cpp_IDMAPS = \
+	../refman-common/metadata/connector-cpp-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap
+dynxml-common-connector-cpp.validpure: $(dynxml_common_connector_cpp_SOURCES)
+dynxml-common-connector-cpp.titles: $(dynxml_common_connector_cpp_SOURCES)
+dynxml-common-connector-cpp.useless: $(dynxml_common_connector_cpp_SOURCES)
+dynxml-common-connector-cpp.valid: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
+dynxml-common-connector-cpp.validwarn: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
+dynxml-common-connector-cpp-prepped.xml: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
+dynxml-common-connector-cpp-manprepped.xml: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
+dynxml-common-connector-cpp-remprepped.xml: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
+dynxml-common-connector-cpp.xml: $(dynxml_common_connector_cpp_INCLUDES)
+dynxml_common_connector_net_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
+	../gui-common/gui-common.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/connector-net-core.xml \
+	../refman-common/connector-net-install.xml \
+	../refman-common/connector-net-programming-connection-options.xml \
+	../refman-common/connector-net-programming-tutorial.xml \
+	../refman-common/connector-net-programming.xml \
+	../refman-common/connector-net-ref.xml \
+	../refman-common/connector-net-support.xml \
+	../refman-common/connector-net-versions.xml \
+	../refman-common/connector-net-visual-studio.xml \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_connector_net_IMAGES = \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png
+dynxml_common_connector_net_SOURCES = dynxml-common-connector-net.xml $(dynxml_common_connector_net_INCLUDES)
+dynxml_common_connector_net_IDMAPS = \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/connector-net-install.idmap \
+	../refman-common/metadata/connector-net-programming-connection-options.idmap \
+	../refman-common/metadata/connector-net-programming-tutorial.idmap \
+	../refman-common/metadata/connector-net-programming.idmap \
+	../refman-common/metadata/connector-net-ref.idmap \
+	../refman-common/metadata/connector-net-support.idmap \
+	../refman-common/metadata/connector-net-visual-studio.idmap \
+	../refman-common/metadata/news-cnet-core.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap
+dynxml-common-connector-net.validpure: $(dynxml_common_connector_net_SOURCES)
+dynxml-common-connector-net.titles: $(dynxml_common_connector_net_SOURCES)
+dynxml-common-connector-net.useless: $(dynxml_common_connector_net_SOURCES)
+dynxml-common-connector-net.valid: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
+dynxml-common-connector-net.validwarn: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
+dynxml-common-connector-net-prepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
+dynxml-common-connector-net-manprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
+dynxml-common-connector-net-remprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
+dynxml-common-connector-net.xml: $(dynxml_common_connector_net_INCLUDES)
+dynxml_common_news_ccpp_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-ccpp-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_ccpp_IMAGES =
+dynxml_common_news_ccpp_SOURCES = dynxml-common-news-ccpp.xml $(dynxml_common_news_ccpp_INCLUDES)
+dynxml_common_news_ccpp_IDMAPS =
+dynxml-common-news-ccpp.validpure: $(dynxml_common_news_ccpp_SOURCES)
+dynxml-common-news-ccpp.titles: $(dynxml_common_news_ccpp_SOURCES)
+dynxml-common-news-ccpp.useless: $(dynxml_common_news_ccpp_SOURCES)
+dynxml-common-news-ccpp.valid: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
+dynxml-common-news-ccpp.validwarn: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
+dynxml-common-news-ccpp-prepped.xml: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
+dynxml-common-news-ccpp-manprepped.xml: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
+dynxml-common-news-ccpp-remprepped.xml: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
+dynxml-common-news-ccpp.xml: $(dynxml_common_news_ccpp_INCLUDES)
+dynxml_common_news_cj_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-cj-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_cj_IMAGES =
+dynxml_common_news_cj_SOURCES = dynxml-common-news-cj.xml $(dynxml_common_news_cj_INCLUDES)
+dynxml_common_news_cj_IDMAPS =
+dynxml-common-news-cj.validpure: $(dynxml_common_news_cj_SOURCES)
+dynxml-common-news-cj.titles: $(dynxml_common_news_cj_SOURCES)
+dynxml-common-news-cj.useless: $(dynxml_common_news_cj_SOURCES)
+dynxml-common-news-cj.valid: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
+dynxml-common-news-cj.validwarn: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
+dynxml-common-news-cj-prepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
+dynxml-common-news-cj-manprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
+dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
+dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
+dynxml_common_news_cmxj_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-cmxj-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_cmxj_IMAGES =
+dynxml_common_news_cmxj_SOURCES = dynxml-common-news-cmxj.xml $(dynxml_common_news_cmxj_INCLUDES)
+dynxml_common_news_cmxj_IDMAPS =
+dynxml-common-news-cmxj.validpure: $(dynxml_common_news_cmxj_SOURCES)
+dynxml-common-news-cmxj.titles: $(dynxml_common_news_cmxj_SOURCES)
+dynxml-common-news-cmxj.useless: $(dynxml_common_news_cmxj_SOURCES)
+dynxml-common-news-cmxj.valid: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
+dynxml-common-news-cmxj.validwarn: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
+dynxml-common-news-cmxj-prepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
+dynxml-common-news-cmxj-manprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
+dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
+dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
+dynxml_common_news_cnet_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-cnet-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_cnet_IMAGES =
+dynxml_common_news_cnet_SOURCES = dynxml-common-news-cnet.xml $(dynxml_common_news_cnet_INCLUDES)
+dynxml_common_news_cnet_IDMAPS =
+dynxml-common-news-cnet.validpure: $(dynxml_common_news_cnet_SOURCES)
+dynxml-common-news-cnet.titles: $(dynxml_common_news_cnet_SOURCES)
+dynxml-common-news-cnet.useless: $(dynxml_common_news_cnet_SOURCES)
+dynxml-common-news-cnet.valid: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
+dynxml-common-news-cnet.validwarn: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
+dynxml-common-news-cnet-prepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
+dynxml-common-news-cnet-manprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
+dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
+dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
+dynxml_common_news_codbc_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-codbc-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_codbc_IMAGES =
+dynxml_common_news_codbc_SOURCES = dynxml-common-news-codbc.xml $(dynxml_common_news_codbc_INCLUDES)
+dynxml_common_news_codbc_IDMAPS = \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/news-codbc-core.idmap
+dynxml-common-news-codbc.validpure: $(dynxml_common_news_codbc_SOURCES)
+dynxml-common-news-codbc.titles: $(dynxml_common_news_codbc_SOURCES)
+dynxml-common-news-codbc.useless: $(dynxml_common_news_codbc_SOURCES)
+dynxml-common-news-codbc.valid: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
+dynxml-common-news-codbc.validwarn: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
+dynxml-common-news-codbc-prepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
+dynxml-common-news-codbc-manprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
+dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
+dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
+dynxml_common_news_mysql_proxy_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-mysql-proxy-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_mysql_proxy_IMAGES =
+dynxml_common_news_mysql_proxy_SOURCES = dynxml-common-news-mysql-proxy.xml $(dynxml_common_news_mysql_proxy_INCLUDES)
+dynxml_common_news_mysql_proxy_IDMAPS =
+dynxml-common-news-mysql-proxy.validpure: $(dynxml_common_news_mysql_proxy_SOURCES)
+dynxml-common-news-mysql-proxy.titles: $(dynxml_common_news_mysql_proxy_SOURCES)
+dynxml-common-news-mysql-proxy.useless: $(dynxml_common_news_mysql_proxy_SOURCES)
+dynxml-common-news-mysql-proxy.valid: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
+dynxml-common-news-mysql-proxy.validwarn: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
+dynxml-common-news-mysql-proxy-prepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
+dynxml-common-news-mysql-proxy-manprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
+dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
+dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
+dynxml_common_news_vstudioplugin_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-vstudioplugin-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+dynxml_common_news_vstudioplugin_IMAGES =
+dynxml_common_news_vstudioplugin_SOURCES = dynxml-common-news-vstudioplugin.xml $(dynxml_common_news_vstudioplugin_INCLUDES)
+dynxml_common_news_vstudioplugin_IDMAPS = \
+	../refman-common/metadata/news-cnet-core.idmap
+dynxml-common-news-vstudioplugin.validpure: $(dynxml_common_news_vstudioplugin_SOURCES)
+dynxml-common-news-vstudioplugin.titles: $(dynxml_common_news_vstudioplugin_SOURCES)
+dynxml-common-news-vstudioplugin.useless: $(dynxml_common_news_vstudioplugin_SOURCES)
+dynxml-common-news-vstudioplugin.valid: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
+dynxml-common-news-vstudioplugin.validwarn: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
+dynxml-common-news-vstudioplugin-prepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
+dynxml-common-news-vstudioplugin-manprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
+dynxml-common-news-vstudioplugin-remprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
+dynxml-common-news-vstudioplugin.xml: $(dynxml_common_news_vstudioplugin_INCLUDES)
+dynxml_local_dba_mysqld_server_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dba-mysqld-server-core.xml \
+	versions.ent
+dynxml_local_dba_mysqld_server_IMAGES =
+dynxml_local_dba_mysqld_server_SOURCES = dynxml-local-dba-mysqld-server.xml $(dynxml_local_dba_mysqld_server_INCLUDES)
+dynxml_local_dba_mysqld_server_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-programs-views.idmap
+dynxml-local-dba-mysqld-server.validpure: $(dynxml_local_dba_mysqld_server_SOURCES)
+dynxml-local-dba-mysqld-server.titles: $(dynxml_local_dba_mysqld_server_SOURCES)
+dynxml-local-dba-mysqld-server.useless: $(dynxml_local_dba_mysqld_server_SOURCES)
+dynxml-local-dba-mysqld-server.valid: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
+dynxml-local-dba-mysqld-server.validwarn: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
+dynxml-local-dba-mysqld-server-prepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
+dynxml-local-dba-mysqld-server-manprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
+dynxml-local-dba-mysqld-server-remprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
+dynxml-local-dba-mysqld-server.xml: $(dynxml_local_dba_mysqld_server_INCLUDES)
+dynxml_local_dba_security_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dba-security-core.xml \
+	versions.ent
+dynxml_local_dba_security_IMAGES =
+dynxml_local_dba_security_SOURCES = dynxml-local-dba-security.xml $(dynxml_local_dba_security_INCLUDES)
+dynxml_local_dba_security_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
+	metadata/installing-core.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-dba-security.validpure: $(dynxml_local_dba_security_SOURCES)
+dynxml-local-dba-security.titles: $(dynxml_local_dba_security_SOURCES)
+dynxml-local-dba-security.useless: $(dynxml_local_dba_security_SOURCES)
+dynxml-local-dba-security.valid: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
+dynxml-local-dba-security.validwarn: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
+dynxml-local-dba-security-prepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
+dynxml-local-dba-security-manprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
+dynxml-local-dba-security-remprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
+dynxml-local-dba-security.xml: $(dynxml_local_dba_security_INCLUDES)
+dynxml_local_dba_user_management_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dba-user-management-core.xml \
+	versions.ent
+dynxml_local_dba_user_management_IMAGES =
+dynxml_local_dba_user_management_SOURCES = dynxml-local-dba-user-management.xml $(dynxml_local_dba_user_management_INCLUDES)
+dynxml_local_dba_user_management_IDMAPS = \
+	../refman-common/metadata/apis-php.idmap \
+	metadata/apis-c.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-dba-user-management.validpure: $(dynxml_local_dba_user_management_SOURCES)
+dynxml-local-dba-user-management.titles: $(dynxml_local_dba_user_management_SOURCES)
+dynxml-local-dba-user-management.useless: $(dynxml_local_dba_user_management_SOURCES)
+dynxml-local-dba-user-management.valid: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
+dynxml-local-dba-user-management.validwarn: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
+dynxml-local-dba-user-management-prepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
+dynxml-local-dba-user-management-manprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
+dynxml-local-dba-user-management-remprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
+dynxml-local-dba-user-management.xml: $(dynxml_local_dba_user_management_INCLUDES)
+dynxml_local_errors_problems_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	errmsgs-client.xml \
+	errmsgs-server.xml \
+	errors-problems-core.xml \
+	versions.ent
+dynxml_local_errors_problems_IMAGES =
+dynxml_local_errors_problems_SOURCES = dynxml-local-errors-problems.xml $(dynxml_local_errors_problems_INCLUDES)
+dynxml_local_errors_problems_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/apis-c.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-notes.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-merge.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/tutorial.idmap
+dynxml-local-errors-problems.validpure: $(dynxml_local_errors_problems_SOURCES)
+dynxml-local-errors-problems.titles: $(dynxml_local_errors_problems_SOURCES)
+dynxml-local-errors-problems.useless: $(dynxml_local_errors_problems_SOURCES)
+dynxml-local-errors-problems.valid: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
+dynxml-local-errors-problems.validwarn: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
+dynxml-local-errors-problems-prepped.xml: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
+dynxml-local-errors-problems-manprepped.xml: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
+dynxml-local-errors-problems-remprepped.xml: $(dynxml_local_errors_problems_SOURCES) $(dynxml_local_errors_problems_IDMAPS)
+dynxml-local-errors-problems.xml: $(dynxml_local_errors_problems_INCLUDES)
+dynxml_local_functions_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	functions-core.xml \
+	precision-math.xml \
+	spatial-extensions.xml \
+	versions.ent
+dynxml_local_functions_IMAGES =
+dynxml_local_functions_SOURCES = dynxml-local-functions.xml $(dynxml_local_functions_INCLUDES)
+dynxml_local_functions_IDMAPS = \
+	../refman-common/metadata/credits.idmap \
+	metadata/apis-c.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/stored-routines.idmap \
+	metadata/tutorial.idmap
+dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
+dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
+dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)
+dynxml-local-functions.valid: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
+dynxml-local-functions.validwarn: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
+dynxml-local-functions-prepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
+dynxml-local-functions-manprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
+dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
+dynxml-local-functions.xml: $(dynxml_local_functions_INCLUDES)
+dynxml_local_installing_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	images/published/mysql-cfg-fig1.png \
+	images/published/mysql-cfg-fig10.png \
+	images/published/mysql-cfg-fig2.png \
+	images/published/mysql-cfg-fig3.png \
+	images/published/mysql-cfg-fig4.png \
+	images/published/mysql-cfg-fig5.png \
+	images/published/mysql-cfg-fig6.png \
+	images/published/mysql-cfg-fig7.png \
+	images/published/mysql-cfg-fig8.png \
+	images/published/mysql-cfg-fig9.png \
+	installing-core.xml \
+	versions.ent
+dynxml_local_installing_IMAGES = \
+	images/published/mysql-cfg-fig1.png \
+	images/published/mysql-cfg-fig10.png \
+	images/published/mysql-cfg-fig2.png \
+	images/published/mysql-cfg-fig3.png \
+	images/published/mysql-cfg-fig4.png \
+	images/published/mysql-cfg-fig5.png \
+	images/published/mysql-cfg-fig6.png \
+	images/published/mysql-cfg-fig7.png \
+	images/published/mysql-cfg-fig8.png \
+	images/published/mysql-cfg-fig9.png
+dynxml_local_installing_SOURCES = dynxml-local-installing.xml $(dynxml_local_installing_INCLUDES)
+dynxml_local_installing_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	../refman-5.1/metadata/mysql-cluster-programs-core.idmap \
+	../refman-5.1/metadata/news-5.1-core.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/connector-net-core.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/apis-c.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
+dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
+dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)
+dynxml-local-installing.valid: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
+dynxml-local-installing.validwarn: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
+dynxml-local-installing-prepped.xml: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
+dynxml-local-installing-manprepped.xml: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
+dynxml-local-installing-remprepped.xml: $(dynxml_local_installing_SOURCES) $(dynxml_local_installing_IDMAPS)
+dynxml-local-installing.xml: $(dynxml_local_installing_INCLUDES)
+dynxml_local_language_structure_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.0-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.1-beta \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	language-structure-core.xml \
+	versions.ent
+dynxml_local_language_structure_IMAGES =
+dynxml_local_language_structure_SOURCES = dynxml-local-language-structure.xml $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_language_structure_IDMAPS = \
+	../quick-guides/metadata/reservedwords-core.idmap \
+	../refman-common/metadata/apis-perl.idmap \
+	metadata/apis-c.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-prepared-statements.idmap
+dynxml-local-language-structure.validpure: $(dynxml_local_language_structure_SOURCES)
+dynxml-local-language-structure.titles: $(dynxml_local_language_structure_SOURCES)
+dynxml-local-language-structure.useless: $(dynxml_local_language_structure_SOURCES)
+dynxml-local-language-structure.valid: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
+dynxml-local-language-structure.validwarn: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
+dynxml-local-language-structure-prepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
+dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
+dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
+dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_news_5_4_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	news-5.4-core.xml \
+	versions.ent
+dynxml_local_news_5_4_IMAGES =
+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/introduction.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)
+dynxml-local-news-5.4.useless: $(dynxml_local_news_5_4_SOURCES)
+dynxml-local-news-5.4.valid: $(dynxml_local_news_5_4_SOURCES) $(dynxml_local_news_5_4_IDMAPS)
+dynxml-local-news-5.4.validwarn: $(dynxml_local_news_5_4_SOURCES) $(dynxml_local_news_5_4_IDMAPS)
+dynxml-local-news-5.4-prepped.xml: $(dynxml_local_news_5_4_SOURCES) $(dynxml_local_news_5_4_IDMAPS)
+dynxml-local-news-5.4-manprepped.xml: $(dynxml_local_news_5_4_SOURCES) $(dynxml_local_news_5_4_IDMAPS)
+dynxml-local-news-5.4-remprepped.xml: $(dynxml_local_news_5_4_SOURCES) $(dynxml_local_news_5_4_IDMAPS)
+dynxml-local-news-5.4.xml: $(dynxml_local_news_5_4_INCLUDES)
+dynxml_local_programs_admin_util_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	programs-admin-util-core.xml \
+	versions.ent
+dynxml_local_programs_admin_util_IMAGES =
+dynxml_local_programs_admin_util_SOURCES = dynxml-local-programs-admin-util.xml $(dynxml_local_programs_admin_util_INCLUDES)
+dynxml_local_programs_admin_util_IDMAPS = \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-programs-admin-util.validpure: $(dynxml_local_programs_admin_util_SOURCES)
+dynxml-local-programs-admin-util.titles: $(dynxml_local_programs_admin_util_SOURCES)
+dynxml-local-programs-admin-util.useless: $(dynxml_local_programs_admin_util_SOURCES)
+dynxml-local-programs-admin-util.valid: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
+dynxml-local-programs-admin-util.validwarn: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
+dynxml-local-programs-admin-util-prepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
+dynxml-local-programs-admin-util-manprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
+dynxml-local-programs-admin-util-remprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
+dynxml-local-programs-admin-util.xml: $(dynxml_local_programs_admin_util_INCLUDES)
+dynxml_local_programs_client_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	programs-client-core.xml \
+	versions.ent
+dynxml_local_programs_client_IMAGES =
+dynxml_local_programs_client_SOURCES = dynxml-local-programs-client.xml $(dynxml_local_programs_client_INCLUDES)
+dynxml_local_programs_client_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/events.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/tutorial.idmap
+dynxml-local-programs-client.validpure: $(dynxml_local_programs_client_SOURCES)
+dynxml-local-programs-client.titles: $(dynxml_local_programs_client_SOURCES)
+dynxml-local-programs-client.useless: $(dynxml_local_programs_client_SOURCES)
+dynxml-local-programs-client.valid: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
+dynxml-local-programs-client.validwarn: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
+dynxml-local-programs-client-prepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
+dynxml-local-programs-client-manprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
+dynxml-local-programs-client-remprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
+dynxml-local-programs-client.xml: $(dynxml_local_programs_client_INCLUDES)
+dynxml_local_programs_server_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	programs-server-core.xml \
+	versions.ent
+dynxml_local_programs_server_IMAGES =
+dynxml_local_programs_server_SOURCES = dynxml-local-programs-server.xml $(dynxml_local_programs_server_INCLUDES)
+dynxml_local_programs_server_IDMAPS = \
+	metadata/dba-log-files.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap
+dynxml-local-programs-server.validpure: $(dynxml_local_programs_server_SOURCES)
+dynxml-local-programs-server.titles: $(dynxml_local_programs_server_SOURCES)
+dynxml-local-programs-server.useless: $(dynxml_local_programs_server_SOURCES)
+dynxml-local-programs-server.valid: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
+dynxml-local-programs-server.validwarn: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
+dynxml-local-programs-server-prepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
+dynxml-local-programs-server-manprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
+dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
+dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
+dynxml_local_quickref_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	quickref-core.xml \
+	versions.ent
+dynxml_local_quickref_IMAGES =
+dynxml_local_quickref_SOURCES = dynxml-local-quickref.xml $(dynxml_local_quickref_INCLUDES)
+dynxml_local_quickref_IDMAPS = \
+	../refman-common/metadata/apis-php.idmap \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-net-core.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/ha-drbd.idmap \
+	../refman-common/metadata/ha-memcached-core.idmap \
+	../refman-common/metadata/ha-vm.idmap \
+	../refman-common/metadata/mysql-proxy-core.idmap \
+	metadata/apis-c.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/replication.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-routines.idmap \
+	metadata/tutorial.idmap \
+	metadata/views.idmap
+dynxml-local-quickref.validpure: $(dynxml_local_quickref_SOURCES)
+dynxml-local-quickref.titles: $(dynxml_local_quickref_SOURCES)
+dynxml-local-quickref.useless: $(dynxml_local_quickref_SOURCES)
+dynxml-local-quickref.valid: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
+dynxml-local-quickref.validwarn: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
+dynxml-local-quickref-prepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
+dynxml-local-quickref-manprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
+dynxml-local-quickref-remprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
+dynxml-local-quickref.xml: $(dynxml_local_quickref_INCLUDES)
+dynxml_local_replication_options_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	replication-options-core.xml \
+	versions.ent
+dynxml_local_replication_options_IMAGES =
+dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)
+dynxml_local_replication_options_IDMAPS = \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+dynxml-local-replication-options.validpure: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.titles: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.useless: $(dynxml_local_replication_options_SOURCES)
+dynxml-local-replication-options.valid: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.validwarn: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-prepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-manprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
+dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
+dynxml_local_se_archive_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	se-archive-core.xml \
+	versions.ent
+dynxml_local_se_archive_IMAGES =
+dynxml_local_se_archive_SOURCES = dynxml-local-se-archive.xml $(dynxml_local_se_archive_INCLUDES)
+dynxml_local_se_archive_IDMAPS = \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-se-archive.validpure: $(dynxml_local_se_archive_SOURCES)
+dynxml-local-se-archive.titles: $(dynxml_local_se_archive_SOURCES)
+dynxml-local-se-archive.useless: $(dynxml_local_se_archive_SOURCES)
+dynxml-local-se-archive.valid: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
+dynxml-local-se-archive.validwarn: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
+dynxml-local-se-archive-prepped.xml: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
+dynxml-local-se-archive-manprepped.xml: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
+dynxml-local-se-archive-remprepped.xml: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
+dynxml-local-se-archive.xml: $(dynxml_local_se_archive_INCLUDES)
+dynxml_local_se_db2_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	se-db2-core.xml \
+	versions.ent
+dynxml_local_se_db2_IMAGES =
+dynxml_local_se_db2_SOURCES = dynxml-local-se-db2.xml $(dynxml_local_se_db2_INCLUDES)
+dynxml_local_se_db2_IDMAPS = \
+	metadata/se-db2-core.idmap
+dynxml-local-se-db2.validpure: $(dynxml_local_se_db2_SOURCES)
+dynxml-local-se-db2.titles: $(dynxml_local_se_db2_SOURCES)
+dynxml-local-se-db2.useless: $(dynxml_local_se_db2_SOURCES)
+dynxml-local-se-db2.valid: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
+dynxml-local-se-db2.validwarn: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
+dynxml-local-se-db2-prepped.xml: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
+dynxml-local-se-db2-manprepped.xml: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
+dynxml-local-se-db2-remprepped.xml: $(dynxml_local_se_db2_SOURCES) $(dynxml_local_se_db2_IDMAPS)
+dynxml-local-se-db2.xml: $(dynxml_local_se_db2_INCLUDES)
+dynxml_local_se_innodb_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	se-innodb-core.xml \
+	versions.ent
+dynxml_local_se_innodb_IMAGES =
+dynxml_local_se_innodb_SOURCES = dynxml-local-se-innodb.xml $(dynxml_local_se_innodb_INCLUDES)
+dynxml_local_se_innodb_IDMAPS = \
+	../refman-4.1/metadata/installing.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/introduction.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-using.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap
+dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
+dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
+dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)
+dynxml-local-se-innodb.valid: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
+dynxml-local-se-innodb.validwarn: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
+dynxml-local-se-innodb-prepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
+dynxml-local-se-innodb-manprepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
+dynxml-local-se-innodb-remprepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
+dynxml-local-se-innodb.xml: $(dynxml_local_se_innodb_INCLUDES)
+dynxml_local_se_memory_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	se-memory-core.xml \
+	versions.ent
+dynxml_local_se_memory_IMAGES =
+dynxml_local_se_memory_SOURCES = dynxml-local-se-memory.xml $(dynxml_local_se_memory_INCLUDES)
+dynxml_local_se_memory_IDMAPS = \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax-data-manipulation.idmap
+dynxml-local-se-memory.validpure: $(dynxml_local_se_memory_SOURCES)
+dynxml-local-se-memory.titles: $(dynxml_local_se_memory_SOURCES)
+dynxml-local-se-memory.useless: $(dynxml_local_se_memory_SOURCES)
+dynxml-local-se-memory.valid: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
+dynxml-local-se-memory.validwarn: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
+dynxml-local-se-memory-prepped.xml: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
+dynxml-local-se-memory-manprepped.xml: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
+dynxml-local-se-memory-remprepped.xml: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
+dynxml-local-se-memory.xml: $(dynxml_local_se_memory_INCLUDES)
+dynxml_local_se_myisam_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	se-myisam-core.xml \
+	versions.ent
+dynxml_local_se_myisam_IMAGES =
+dynxml_local_se_myisam_SOURCES = dynxml-local-se-myisam.xml $(dynxml_local_se_myisam_INCLUDES)
+dynxml_local_se_myisam_IDMAPS = \
+	metadata/backup.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap
+dynxml-local-se-myisam.validpure: $(dynxml_local_se_myisam_SOURCES)
+dynxml-local-se-myisam.titles: $(dynxml_local_se_myisam_SOURCES)
+dynxml-local-se-myisam.useless: $(dynxml_local_se_myisam_SOURCES)
+dynxml-local-se-myisam.valid: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
+dynxml-local-se-myisam.validwarn: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
+dynxml-local-se-myisam-prepped.xml: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
+dynxml-local-se-myisam-manprepped.xml: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
+dynxml-local-se-myisam-remprepped.xml: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
+dynxml-local-se-myisam.xml: $(dynxml_local_se_myisam_INCLUDES)
+dynxml_local_storage_engines_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/PSEArch.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/se-federated-structure.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dynxml-local-se-archive.xml \
+	dynxml-local-se-db2.xml \
+	dynxml-local-se-innodb.xml \
+	dynxml-local-se-memory.xml \
+	dynxml-local-se-myisam.xml \
+	se-archive-core.xml \
+	se-blackhole.xml \
+	se-csv.xml \
+	se-db2-core.xml \
+	se-example.xml \
+	se-federated.xml \
+	se-innodb-core.xml \
+	se-memory-core.xml \
+	se-merge.xml \
+	se-myisam-core.xml \
+	storage-engines-core.xml \
+	versions.ent
+dynxml_local_storage_engines_IMAGES = \
+	../refman-common/images/published/PSEArch.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/se-federated-structure.png
+dynxml_local_storage_engines_SOURCES = dynxml-local-storage-engines.xml $(dynxml_local_storage_engines_INCLUDES)
+dynxml_local_storage_engines_IDMAPS = \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/faqs.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/se-archive-core.idmap \
+	metadata/se-blackhole.idmap \
+	metadata/se-csv.idmap \
+	metadata/se-db2-core.idmap \
+	metadata/se-example.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/se-merge.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/storage-engines-core.idmap
+dynxml-local-storage-engines.validpure: $(dynxml_local_storage_engines_SOURCES)
+dynxml-local-storage-engines.titles: $(dynxml_local_storage_engines_SOURCES)
+dynxml-local-storage-engines.useless: $(dynxml_local_storage_engines_SOURCES)
+dynxml-local-storage-engines.valid: $(dynxml_local_storage_engines_SOURCES) $(dynxml_local_storage_engines_IDMAPS)
+dynxml-local-storage-engines.validwarn: $(dynxml_local_storage_engines_SOURCES) $(dynxml_local_storage_engines_IDMAPS)
+dynxml-local-storage-engines-prepped.xml: $(dynxml_local_storage_engines_SOURCES) $(dynxml_local_storage_engines_IDMAPS)
+dynxml-local-storage-engines-manprepped.xml: $(dynxml_local_storage_engines_SOURCES) $(dynxml_local_storage_engines_IDMAPS)
+dynxml-local-storage-engines-remprepped.xml: $(dynxml_local_storage_engines_SOURCES) $(dynxml_local_storage_engines_IDMAPS)
+dynxml-local-storage-engines.xml: $(dynxml_local_storage_engines_INCLUDES)
+errmsgs_client_INCLUDES =
+errmsgs_client_IMAGES =
+errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES)
+errmsgs_client_IDMAPS =
+errmsgs-client.validpure: $(errmsgs_client_SOURCES)
+errmsgs-client.titles: $(errmsgs_client_SOURCES)
+errmsgs-client.useless: $(errmsgs_client_SOURCES)
+errmsgs-client.valid: $(errmsgs_client_SOURCES) $(errmsgs_client_IDMAPS)
+errmsgs-client.validwarn: $(errmsgs_client_SOURCES) $(errmsgs_client_IDMAPS)
+errmsgs-client-prepped.xml: $(errmsgs_client_SOURCES) $(errmsgs_client_IDMAPS)
+errmsgs-client-manprepped.xml: $(errmsgs_client_SOURCES) $(errmsgs_client_IDMAPS)
+errmsgs-client-remprepped.xml: $(errmsgs_client_SOURCES) $(errmsgs_client_IDMAPS)
+
+errmsgs_server_INCLUDES =
+errmsgs_server_IMAGES =
+errmsgs_server_SOURCES = errmsgs-server.xml $(errmsgs_server_INCLUDES)
+errmsgs_server_IDMAPS =
+errmsgs-server.validpure: $(errmsgs_server_SOURCES)
+errmsgs-server.titles: $(errmsgs_server_SOURCES)
+errmsgs-server.useless: $(errmsgs_server_SOURCES)
+errmsgs-server.valid: $(errmsgs_server_SOURCES) $(errmsgs_server_IDMAPS)
+errmsgs-server.validwarn: $(errmsgs_server_SOURCES) $(errmsgs_server_IDMAPS)
+errmsgs-server-prepped.xml: $(errmsgs_server_SOURCES) $(errmsgs_server_IDMAPS)
+errmsgs-server-manprepped.xml: $(errmsgs_server_SOURCES) $(errmsgs_server_IDMAPS)
+errmsgs-server-remprepped.xml: $(errmsgs_server_SOURCES) $(errmsgs_server_IDMAPS)
+
+errors_problems_core_INCLUDES =
+errors_problems_core_IMAGES =
+errors_problems_core_SOURCES = errors-problems-core.xml $(errors_problems_core_INCLUDES)
+errors_problems_core_IDMAPS =
+errors-problems-core.validpure: $(errors_problems_core_SOURCES)
+errors-problems-core.titles: $(errors_problems_core_SOURCES)
+errors-problems-core.useless: $(errors_problems_core_SOURCES)
+errors-problems-core.valid: $(errors_problems_core_SOURCES) $(errors_problems_core_IDMAPS)
+errors-problems-core.validwarn: $(errors_problems_core_SOURCES) $(errors_problems_core_IDMAPS)
+errors-problems-core-prepped.xml: $(errors_problems_core_SOURCES) $(errors_problems_core_IDMAPS)
+errors-problems-core-manprepped.xml: $(errors_problems_core_SOURCES) $(errors_problems_core_IDMAPS)
+errors-problems-core-remprepped.xml: $(errors_problems_core_SOURCES) $(errors_problems_core_IDMAPS)
+
+events_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+events_IMAGES =
+events_SOURCES = events.xml $(events_INCLUDES)
+events_IDMAPS = \
+	metadata/events.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/triggers.idmap
+events.validpure: $(events_SOURCES)
+events.titles: $(events_SOURCES)
+events.useless: $(events_SOURCES)
+events.valid: $(events_SOURCES) $(events_IDMAPS)
+events.validwarn: $(events_SOURCES) $(events_IDMAPS)
+events-prepped.xml: $(events_SOURCES) $(events_IDMAPS)
+events-manprepped.xml: $(events_SOURCES) $(events_IDMAPS)
+events-remprepped.xml: $(events_SOURCES) $(events_IDMAPS)
+
+extending_mysql_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+extending_mysql_IMAGES =
+extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
+extending_mysql_IDMAPS = \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/stored-routines.idmap
+extending-mysql.validpure: $(extending_mysql_SOURCES)
+extending-mysql.titles: $(extending_mysql_SOURCES)
+extending-mysql.useless: $(extending_mysql_SOURCES)
+extending-mysql.valid: $(extending_mysql_SOURCES) $(extending_mysql_IDMAPS)
+extending-mysql.validwarn: $(extending_mysql_SOURCES) $(extending_mysql_IDMAPS)
+extending-mysql-prepped.xml: $(extending_mysql_SOURCES) $(extending_mysql_IDMAPS)
+extending-mysql-manprepped.xml: $(extending_mysql_SOURCES) $(extending_mysql_IDMAPS)
+extending-mysql-remprepped.xml: $(extending_mysql_SOURCES) $(extending_mysql_IDMAPS)
+
+faqs_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/active-master-mysql-server.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+faqs_IMAGES = \
+	../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/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 \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-mxj.idmap \
+	../refman-common/metadata/connector-net-programming.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/ha-drbd.idmap \
+	../refman-common/metadata/ha.idmap \
+	metadata/apis-c.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/optimization.idmap \
+	metadata/replication-configuration.idmap \
+	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 \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/stored-routines.idmap \
+	metadata/triggers.idmap \
+	metadata/views.idmap
+faqs.validpure: $(faqs_SOURCES)
+faqs.titles: $(faqs_SOURCES)
+faqs.useless: $(faqs_SOURCES)
+faqs.valid: $(faqs_SOURCES) $(faqs_IDMAPS)
+faqs.validwarn: $(faqs_SOURCES) $(faqs_IDMAPS)
+faqs-prepped.xml: $(faqs_SOURCES) $(faqs_IDMAPS)
+faqs-manprepped.xml: $(faqs_SOURCES) $(faqs_IDMAPS)
+faqs-remprepped.xml: $(faqs_SOURCES) $(faqs_IDMAPS)
+
+functions_core_INCLUDES =
+functions_core_IMAGES =
+functions_core_SOURCES = functions-core.xml $(functions_core_INCLUDES)
+functions_core_IDMAPS =
+functions-core.validpure: $(functions_core_SOURCES)
+functions-core.titles: $(functions_core_SOURCES)
+functions-core.useless: $(functions_core_SOURCES)
+functions-core.valid: $(functions_core_SOURCES) $(functions_core_IDMAPS)
+functions-core.validwarn: $(functions_core_SOURCES) $(functions_core_IDMAPS)
+functions-core-prepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
+functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
+functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
+
+information_schema_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+information_schema_IMAGES =
+information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
+information_schema_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/events.idmap \
+	metadata/faqs.idmap \
+	metadata/information-schema.idmap \
+	metadata/internationalization.idmap \
+	metadata/partitioning.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/triggers.idmap
+information-schema.validpure: $(information_schema_SOURCES)
+information-schema.titles: $(information_schema_SOURCES)
+information-schema.useless: $(information_schema_SOURCES)
+information-schema.valid: $(information_schema_SOURCES) $(information_schema_IDMAPS)
+information-schema.validwarn: $(information_schema_SOURCES) $(information_schema_IDMAPS)
+information-schema-prepped.xml: $(information_schema_SOURCES) $(information_schema_IDMAPS)
+information-schema-manprepped.xml: $(information_schema_SOURCES) $(information_schema_IDMAPS)
+information-schema-remprepped.xml: $(information_schema_SOURCES) $(information_schema_IDMAPS)
+
+installing_core_INCLUDES =
+installing_core_IMAGES =
+installing_core_SOURCES = installing-core.xml $(installing_core_INCLUDES)
+installing_core_IDMAPS =
+installing-core.validpure: $(installing_core_SOURCES)
+installing-core.titles: $(installing_core_SOURCES)
+installing-core.useless: $(installing_core_SOURCES)
+installing-core.valid: $(installing_core_SOURCES) $(installing_core_IDMAPS)
+installing-core.validwarn: $(installing_core_SOURCES) $(installing_core_IDMAPS)
+installing-core-prepped.xml: $(installing_core_SOURCES) $(installing_core_IDMAPS)
+installing-core-manprepped.xml: $(installing_core_SOURCES) $(installing_core_IDMAPS)
+installing-core-remprepped.xml: $(installing_core_SOURCES) $(installing_core_IDMAPS)
+
+internationalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+internationalization_IMAGES =
+internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
+internationalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+internationalization.validpure: $(internationalization_SOURCES)
+internationalization.titles: $(internationalization_SOURCES)
+internationalization.useless: $(internationalization_SOURCES)
+internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
+internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
+internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
+internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
+internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
+
+introduction_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/bug-reports.xml \
+	../refman-common/credits.xml \
+	../refman-common/information-sources.xml \
+	../refman-common/manual-conventions.en.xml \
+	../refman-common/urls.ent \
+	../refman-common/what-is.en.xml \
+	all-entities.ent \
+	versions.ent
+introduction_IMAGES =
+introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
+introduction_IDMAPS = \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-5.0/metadata/introduction.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-net-core.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/credits.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/what-is.en.idmap \
+	metadata/apis-c.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-dtrace.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-miscellaneous.idmap \
+	metadata/programs.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-routines.idmap \
+	metadata/triggers.idmap \
+	metadata/tutorial.idmap \
+	metadata/views.idmap
+introduction.validpure: $(introduction_SOURCES)
+introduction.titles: $(introduction_SOURCES)
+introduction.useless: $(introduction_SOURCES)
+introduction.valid: $(introduction_SOURCES) $(introduction_IDMAPS)
+introduction.validwarn: $(introduction_SOURCES) $(introduction_IDMAPS)
+introduction-prepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
+introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
+introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
+
+language_structure_core_INCLUDES =
+language_structure_core_IMAGES =
+language_structure_core_SOURCES = language-structure-core.xml $(language_structure_core_INCLUDES)
+language_structure_core_IDMAPS =
+language-structure-core.validpure: $(language_structure_core_SOURCES)
+language-structure-core.titles: $(language_structure_core_SOURCES)
+language-structure-core.useless: $(language_structure_core_SOURCES)
+language-structure-core.valid: $(language_structure_core_SOURCES) $(language_structure_core_IDMAPS)
+language-structure-core.validwarn: $(language_structure_core_SOURCES) $(language_structure_core_IDMAPS)
+language-structure-core-prepped.xml: $(language_structure_core_SOURCES) $(language_structure_core_IDMAPS)
+language-structure-core-manprepped.xml: $(language_structure_core_SOURCES) $(language_structure_core_IDMAPS)
+language-structure-core-remprepped.xml: $(language_structure_core_SOURCES) $(language_structure_core_IDMAPS)
+
+legalnotice_en_INCLUDES =
+legalnotice_en_IMAGES =
+legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
+legalnotice_en_IDMAPS = \
+	metadata/preface.idmap
+legalnotice.en.validpure: $(legalnotice_en_SOURCES)
+legalnotice.en.titles: $(legalnotice_en_SOURCES)
+legalnotice.en.useless: $(legalnotice_en_SOURCES)
+legalnotice.en.valid: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en.validwarn: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-prepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+
+manual_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/ibmdb2i.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/reserved-words/mysql-5.1.11-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.12-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.13-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.14-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.15-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.16-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.17-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.18-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.19-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.20-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.21-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.22-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.23-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.24-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.25-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.26-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.27 \
+	../dynamic-docs/reserved-words/mysql-5.1.28-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.29-rc \
+	../dynamic-docs/reserved-words/mysql-5.1.3-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.30 \
+	../dynamic-docs/reserved-words/mysql-5.1.31 \
+	../dynamic-docs/reserved-words/mysql-5.1.31sp1 \
+	../dynamic-docs/reserved-words/mysql-5.1.32 \
+	../dynamic-docs/reserved-words/mysql-5.1.33 \
+	../dynamic-docs/reserved-words/mysql-5.1.34 \
+	../dynamic-docs/reserved-words/mysql-5.1.35 \
+	../dynamic-docs/reserved-words/mysql-5.1.36 \
+	../dynamic-docs/reserved-words/mysql-5.1.4-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.5-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.6-alpha \
+	../dynamic-docs/reserved-words/mysql-5.1.7-beta \
+	../dynamic-docs/reserved-words/mysql-5.1.9-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.0-beta \
+	../dynamic-docs/reserved-words/mysql-5.4.1-beta \
+	../dynamic-docs/storage-engines/engines.xml \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
+	../gui-common/gui-common.ent \
+	../gui-common/gui-common.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 \
+	../mysql-monitor-2.0/dashboard-replication.xml \
+	../mysql-monitor-2.0/deployment.xml \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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/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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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/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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png \
+	../refman-common/all-entities.ent \
+	../refman-common/apis-cplusplus.xml \
+	../refman-common/apis-eiffel.xml \
+	../refman-common/apis-perl.xml \
+	../refman-common/apis-php-mysql.xml \
+	../refman-common/apis-php-mysqli.xml \
+	../refman-common/apis-php-pdo-mysql.xml \
+	../refman-common/apis-php.xml \
+	../refman-common/apis-python.xml \
+	../refman-common/apis-ruby.xml \
+	../refman-common/apis-tcl.xml \
+	../refman-common/bug-reports.xml \
+	../refman-common/connector-c-core.xml \
+	../refman-common/connector-cpp-core.xml \
+	../refman-common/connector-j-connprops.xml \
+	../refman-common/connector-j-errormap.xml \
+	../refman-common/connector-j.xml \
+	../refman-common/connector-mxj.xml \
+	../refman-common/connector-net-core.xml \
+	../refman-common/connector-net-install.xml \
+	../refman-common/connector-net-programming-connection-options.xml \
+	../refman-common/connector-net-programming-tutorial.xml \
+	../refman-common/connector-net-programming.xml \
+	../refman-common/connector-net-ref.xml \
+	../refman-common/connector-net-support.xml \
+	../refman-common/connector-net-versions.xml \
+	../refman-common/connector-net-visual-studio.xml \
+	../refman-common/connector-odbc.xml \
+	../refman-common/connector-ooo.xml \
+	../refman-common/connector-vstudioplugin.xml \
+	../refman-common/copyright.en.xml \
+	../refman-common/credits.xml \
+	../refman-common/dynxml-common-ha-memcached.xml \
+	../refman-common/dynxml-common-mysql-proxy.xml \
+	../refman-common/ha-drbd.xml \
+	../refman-common/ha-heartbeat.xml \
+	../refman-common/ha-memcached-core.xml \
+	../refman-common/ha-vm.xml \
+	../refman-common/ha-zfs.xml \
+	../refman-common/ha.xml \
+	../refman-common/images/published/PSEArch.png \
+	../refman-common/images/published/active-master-mysql-server.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cmxj-overview.png \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
+	../refman-common/images/published/connector-ooo-add-extension.png \
+	../refman-common/images/published/connector-ooo-base.png \
+	../refman-common/images/published/connector-ooo-dbwizard1.png \
+	../refman-common/images/published/connector-ooo-dbwizard2.png \
+	../refman-common/images/published/connector-ooo-user-authentication-credentials.png \
+	../refman-common/images/published/connector-ooo-user-authentication.png \
+	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
+	../refman-common/images/published/ec2fig1.png \
+	../refman-common/images/published/ec2fig2.png \
+	../refman-common/images/published/ec2fig3.png \
+	../refman-common/images/published/ha-heartbeat-overview.png \
+	../refman-common/images/published/memcached-flow.png \
+	../refman-common/images/published/memcached-memalloc.png \
+	../refman-common/images/published/memcached-overview.png \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/myaccess-odbc.png \
+	../refman-common/images/published/myaccess.png \
+	../refman-common/images/published/myarchitecture.png \
+	../refman-common/images/published/myflowchart.png \
+	../refman-common/images/published/myodbc-crystal-1.png \
+	../refman-common/images/published/myodbc-crystal-2.png \
+	../refman-common/images/published/myodbc-crystal-3.png \
+	../refman-common/images/published/myodbc-crystal-4.png \
+	../refman-common/images/published/myodbc-crystal-5.png \
+	../refman-common/images/published/myodbc-crystal-6.png \
+	../refman-common/images/published/myodbc-excel-step1.png \
+	../refman-common/images/published/myodbc-excel-step2.png \
+	../refman-common/images/published/myodbc-excel-step3.png \
+	../refman-common/images/published/myodbc-excel-step4.png \
+	../refman-common/images/published/myodbc-excel-step5.png \
+	../refman-common/images/published/myodbc-link-step1.png \
+	../refman-common/images/published/myodbc-link-step3.png \
+	../refman-common/images/published/myodbc-link-step4.png \
+	../refman-common/images/published/myodbc-link-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step1.png \
+	../refman-common/images/published/myodbc-macosx-install-step2.png \
+	../refman-common/images/published/myodbc-macosx-install-step3.png \
+	../refman-common/images/published/myodbc-macosx-install-step4.png \
+	../refman-common/images/published/myodbc-macosx-install-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step6.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
+	../refman-common/images/published/myodbc-win-install-step1.png \
+	../refman-common/images/published/myodbc-win-install-step2.png \
+	../refman-common/images/published/myodbc-win-install-step3.png \
+	../refman-common/images/published/myodbc-win-install-step4.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
+	../refman-common/images/published/myodbc-win-tracing.png \
+	../refman-common/images/published/mysql-vstudioplugin-1.png \
+	../refman-common/images/published/mysql-vstudioplugin-3.png \
+	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/proxy-architecture.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/se-federated-structure.png \
+	../refman-common/images/published/submaster-performance.png \
+	../refman-common/information-sources.xml \
+	../refman-common/license-getarg.xml \
+	../refman-common/license-libedit.xml \
+	../refman-common/license-regex.xml \
+	../refman-common/manual-conventions.en.xml \
+	../refman-common/mysql-proxy-core.xml \
+	../refman-common/news-ccpp-core.xml \
+	../refman-common/news-cj-core.xml \
+	../refman-common/news-cmxj-core.xml \
+	../refman-common/news-cnet-core.xml \
+	../refman-common/news-codbc-core.xml \
+	../refman-common/news-mysql-proxy-core.xml \
+	../refman-common/news-vstudioplugin-core.xml \
+	../refman-common/urls.ent \
+	../refman-common/urls.ent \
+	../refman-common/what-is.en.xml \
+	all-entities.ent \
+	apis-c.xml \
+	apis-libmysqld.xml \
+	backup.xml \
+	connectors-apis.xml \
+	data-types.xml \
+	dba-dtrace.xml \
+	dba-log-files.xml \
+	dba-multiple-servers.xml \
+	dba-mysqld-server-core.xml \
+	dba-privilege-system.xml \
+	dba-security-core.xml \
+	dba-user-management-core.xml \
+	dba.xml \
+	dynxml-common-connector-c.xml \
+	dynxml-common-connector-cpp.xml \
+	dynxml-common-connector-net.xml \
+	dynxml-common-news-ccpp.xml \
+	dynxml-common-news-cj.xml \
+	dynxml-common-news-cmxj.xml \
+	dynxml-common-news-cnet.xml \
+	dynxml-common-news-codbc.xml \
+	dynxml-common-news-mysql-proxy.xml \
+	dynxml-common-news-vstudioplugin.xml \
+	dynxml-local-dba-mysqld-server.xml \
+	dynxml-local-dba-security.xml \
+	dynxml-local-dba-user-management.xml \
+	dynxml-local-errors-problems.xml \
+	dynxml-local-functions.xml \
+	dynxml-local-installing.xml \
+	dynxml-local-language-structure.xml \
+	dynxml-local-news-5.4.xml \
+	dynxml-local-programs-admin-util.xml \
+	dynxml-local-programs-client.xml \
+	dynxml-local-programs-server.xml \
+	dynxml-local-quickref.xml \
+	dynxml-local-replication-options.xml \
+	dynxml-local-se-archive.xml \
+	dynxml-local-se-db2.xml \
+	dynxml-local-se-innodb.xml \
+	dynxml-local-se-memory.xml \
+	dynxml-local-se-myisam.xml \
+	dynxml-local-storage-engines.xml \
+	errmsgs-client.xml \
+	errmsgs-server.xml \
+	errors-problems-core.xml \
+	events.xml \
+	extending-mysql.xml \
+	faqs.xml \
+	functions-core.xml \
+	images/published/dtrace-groups.png \
+	images/published/mysql-cfg-fig1.png \
+	images/published/mysql-cfg-fig10.png \
+	images/published/mysql-cfg-fig2.png \
+	images/published/mysql-cfg-fig3.png \
+	images/published/mysql-cfg-fig4.png \
+	images/published/mysql-cfg-fig5.png \
+	images/published/mysql-cfg-fig6.png \
+	images/published/mysql-cfg-fig7.png \
+	images/published/mysql-cfg-fig8.png \
+	images/published/mysql-cfg-fig9.png \
+	information-schema.xml \
+	installing-core.xml \
+	internationalization.xml \
+	introduction.xml \
+	language-structure-core.xml \
+	legalnotice.en.xml \
+	monitor-refman-chapter-arbitrary.xml \
+	monitor-refman-chapter-aspec.xml \
+	monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-events.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-install.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml \
+	monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml \
+	monitor-refman-chapter-base.xml \
+	news-5.4-core.xml \
+	news-monitor-2.0-arbitrary.xml \
+	news-monitor-2.0-aspec.xml \
+	news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.0-base.xml \
+	news.xml \
+	optimization.xml \
+	partitioning.xml \
+	precision-math.xml \
+	preface.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
+	programs-development.xml \
+	programs-installation.xml \
+	programs-miscellaneous.xml \
+	programs-server-core.xml \
+	programs-using.xml \
+	programs.xml \
+	quickref-core.xml \
+	replication-configuration.xml \
+	replication-implementation.xml \
+	replication-notes.xml \
+	replication-options-core.xml \
+	replication-solutions.xml \
+	replication.xml \
+	restrictions.xml \
+	se-archive-core.xml \
+	se-blackhole.xml \
+	se-csv.xml \
+	se-db2-core.xml \
+	se-example.xml \
+	se-federated.xml \
+	se-innodb-core.xml \
+	se-memory-core.xml \
+	se-merge.xml \
+	se-myisam-core.xml \
+	spatial-extensions.xml \
+	sql-syntax-compound-statements.xml \
+	sql-syntax-data-definition.xml \
+	sql-syntax-data-manipulation.xml \
+	sql-syntax-prepared-statements.xml \
+	sql-syntax-replication.xml \
+	sql-syntax-server-administration.xml \
+	sql-syntax-transactions.xml \
+	sql-syntax-utility.xml \
+	sql-syntax.xml \
+	storage-engines-core.xml \
+	stored-programs-views.xml \
+	stored-routines.xml \
+	triggers.xml \
+	tutorial.xml \
+	versions.ent \
+	views.xml
+manual_IMAGES = \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png \
+	../refman-common/images/published/PSEArch.png \
+	../refman-common/images/published/active-master-mysql-server.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cmxj-overview.png \
+	../refman-common/images/published/cnet-win-install-step1.png \
+	../refman-common/images/published/cnet-win-install-step2.png \
+	../refman-common/images/published/cnet-win-install-step3.png \
+	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/cnet-win-install-step5.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies-added.png \
+	../refman-common/images/published/connector-cpp-additional-dependencies.png \
+	../refman-common/images/published/connector-cpp-additional-lib-dir-select.png \
+	../refman-common/images/published/connector-cpp-additional-library-dir.png \
+	../refman-common/images/published/connector-cpp-cppconn-public-func.png \
+	../refman-common/images/published/connector-cpp-installer-custom.png \
+	../refman-common/images/published/connector-cpp-installer-overview.png \
+	../refman-common/images/published/connector-cpp-installer-welcome.png \
+	../refman-common/images/published/connector-cpp-menu-new-project.png \
+	../refman-common/images/published/connector-cpp-menu-project-properties.png \
+	../refman-common/images/published/connector-cpp-mysql-include-dir.png \
+	../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png \
+	../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png \
+	../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png \
+	../refman-common/images/published/connector-cpp-netbeans-static-run.png \
+	../refman-common/images/published/connector-cpp-netbeans.png \
+	../refman-common/images/published/connector-cpp-new-project-wizard.png \
+	../refman-common/images/published/connector-cpp-properties.png \
+	../refman-common/images/published/connector-cpp-select-release-build.png \
+	../refman-common/images/published/connector-cpp-win32-application-wizard.png \
+	../refman-common/images/published/connector-net-programming-tutorial-1.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-add-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-data-source.png \
+	../refman-common/images/published/connector-net-visual-studio-choose-table-name.png \
+	../refman-common/images/published/connector-net-visual-studio-editing-new-table.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-add-entity-data-model.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-2.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png \
+	../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png \
+	../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png \
+	../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png \
+	../refman-common/images/published/connector-net-visual-studio-new-data-connection.png \
+	../refman-common/images/published/connector-net-visual-studio-newly-created-table.png \
+	../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png \
+	../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png \
+	../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png \
+	../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png \
+	../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-added.png \
+	../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png \
+	../refman-common/images/published/connector-ooo-add-extension.png \
+	../refman-common/images/published/connector-ooo-base.png \
+	../refman-common/images/published/connector-ooo-dbwizard1.png \
+	../refman-common/images/published/connector-ooo-dbwizard2.png \
+	../refman-common/images/published/connector-ooo-user-authentication-credentials.png \
+	../refman-common/images/published/connector-ooo-user-authentication.png \
+	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/drbd-sepinterface.png \
+	../refman-common/images/published/ec2fig1.png \
+	../refman-common/images/published/ec2fig2.png \
+	../refman-common/images/published/ec2fig3.png \
+	../refman-common/images/published/ha-heartbeat-overview.png \
+	../refman-common/images/published/memcached-flow.png \
+	../refman-common/images/published/memcached-memalloc.png \
+	../refman-common/images/published/memcached-overview.png \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/myaccess-odbc.png \
+	../refman-common/images/published/myaccess.png \
+	../refman-common/images/published/myarchitecture.png \
+	../refman-common/images/published/myflowchart.png \
+	../refman-common/images/published/myodbc-crystal-1.png \
+	../refman-common/images/published/myodbc-crystal-2.png \
+	../refman-common/images/published/myodbc-crystal-3.png \
+	../refman-common/images/published/myodbc-crystal-4.png \
+	../refman-common/images/published/myodbc-crystal-5.png \
+	../refman-common/images/published/myodbc-crystal-6.png \
+	../refman-common/images/published/myodbc-excel-step1.png \
+	../refman-common/images/published/myodbc-excel-step2.png \
+	../refman-common/images/published/myodbc-excel-step3.png \
+	../refman-common/images/published/myodbc-excel-step4.png \
+	../refman-common/images/published/myodbc-excel-step5.png \
+	../refman-common/images/published/myodbc-link-step1.png \
+	../refman-common/images/published/myodbc-link-step3.png \
+	../refman-common/images/published/myodbc-link-step4.png \
+	../refman-common/images/published/myodbc-link-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step1.png \
+	../refman-common/images/published/myodbc-macosx-install-step2.png \
+	../refman-common/images/published/myodbc-macosx-install-step3.png \
+	../refman-common/images/published/myodbc-macosx-install-step4.png \
+	../refman-common/images/published/myodbc-macosx-install-step5.png \
+	../refman-common/images/published/myodbc-macosx-install-step6.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png \
+	../refman-common/images/published/myodbc-win-install-step1.png \
+	../refman-common/images/published/myodbc-win-install-step2.png \
+	../refman-common/images/published/myodbc-win-install-step3.png \
+	../refman-common/images/published/myodbc-win-install-step4.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-main.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-options.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png \
+	../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png \
+	../refman-common/images/published/myodbc-win-tracing.png \
+	../refman-common/images/published/mysql-vstudioplugin-1.png \
+	../refman-common/images/published/mysql-vstudioplugin-3.png \
+	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/proxy-architecture.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/se-federated-structure.png \
+	../refman-common/images/published/submaster-performance.png \
+	images/published/dtrace-groups.png \
+	images/published/mysql-cfg-fig1.png \
+	images/published/mysql-cfg-fig10.png \
+	images/published/mysql-cfg-fig2.png \
+	images/published/mysql-cfg-fig3.png \
+	images/published/mysql-cfg-fig4.png \
+	images/published/mysql-cfg-fig5.png \
+	images/published/mysql-cfg-fig6.png \
+	images/published/mysql-cfg-fig7.png \
+	images/published/mysql-cfg-fig8.png \
+	images/published/mysql-cfg-fig9.png
+manual_SOURCES = manual.xml $(manual_INCLUDES)
+manual_IDMAPS = \
+	../mysql-monitor-2.0/metadata/dashboard-advisors.idmap \
+	../mysql-monitor-2.0/metadata/dashboard-graphs.idmap \
+	../mysql-monitor-2.0/metadata/dashboard-overview.idmap \
+	../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/log-files.idmap \
+	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
+	../mysql-monitor-2.1/metadata/dashboard-whatsnew.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 \
+	../quick-guides/metadata/reservedwords-core.idmap \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
+	../refman-5.0/metadata/introduction.idmap \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.1/metadata/mysql-cluster-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-5.1/metadata/sql-syntax-data-definition.idmap \
+	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/manual.idmap \
+	../refman-common/metadata/apis-cplusplus.idmap \
+	../refman-common/metadata/apis-eiffel.idmap \
+	../refman-common/metadata/apis-perl.idmap \
+	../refman-common/metadata/apis-php-mysql.idmap \
+	../refman-common/metadata/apis-php-mysqli.idmap \
+	../refman-common/metadata/apis-php-pdo-mysql.idmap \
+	../refman-common/metadata/apis-php.idmap \
+	../refman-common/metadata/apis-python.idmap \
+	../refman-common/metadata/apis-ruby.idmap \
+	../refman-common/metadata/apis-tcl.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/connector-c-core.idmap \
+	../refman-common/metadata/connector-cpp-core.idmap \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-mxj.idmap \
+	../refman-common/metadata/connector-net-core.idmap \
+	../refman-common/metadata/connector-net-install.idmap \
+	../refman-common/metadata/connector-net-programming-connection-options.idmap \
+	../refman-common/metadata/connector-net-programming-tutorial.idmap \
+	../refman-common/metadata/connector-net-programming.idmap \
+	../refman-common/metadata/connector-net-ref.idmap \
+	../refman-common/metadata/connector-net-support.idmap \
+	../refman-common/metadata/connector-net-visual-studio.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/credits.idmap \
+	../refman-common/metadata/ha-drbd.idmap \
+	../refman-common/metadata/ha-heartbeat.idmap \
+	../refman-common/metadata/ha-memcached-core.idmap \
+	../refman-common/metadata/ha-vm.idmap \
+	../refman-common/metadata/ha.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/load-balancer.idmap \
+	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
+	../refman-common/metadata/news-cj-core.idmap \
+	../refman-common/metadata/news-cmxj-core.idmap \
+	../refman-common/metadata/news-cnet-core.idmap \
+	../refman-common/metadata/news-codbc-core.idmap \
+	../refman-common/metadata/what-is.en.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis-libmysqld.idmap \
+	metadata/backup.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-dtrace.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/precision-math.idmap \
+	metadata/preface.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-development.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-miscellaneous.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/programs.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/replication-solutions.idmap \
+	metadata/replication.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-archive-core.idmap \
+	metadata/se-blackhole.idmap \
+	metadata/se-csv.idmap \
+	metadata/se-db2-core.idmap \
+	metadata/se-example.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/se-merge.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/stored-routines.idmap \
+	metadata/triggers.idmap \
+	metadata/tutorial.idmap \
+	metadata/views.idmap
+manual.validpure: $(manual_SOURCES)
+manual.titles: $(manual_SOURCES)
+manual.useless: $(manual_SOURCES)
+manual.valid: $(manual_SOURCES) $(manual_IDMAPS)
+manual.validwarn: $(manual_SOURCES) $(manual_IDMAPS)
+manual-prepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
+manual-manprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
+manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
+
+monitor_refman_chapter_arbitrary_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
+	../gui-common/gui-common.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 \
+	../mysql-monitor-2.0/dashboard-replication.xml \
+	../mysql-monitor-2.0/deployment.xml \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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/introduction.xml \
+	../mysql-monitor-2.0/monitor-faq-core.xml \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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/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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png \
+	../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 \
+	monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-events.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-install.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml \
+	monitor-refman-chapter-base.xml \
+	versions.ent
+monitor_refman_chapter_arbitrary_IMAGES = \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png
+monitor_refman_chapter_arbitrary_SOURCES = monitor-refman-chapter-arbitrary.xml $(monitor_refman_chapter_arbitrary_INCLUDES)
+monitor_refman_chapter_arbitrary_IDMAPS =
+monitor-refman-chapter-arbitrary.validpure: $(monitor_refman_chapter_arbitrary_SOURCES)
+monitor-refman-chapter-arbitrary.titles: $(monitor_refman_chapter_arbitrary_SOURCES)
+monitor-refman-chapter-arbitrary.useless: $(monitor_refman_chapter_arbitrary_SOURCES)
+monitor-refman-chapter-arbitrary.valid: $(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
+monitor-refman-chapter-arbitrary.validwarn: $(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
+monitor-refman-chapter-arbitrary-prepped.xml: $(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
+monitor-refman-chapter-arbitrary-manprepped.xml: $(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
+monitor-refman-chapter-arbitrary-remprepped.xml: $(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
+
+monitor_refman_chapter_aspec_INCLUDES =
+monitor_refman_chapter_aspec_IMAGES =
+monitor_refman_chapter_aspec_SOURCES = monitor-refman-chapter-aspec.xml $(monitor_refman_chapter_aspec_INCLUDES)
+monitor_refman_chapter_aspec_IDMAPS =
+monitor-refman-chapter-aspec.validpure: $(monitor_refman_chapter_aspec_SOURCES)
+monitor-refman-chapter-aspec.titles: $(monitor_refman_chapter_aspec_SOURCES)
+monitor-refman-chapter-aspec.useless: $(monitor_refman_chapter_aspec_SOURCES)
+monitor-refman-chapter-aspec.valid: $(monitor_refman_chapter_aspec_SOURCES) $(monitor_refman_chapter_aspec_IDMAPS)
+monitor-refman-chapter-aspec.validwarn: $(monitor_refman_chapter_aspec_SOURCES) $(monitor_refman_chapter_aspec_IDMAPS)
+monitor-refman-chapter-aspec-prepped.xml: $(monitor_refman_chapter_aspec_SOURCES) $(monitor_refman_chapter_aspec_IDMAPS)
+monitor-refman-chapter-aspec-manprepped.xml: $(monitor_refman_chapter_aspec_SOURCES) $(monitor_refman_chapter_aspec_IDMAPS)
+monitor-refman-chapter-aspec-remprepped.xml: $(monitor_refman_chapter_aspec_SOURCES) $(monitor_refman_chapter_aspec_IDMAPS)
+
+monitor_refman_chapter_base_INCLUDES =
+monitor_refman_chapter_base_IMAGES =
+monitor_refman_chapter_base_SOURCES = monitor-refman-chapter-base.xml $(monitor_refman_chapter_base_INCLUDES)
+monitor_refman_chapter_base_IDMAPS =
+monitor-refman-chapter-base.validpure: $(monitor_refman_chapter_base_SOURCES)
+monitor-refman-chapter-base.titles: $(monitor_refman_chapter_base_SOURCES)
+monitor-refman-chapter-base.useless: $(monitor_refman_chapter_base_SOURCES)
+monitor-refman-chapter-base.valid: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
+monitor-refman-chapter-base.validwarn: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
+monitor-refman-chapter-base-prepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
+monitor-refman-chapter-base-manprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
+monitor-refman-chapter-base-remprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
+
+monitor_refman_chapter_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
+	../gui-common/gui-common.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 \
+	../mysql-monitor-2.0/dashboard-replication.xml \
+	../mysql-monitor-2.0/deployment.xml \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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/introduction.xml \
+	../mysql-monitor-2.0/monitor-faq-core.xml \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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/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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png \
+	../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 \
+	monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-events.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-install.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml \
+	monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml \
+	monitor-refman-chapter-base.xml \
+	versions.ent
+monitor_refman_chapter_IMAGES = \
+	../mysql-monitor-2.0/images/published/advisors-edit.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx3.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx4.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx5.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx6.png \
+	../mysql-monitor-2.0/images/published/agent-install-osx7.png \
+	../mysql-monitor-2.0/images/published/agent-install-win1.png \
+	../mysql-monitor-2.0/images/published/agent-install-win3.png \
+	../mysql-monitor-2.0/images/published/agent-install-win4.png \
+	../mysql-monitor-2.0/images/published/agent-install-win5.png \
+	../mysql-monitor-2.0/images/published/agent-install-win6.png \
+	../mysql-monitor-2.0/images/published/email-settings.png \
+	../mysql-monitor-2.0/images/published/first-dashboard-login.png \
+	../mysql-monitor-2.0/images/published/heat-chart-legend.png \
+	../mysql-monitor-2.0/images/published/heat-chart.png \
+	../mysql-monitor-2.0/images/published/mem-overview.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx1.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx2.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx4.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx5.png \
+	../mysql-monitor-2.0/images/published/monitor-install-osx6.png \
+	../mysql-monitor-2.0/images/published/monitor-install-win1.png \
+	../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-migration-check.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-confirm.png \
+	../mysql-monitor-2.0/images/published/monitor-migration-progress.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/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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
+	../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 \
+	../mysql-monitor-common/images/published/mem-quan-item-explain.png \
+	../mysql-monitor-common/images/published/mem-quan-item-summary.png \
+	../mysql-monitor-common/images/published/mem-quan-main.png \
+	../mysql-monitor-common/images/published/mem-settings-global.png \
+	../mysql-monitor-common/images/published/mem-settings-logs.png \
+	../mysql-monitor-common/images/published/mem-settings-notification.png \
+	../mysql-monitor-common/images/published/mem-settings-servers.png \
+	../mysql-monitor-common/images/published/mem-settings-user.png \
+	../mysql-monitor-common/images/published/mem-settings-users.png \
+	../mysql-monitor-common/images/published/quan-layout1.png \
+	../mysql-monitor-common/images/published/quan-layout2.png \
+	../mysql-monitor-common/images/published/server-rename.png
+monitor_refman_chapter_SOURCES = monitor-refman-chapter.xml $(monitor_refman_chapter_INCLUDES)
+monitor_refman_chapter_IDMAPS =
+monitor-refman-chapter.validpure: $(monitor_refman_chapter_SOURCES)
+monitor-refman-chapter.titles: $(monitor_refman_chapter_SOURCES)
+monitor-refman-chapter.useless: $(monitor_refman_chapter_SOURCES)
+monitor-refman-chapter.valid: $(monitor_refman_chapter_SOURCES) $(monitor_refman_chapter_IDMAPS)
+monitor-refman-chapter.validwarn: $(monitor_refman_chapter_SOURCES) $(monitor_refman_chapter_IDMAPS)
+monitor-refman-chapter-prepped.xml: $(monitor_refman_chapter_SOURCES) $(monitor_refman_chapter_IDMAPS)
+monitor-refman-chapter-manprepped.xml: $(monitor_refman_chapter_SOURCES) $(monitor_refman_chapter_IDMAPS)
+monitor-refman-chapter-remprepped.xml: $(monitor_refman_chapter_SOURCES) $(monitor_refman_chapter_IDMAPS)
+
+news_5_4_core_INCLUDES =
+news_5_4_core_IMAGES =
+news_5_4_core_SOURCES = news-5.4-core.xml $(news_5_4_core_INCLUDES)
+news_5_4_core_IDMAPS =
+news-5.4-core.validpure: $(news_5_4_core_SOURCES)
+news-5.4-core.titles: $(news_5_4_core_SOURCES)
+news-5.4-core.useless: $(news_5_4_core_SOURCES)
+news-5.4-core.valid: $(news_5_4_core_SOURCES) $(news_5_4_core_IDMAPS)
+news-5.4-core.validwarn: $(news_5_4_core_SOURCES) $(news_5_4_core_IDMAPS)
+news-5.4-core-prepped.xml: $(news_5_4_core_SOURCES) $(news_5_4_core_IDMAPS)
+news-5.4-core-manprepped.xml: $(news_5_4_core_SOURCES) $(news_5_4_core_IDMAPS)
+news-5.4-core-remprepped.xml: $(news_5_4_core_SOURCES) $(news_5_4_core_IDMAPS)
+
+news_monitor_2_0_arbitrary_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/news-monitor-core.xml \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	news-monitor-2.0-aspec.xml \
+	news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.0-base.xml \
+	versions.ent
+news_monitor_2_0_arbitrary_IMAGES =
+news_monitor_2_0_arbitrary_SOURCES = news-monitor-2.0-arbitrary.xml $(news_monitor_2_0_arbitrary_INCLUDES)
+news_monitor_2_0_arbitrary_IDMAPS =
+news-monitor-2.0-arbitrary.validpure: $(news_monitor_2_0_arbitrary_SOURCES)
+news-monitor-2.0-arbitrary.titles: $(news_monitor_2_0_arbitrary_SOURCES)
+news-monitor-2.0-arbitrary.useless: $(news_monitor_2_0_arbitrary_SOURCES)
+news-monitor-2.0-arbitrary.valid: $(news_monitor_2_0_arbitrary_SOURCES) $(news_monitor_2_0_arbitrary_IDMAPS)
+news-monitor-2.0-arbitrary.validwarn: $(news_monitor_2_0_arbitrary_SOURCES) $(news_monitor_2_0_arbitrary_IDMAPS)
+news-monitor-2.0-arbitrary-prepped.xml: $(news_monitor_2_0_arbitrary_SOURCES) $(news_monitor_2_0_arbitrary_IDMAPS)
+news-monitor-2.0-arbitrary-manprepped.xml: $(news_monitor_2_0_arbitrary_SOURCES) $(news_monitor_2_0_arbitrary_IDMAPS)
+news-monitor-2.0-arbitrary-remprepped.xml: $(news_monitor_2_0_arbitrary_SOURCES) $(news_monitor_2_0_arbitrary_IDMAPS)
+
+news_monitor_2_0_aspec_INCLUDES =
+news_monitor_2_0_aspec_IMAGES =
+news_monitor_2_0_aspec_SOURCES = news-monitor-2.0-aspec.xml $(news_monitor_2_0_aspec_INCLUDES)
+news_monitor_2_0_aspec_IDMAPS =
+news-monitor-2.0-aspec.validpure: $(news_monitor_2_0_aspec_SOURCES)
+news-monitor-2.0-aspec.titles: $(news_monitor_2_0_aspec_SOURCES)
+news-monitor-2.0-aspec.useless: $(news_monitor_2_0_aspec_SOURCES)
+news-monitor-2.0-aspec.valid: $(news_monitor_2_0_aspec_SOURCES) $(news_monitor_2_0_aspec_IDMAPS)
+news-monitor-2.0-aspec.validwarn: $(news_monitor_2_0_aspec_SOURCES) $(news_monitor_2_0_aspec_IDMAPS)
+news-monitor-2.0-aspec-prepped.xml: $(news_monitor_2_0_aspec_SOURCES) $(news_monitor_2_0_aspec_IDMAPS)
+news-monitor-2.0-aspec-manprepped.xml: $(news_monitor_2_0_aspec_SOURCES) $(news_monitor_2_0_aspec_IDMAPS)
+news-monitor-2.0-aspec-remprepped.xml: $(news_monitor_2_0_aspec_SOURCES) $(news_monitor_2_0_aspec_IDMAPS)
+
+news_monitor_2_0_base_INCLUDES =
+news_monitor_2_0_base_IMAGES =
+news_monitor_2_0_base_SOURCES = news-monitor-2.0-base.xml $(news_monitor_2_0_base_INCLUDES)
+news_monitor_2_0_base_IDMAPS =
+news-monitor-2.0-base.validpure: $(news_monitor_2_0_base_SOURCES)
+news-monitor-2.0-base.titles: $(news_monitor_2_0_base_SOURCES)
+news-monitor-2.0-base.useless: $(news_monitor_2_0_base_SOURCES)
+news-monitor-2.0-base.valid: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
+news-monitor-2.0-base.validwarn: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
+news-monitor-2.0-base-prepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
+news-monitor-2.0-base-manprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
+news-monitor-2.0-base-remprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
+
+news_monitor_2_0_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/news-monitor-core.xml \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	news-monitor-2.0-aspec.xml \
+	news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.0-base.xml \
+	versions.ent
+news_monitor_2_0_IMAGES =
+news_monitor_2_0_SOURCES = news-monitor-2.0.xml $(news_monitor_2_0_INCLUDES)
+news_monitor_2_0_IDMAPS =
+news-monitor-2.0.validpure: $(news_monitor_2_0_SOURCES)
+news-monitor-2.0.titles: $(news_monitor_2_0_SOURCES)
+news-monitor-2.0.useless: $(news_monitor_2_0_SOURCES)
+news-monitor-2.0.valid: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
+news-monitor-2.0.validwarn: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
+news-monitor-2.0-prepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
+news-monitor-2.0-manprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
+news-monitor-2.0-remprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
+
+news_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/news-monitor-core.xml \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/news-ccpp-core.xml \
+	../refman-common/news-cj-core.xml \
+	../refman-common/news-cmxj-core.xml \
+	../refman-common/news-cnet-core.xml \
+	../refman-common/news-codbc-core.xml \
+	../refman-common/news-mysql-proxy-core.xml \
+	../refman-common/news-vstudioplugin-core.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dynxml-common-news-ccpp.xml \
+	dynxml-common-news-cj.xml \
+	dynxml-common-news-cmxj.xml \
+	dynxml-common-news-cnet.xml \
+	dynxml-common-news-codbc.xml \
+	dynxml-common-news-mysql-proxy.xml \
+	dynxml-common-news-vstudioplugin.xml \
+	dynxml-local-news-5.4.xml \
+	news-5.4-core.xml \
+	news-monitor-2.0-arbitrary.xml \
+	news-monitor-2.0-aspec.xml \
+	news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.0-base.xml \
+	versions.ent
+news_IMAGES =
+news_SOURCES = news.xml $(news_INCLUDES)
+news_IDMAPS =
+news.validpure: $(news_SOURCES)
+news.titles: $(news_SOURCES)
+news.useless: $(news_SOURCES)
+news.valid: $(news_SOURCES) $(news_IDMAPS)
+news.validwarn: $(news_SOURCES) $(news_IDMAPS)
+news-prepped.xml: $(news_SOURCES) $(news_IDMAPS)
+news-manprepped.xml: $(news_SOURCES) $(news_IDMAPS)
+news-remprepped.xml: $(news_SOURCES) $(news_IDMAPS)
+
+optimization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+optimization_IMAGES =
+optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
+optimization_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/backup.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication.idmap \
+	metadata/se-archive-core.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-routines.idmap
+optimization.validpure: $(optimization_SOURCES)
+optimization.titles: $(optimization_SOURCES)
+optimization.useless: $(optimization_SOURCES)
+optimization.valid: $(optimization_SOURCES) $(optimization_IDMAPS)
+optimization.validwarn: $(optimization_SOURCES) $(optimization_IDMAPS)
+optimization-prepped.xml: $(optimization_SOURCES) $(optimization_IDMAPS)
+optimization-manprepped.xml: $(optimization_SOURCES) $(optimization_IDMAPS)
+optimization-remprepped.xml: $(optimization_SOURCES) $(optimization_IDMAPS)
+
+partitioning_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+partitioning_IMAGES =
+partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
+partitioning_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-overview.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap
+partitioning.validpure: $(partitioning_SOURCES)
+partitioning.titles: $(partitioning_SOURCES)
+partitioning.useless: $(partitioning_SOURCES)
+partitioning.valid: $(partitioning_SOURCES) $(partitioning_IDMAPS)
+partitioning.validwarn: $(partitioning_SOURCES) $(partitioning_IDMAPS)
+partitioning-prepped.xml: $(partitioning_SOURCES) $(partitioning_IDMAPS)
+partitioning-manprepped.xml: $(partitioning_SOURCES) $(partitioning_IDMAPS)
+partitioning-remprepped.xml: $(partitioning_SOURCES) $(partitioning_IDMAPS)
+
+precision_math_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+precision_math_IMAGES =
+precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
+precision_math_IDMAPS = \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/precision-math.idmap
+precision-math.validpure: $(precision_math_SOURCES)
+precision-math.titles: $(precision_math_SOURCES)
+precision-math.useless: $(precision_math_SOURCES)
+precision-math.valid: $(precision_math_SOURCES) $(precision_math_IDMAPS)
+precision-math.validwarn: $(precision_math_SOURCES) $(precision_math_IDMAPS)
+precision-math-prepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
+precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
+precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
+
+preface_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/all-entities.ent \
+	../refman-common/copyright.en.xml \
+	../refman-common/license-getarg.xml \
+	../refman-common/license-libedit.xml \
+	../refman-common/license-regex.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS =
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+
+programs_admin_util_core_INCLUDES =
+programs_admin_util_core_IMAGES =
+programs_admin_util_core_SOURCES = programs-admin-util-core.xml $(programs_admin_util_core_INCLUDES)
+programs_admin_util_core_IDMAPS =
+programs-admin-util-core.validpure: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.titles: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.useless: $(programs_admin_util_core_SOURCES)
+programs-admin-util-core.valid: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core.validwarn: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-prepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-manprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+programs-admin-util-core-remprepped.xml: $(programs_admin_util_core_SOURCES) $(programs_admin_util_core_IDMAPS)
+
+programs_client_core_INCLUDES =
+programs_client_core_IMAGES =
+programs_client_core_SOURCES = programs-client-core.xml $(programs_client_core_INCLUDES)
+programs_client_core_IDMAPS =
+programs-client-core.validpure: $(programs_client_core_SOURCES)
+programs-client-core.titles: $(programs_client_core_SOURCES)
+programs-client-core.useless: $(programs_client_core_SOURCES)
+programs-client-core.valid: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core.validwarn: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-prepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-manprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+programs-client-core-remprepped.xml: $(programs_client_core_SOURCES) $(programs_client_core_IDMAPS)
+
+programs_development_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+programs_development_IMAGES =
+programs_development_SOURCES = programs-development.xml $(programs_development_INCLUDES)
+programs_development_IDMAPS = \
+	metadata/programs-miscellaneous.idmap
+programs-development.validpure: $(programs_development_SOURCES)
+programs-development.titles: $(programs_development_SOURCES)
+programs-development.useless: $(programs_development_SOURCES)
+programs-development.valid: $(programs_development_SOURCES) $(programs_development_IDMAPS)
+programs-development.validwarn: $(programs_development_SOURCES) $(programs_development_IDMAPS)
+programs-development-prepped.xml: $(programs_development_SOURCES) $(programs_development_IDMAPS)
+programs-development-manprepped.xml: $(programs_development_SOURCES) $(programs_development_IDMAPS)
+programs-development-remprepped.xml: $(programs_development_SOURCES) $(programs_development_IDMAPS)
+
+programs_installation_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+programs_installation_IMAGES =
+programs_installation_SOURCES = programs-installation.xml $(programs_installation_INCLUDES)
+programs_installation_IDMAPS = \
+	metadata/backup.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-using.idmap \
+	metadata/sql-syntax-server-administration.idmap
+programs-installation.validpure: $(programs_installation_SOURCES)
+programs-installation.titles: $(programs_installation_SOURCES)
+programs-installation.useless: $(programs_installation_SOURCES)
+programs-installation.valid: $(programs_installation_SOURCES) $(programs_installation_IDMAPS)
+programs-installation.validwarn: $(programs_installation_SOURCES) $(programs_installation_IDMAPS)
+programs-installation-prepped.xml: $(programs_installation_SOURCES) $(programs_installation_IDMAPS)
+programs-installation-manprepped.xml: $(programs_installation_SOURCES) $(programs_installation_IDMAPS)
+programs-installation-remprepped.xml: $(programs_installation_SOURCES) $(programs_installation_IDMAPS)
+
+programs_miscellaneous_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+programs_miscellaneous_IMAGES =
+programs_miscellaneous_SOURCES = programs-miscellaneous.xml $(programs_miscellaneous_INCLUDES)
+programs_miscellaneous_IDMAPS = \
+	metadata/programs-development.idmap
+programs-miscellaneous.validpure: $(programs_miscellaneous_SOURCES)
+programs-miscellaneous.titles: $(programs_miscellaneous_SOURCES)
+programs-miscellaneous.useless: $(programs_miscellaneous_SOURCES)
+programs-miscellaneous.valid: $(programs_miscellaneous_SOURCES) $(programs_miscellaneous_IDMAPS)
+programs-miscellaneous.validwarn: $(programs_miscellaneous_SOURCES) $(programs_miscellaneous_IDMAPS)
+programs-miscellaneous-prepped.xml: $(programs_miscellaneous_SOURCES) $(programs_miscellaneous_IDMAPS)
+programs-miscellaneous-manprepped.xml: $(programs_miscellaneous_SOURCES) $(programs_miscellaneous_IDMAPS)
+programs-miscellaneous-remprepped.xml: $(programs_miscellaneous_SOURCES) $(programs_miscellaneous_IDMAPS)
+
+programs_server_core_INCLUDES =
+programs_server_core_IMAGES =
+programs_server_core_SOURCES = programs-server-core.xml $(programs_server_core_INCLUDES)
+programs_server_core_IDMAPS =
+programs-server-core.validpure: $(programs_server_core_SOURCES)
+programs-server-core.titles: $(programs_server_core_SOURCES)
+programs-server-core.useless: $(programs_server_core_SOURCES)
+programs-server-core.valid: $(programs_server_core_SOURCES) $(programs_server_core_IDMAPS)
+programs-server-core.validwarn: $(programs_server_core_SOURCES) $(programs_server_core_IDMAPS)
+programs-server-core-prepped.xml: $(programs_server_core_SOURCES) $(programs_server_core_IDMAPS)
+programs-server-core-manprepped.xml: $(programs_server_core_SOURCES) $(programs_server_core_IDMAPS)
+programs-server-core-remprepped.xml: $(programs_server_core_SOURCES) $(programs_server_core_IDMAPS)
+
+programs_using_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+programs_using_IMAGES =
+programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
+programs_using_IDMAPS = \
+	../refman-4.1/metadata/installing.idmap \
+	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/sql-syntax-server-administration.idmap
+programs-using.validpure: $(programs_using_SOURCES)
+programs-using.titles: $(programs_using_SOURCES)
+programs-using.useless: $(programs_using_SOURCES)
+programs-using.valid: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using.validwarn: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-prepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-manprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+
+programs_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dynxml-local-programs-admin-util.xml \
+	dynxml-local-programs-client.xml \
+	dynxml-local-programs-server.xml \
+	programs-admin-util-core.xml \
+	programs-client-core.xml \
+	programs-development.xml \
+	programs-installation.xml \
+	programs-miscellaneous.xml \
+	programs-server-core.xml \
+	programs-using.xml \
+	versions.ent
+programs_IMAGES =
+programs_SOURCES = programs.xml $(programs_INCLUDES)
+programs_IDMAPS = \
+	../refman-4.1/metadata/installing.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 \
+	metadata/dba-multiple-servers.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/events.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-development.idmap \
+	metadata/programs-installation.idmap \
+	metadata/programs-miscellaneous.idmap \
+	metadata/programs-server-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/tutorial.idmap
+programs.validpure: $(programs_SOURCES)
+programs.titles: $(programs_SOURCES)
+programs.useless: $(programs_SOURCES)
+programs.valid: $(programs_SOURCES) $(programs_IDMAPS)
+programs.validwarn: $(programs_SOURCES) $(programs_IDMAPS)
+programs-prepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
+programs-manprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
+programs-remprepped.xml: $(programs_SOURCES) $(programs_IDMAPS)
+
+quickref_core_INCLUDES =
+quickref_core_IMAGES =
+quickref_core_SOURCES = quickref-core.xml $(quickref_core_INCLUDES)
+quickref_core_IDMAPS =
+quickref-core.validpure: $(quickref_core_SOURCES)
+quickref-core.titles: $(quickref_core_SOURCES)
+quickref-core.useless: $(quickref_core_SOURCES)
+quickref-core.valid: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
+quickref-core.validwarn: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
+quickref-core-prepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
+quickref-core-manprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
+quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
+
+replication_configuration_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dynxml-local-replication-options.xml \
+	replication-options-core.xml \
+	versions.ent
+replication_configuration_IMAGES =
+replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
+replication_configuration_IDMAPS = \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+replication-configuration.validpure: $(replication_configuration_SOURCES)
+replication-configuration.titles: $(replication_configuration_SOURCES)
+replication-configuration.useless: $(replication_configuration_SOURCES)
+replication-configuration.valid: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration.validwarn: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-prepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-manprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+replication-configuration-remprepped.xml: $(replication_configuration_SOURCES) $(replication_configuration_IDMAPS)
+
+replication_implementation_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+replication_implementation_IMAGES =
+replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
+replication_implementation_IDMAPS = \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/optimization.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/sql-syntax-replication.idmap
+replication-implementation.validpure: $(replication_implementation_SOURCES)
+replication-implementation.titles: $(replication_implementation_SOURCES)
+replication-implementation.useless: $(replication_implementation_SOURCES)
+replication-implementation.valid: $(replication_implementation_SOURCES) $(replication_implementation_IDMAPS)
+replication-implementation.validwarn: $(replication_implementation_SOURCES) $(replication_implementation_IDMAPS)
+replication-implementation-prepped.xml: $(replication_implementation_SOURCES) $(replication_implementation_IDMAPS)
+replication-implementation-manprepped.xml: $(replication_implementation_SOURCES) $(replication_implementation_IDMAPS)
+replication-implementation-remprepped.xml: $(replication_implementation_SOURCES) $(replication_implementation_IDMAPS)
+
+replication_notes_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+replication_notes_IMAGES = \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png
+replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
+replication_notes_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-solutions.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/stored-programs-views.idmap
+replication-notes.validpure: $(replication_notes_SOURCES)
+replication-notes.titles: $(replication_notes_SOURCES)
+replication-notes.useless: $(replication_notes_SOURCES)
+replication-notes.valid: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication-notes.validwarn: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication-notes-prepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
+
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
+replication_solutions_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/submaster-performance.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+replication_solutions_IMAGES = \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/submaster-performance.png
+replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES)
+replication_solutions_IDMAPS = \
+	metadata/dba-user-management-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-solutions.idmap \
+	metadata/sql-syntax-replication.idmap
+replication-solutions.validpure: $(replication_solutions_SOURCES)
+replication-solutions.titles: $(replication_solutions_SOURCES)
+replication-solutions.useless: $(replication_solutions_SOURCES)
+replication-solutions.valid: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
+replication-solutions.validwarn: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
+replication-solutions-prepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
+replication-solutions-manprepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
+replication-solutions-remprepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
+
+replication_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/submaster-performance.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	dynxml-local-replication-options.xml \
+	replication-configuration.xml \
+	replication-implementation.xml \
+	replication-notes.xml \
+	replication-options-core.xml \
+	replication-solutions.xml \
+	versions.ent
+replication_IMAGES = \
+	../refman-common/images/published/multi-db.png \
+	../refman-common/images/published/redundancy-after.png \
+	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/rpl-create-select-failure-rbr.png \
+	../refman-common/images/published/scaleout.png \
+	../refman-common/images/published/submaster-performance.png
+replication_SOURCES = replication.xml $(replication_INCLUDES)
+replication_IDMAPS = \
+	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-using.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/replication-solutions.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/stored-programs-views.idmap
+replication.validpure: $(replication_SOURCES)
+replication.titles: $(replication_SOURCES)
+replication.useless: $(replication_SOURCES)
+replication.valid: $(replication_SOURCES) $(replication_IDMAPS)
+replication.validwarn: $(replication_SOURCES) $(replication_IDMAPS)
+replication-prepped.xml: $(replication_SOURCES) $(replication_IDMAPS)
+replication-manprepped.xml: $(replication_SOURCES) $(replication_IDMAPS)
+replication-remprepped.xml: $(replication_SOURCES) $(replication_IDMAPS)
+
+restrictions_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+restrictions_IMAGES =
+restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
+restrictions_IDMAPS = \
+	metadata/internationalization.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/stored-routines.idmap
+restrictions.validpure: $(restrictions_SOURCES)
+restrictions.titles: $(restrictions_SOURCES)
+restrictions.useless: $(restrictions_SOURCES)
+restrictions.valid: $(restrictions_SOURCES) $(restrictions_IDMAPS)
+restrictions.validwarn: $(restrictions_SOURCES) $(restrictions_IDMAPS)
+restrictions-prepped.xml: $(restrictions_SOURCES) $(restrictions_IDMAPS)
+restrictions-manprepped.xml: $(restrictions_SOURCES) $(restrictions_IDMAPS)
+restrictions-remprepped.xml: $(restrictions_SOURCES) $(restrictions_IDMAPS)
+
+se_archive_core_INCLUDES =
+se_archive_core_IMAGES =
+se_archive_core_SOURCES = se-archive-core.xml $(se_archive_core_INCLUDES)
+se_archive_core_IDMAPS =
+se-archive-core.validpure: $(se_archive_core_SOURCES)
+se-archive-core.titles: $(se_archive_core_SOURCES)
+se-archive-core.useless: $(se_archive_core_SOURCES)
+se-archive-core.valid: $(se_archive_core_SOURCES) $(se_archive_core_IDMAPS)
+se-archive-core.validwarn: $(se_archive_core_SOURCES) $(se_archive_core_IDMAPS)
+se-archive-core-prepped.xml: $(se_archive_core_SOURCES) $(se_archive_core_IDMAPS)
+se-archive-core-manprepped.xml: $(se_archive_core_SOURCES) $(se_archive_core_IDMAPS)
+se-archive-core-remprepped.xml: $(se_archive_core_SOURCES) $(se_archive_core_IDMAPS)
+
+se_blackhole_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+se_blackhole_IMAGES = \
+	../refman-common/images/published/blackhole-1.png
+se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
+se_blackhole_IDMAPS = \
+	metadata/replication-options-core.idmap
+se-blackhole.validpure: $(se_blackhole_SOURCES)
+se-blackhole.titles: $(se_blackhole_SOURCES)
+se-blackhole.useless: $(se_blackhole_SOURCES)
+se-blackhole.valid: $(se_blackhole_SOURCES) $(se_blackhole_IDMAPS)
+se-blackhole.validwarn: $(se_blackhole_SOURCES) $(se_blackhole_IDMAPS)
+se-blackhole-prepped.xml: $(se_blackhole_SOURCES) $(se_blackhole_IDMAPS)
+se-blackhole-manprepped.xml: $(se_blackhole_SOURCES) $(se_blackhole_IDMAPS)
+se-blackhole-remprepped.xml: $(se_blackhole_SOURCES) $(se_blackhole_IDMAPS)
+
+se_csv_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+se_csv_IMAGES =
+se_csv_SOURCES = se-csv.xml $(se_csv_INCLUDES)
+se_csv_IDMAPS =
+se-csv.validpure: $(se_csv_SOURCES)
+se-csv.titles: $(se_csv_SOURCES)
+se-csv.useless: $(se_csv_SOURCES)
+se-csv.valid: $(se_csv_SOURCES) $(se_csv_IDMAPS)
+se-csv.validwarn: $(se_csv_SOURCES) $(se_csv_IDMAPS)
+se-csv-prepped.xml: $(se_csv_SOURCES) $(se_csv_IDMAPS)
+se-csv-manprepped.xml: $(se_csv_SOURCES) $(se_csv_IDMAPS)
+se-csv-remprepped.xml: $(se_csv_SOURCES) $(se_csv_IDMAPS)
+
+se_db2_core_INCLUDES =
+se_db2_core_IMAGES =
+se_db2_core_SOURCES = se-db2-core.xml $(se_db2_core_INCLUDES)
+se_db2_core_IDMAPS =
+se-db2-core.validpure: $(se_db2_core_SOURCES)
+se-db2-core.titles: $(se_db2_core_SOURCES)
+se-db2-core.useless: $(se_db2_core_SOURCES)
+se-db2-core.valid: $(se_db2_core_SOURCES) $(se_db2_core_IDMAPS)
+se-db2-core.validwarn: $(se_db2_core_SOURCES) $(se_db2_core_IDMAPS)
+se-db2-core-prepped.xml: $(se_db2_core_SOURCES) $(se_db2_core_IDMAPS)
+se-db2-core-manprepped.xml: $(se_db2_core_SOURCES) $(se_db2_core_IDMAPS)
+se-db2-core-remprepped.xml: $(se_db2_core_SOURCES) $(se_db2_core_IDMAPS)
+
+se_example_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+se_example_IMAGES =
+se_example_SOURCES = se-example.xml $(se_example_INCLUDES)
+se_example_IDMAPS =
+se-example.validpure: $(se_example_SOURCES)
+se-example.titles: $(se_example_SOURCES)
+se-example.useless: $(se_example_SOURCES)
+se-example.valid: $(se_example_SOURCES) $(se_example_IDMAPS)
+se-example.validwarn: $(se_example_SOURCES) $(se_example_IDMAPS)
+se-example-prepped.xml: $(se_example_SOURCES) $(se_example_IDMAPS)
+se-example-manprepped.xml: $(se_example_SOURCES) $(se_example_IDMAPS)
+se-example-remprepped.xml: $(se_example_SOURCES) $(se_example_IDMAPS)
+
+se_federated_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/images/published/se-federated-structure.png \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+se_federated_IMAGES = \
+	../refman-common/images/published/se-federated-structure.png
+se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES)
+se_federated_IDMAPS = \
+	metadata/se-federated.idmap \
+	metadata/sql-syntax-data-definition.idmap
+se-federated.validpure: $(se_federated_SOURCES)
+se-federated.titles: $(se_federated_SOURCES)
+se-federated.useless: $(se_federated_SOURCES)
+se-federated.valid: $(se_federated_SOURCES) $(se_federated_IDMAPS)
+se-federated.validwarn: $(se_federated_SOURCES) $(se_federated_IDMAPS)
+se-federated-prepped.xml: $(se_federated_SOURCES) $(se_federated_IDMAPS)
+se-federated-manprepped.xml: $(se_federated_SOURCES) $(se_federated_IDMAPS)
+se-federated-remprepped.xml: $(se_federated_SOURCES) $(se_federated_IDMAPS)
+
+se_innodb_core_INCLUDES =
+se_innodb_core_IMAGES =
+se_innodb_core_SOURCES = se-innodb-core.xml $(se_innodb_core_INCLUDES)
+se_innodb_core_IDMAPS =
+se-innodb-core.validpure: $(se_innodb_core_SOURCES)
+se-innodb-core.titles: $(se_innodb_core_SOURCES)
+se-innodb-core.useless: $(se_innodb_core_SOURCES)
+se-innodb-core.valid: $(se_innodb_core_SOURCES) $(se_innodb_core_IDMAPS)
+se-innodb-core.validwarn: $(se_innodb_core_SOURCES) $(se_innodb_core_IDMAPS)
+se-innodb-core-prepped.xml: $(se_innodb_core_SOURCES) $(se_innodb_core_IDMAPS)
+se-innodb-core-manprepped.xml: $(se_innodb_core_SOURCES) $(se_innodb_core_IDMAPS)
+se-innodb-core-remprepped.xml: $(se_innodb_core_SOURCES) $(se_innodb_core_IDMAPS)
+
+se_memory_core_INCLUDES =
+se_memory_core_IMAGES =
+se_memory_core_SOURCES = se-memory-core.xml $(se_memory_core_INCLUDES)
+se_memory_core_IDMAPS =
+se-memory-core.validpure: $(se_memory_core_SOURCES)
+se-memory-core.titles: $(se_memory_core_SOURCES)
+se-memory-core.useless: $(se_memory_core_SOURCES)
+se-memory-core.valid: $(se_memory_core_SOURCES) $(se_memory_core_IDMAPS)
+se-memory-core.validwarn: $(se_memory_core_SOURCES) $(se_memory_core_IDMAPS)
+se-memory-core-prepped.xml: $(se_memory_core_SOURCES) $(se_memory_core_IDMAPS)
+se-memory-core-manprepped.xml: $(se_memory_core_SOURCES) $(se_memory_core_IDMAPS)
+se-memory-core-remprepped.xml: $(se_memory_core_SOURCES) $(se_memory_core_IDMAPS)
+
+se_merge_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+se_merge_IMAGES =
+se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
+se_merge_IDMAPS = \
+	metadata/installing-core.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/sql-syntax-utility.idmap
+se-merge.validpure: $(se_merge_SOURCES)
+se-merge.titles: $(se_merge_SOURCES)
+se-merge.useless: $(se_merge_SOURCES)
+se-merge.valid: $(se_merge_SOURCES) $(se_merge_IDMAPS)
+se-merge.validwarn: $(se_merge_SOURCES) $(se_merge_IDMAPS)
+se-merge-prepped.xml: $(se_merge_SOURCES) $(se_merge_IDMAPS)
+se-merge-manprepped.xml: $(se_merge_SOURCES) $(se_merge_IDMAPS)
+se-merge-remprepped.xml: $(se_merge_SOURCES) $(se_merge_IDMAPS)
+
+se_myisam_core_INCLUDES =
+se_myisam_core_IMAGES =
+se_myisam_core_SOURCES = se-myisam-core.xml $(se_myisam_core_INCLUDES)
+se_myisam_core_IDMAPS =
+se-myisam-core.validpure: $(se_myisam_core_SOURCES)
+se-myisam-core.titles: $(se_myisam_core_SOURCES)
+se-myisam-core.useless: $(se_myisam_core_SOURCES)
+se-myisam-core.valid: $(se_myisam_core_SOURCES) $(se_myisam_core_IDMAPS)
+se-myisam-core.validwarn: $(se_myisam_core_SOURCES) $(se_myisam_core_IDMAPS)
+se-myisam-core-prepped.xml: $(se_myisam_core_SOURCES) $(se_myisam_core_IDMAPS)
+se-myisam-core-manprepped.xml: $(se_myisam_core_SOURCES) $(se_myisam_core_IDMAPS)
+se-myisam-core-remprepped.xml: $(se_myisam_core_SOURCES) $(se_myisam_core_IDMAPS)
+
+spatial_extensions_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+spatial_extensions_IMAGES =
+spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
+spatial_extensions_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-data-definition.idmap
+spatial-extensions.validpure: $(spatial_extensions_SOURCES)
+spatial-extensions.titles: $(spatial_extensions_SOURCES)
+spatial-extensions.useless: $(spatial_extensions_SOURCES)
+spatial-extensions.valid: $(spatial_extensions_SOURCES) $(spatial_extensions_IDMAPS)
+spatial-extensions.validwarn: $(spatial_extensions_SOURCES) $(spatial_extensions_IDMAPS)
+spatial-extensions-prepped.xml: $(spatial_extensions_SOURCES) $(spatial_extensions_IDMAPS)
+spatial-extensions-manprepped.xml: $(spatial_extensions_SOURCES) $(spatial_extensions_IDMAPS)
+spatial-extensions-remprepped.xml: $(spatial_extensions_SOURCES) $(spatial_extensions_IDMAPS)
+
+sql_syntax_compound_statements_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_compound_statements_IMAGES =
+sql_syntax_compound_statements_SOURCES = sql-syntax-compound-statements.xml $(sql_syntax_compound_statements_INCLUDES)
+sql_syntax_compound_statements_IDMAPS = \
+	metadata/errors-problems-core.idmap \
+	metadata/events.idmap \
+	metadata/functions-core.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+sql-syntax-compound-statements.validpure: $(sql_syntax_compound_statements_SOURCES)
+sql-syntax-compound-statements.titles: $(sql_syntax_compound_statements_SOURCES)
+sql-syntax-compound-statements.useless: $(sql_syntax_compound_statements_SOURCES)
+sql-syntax-compound-statements.valid: $(sql_syntax_compound_statements_SOURCES) $(sql_syntax_compound_statements_IDMAPS)
+sql-syntax-compound-statements.validwarn: $(sql_syntax_compound_statements_SOURCES) $(sql_syntax_compound_statements_IDMAPS)
+sql-syntax-compound-statements-prepped.xml: $(sql_syntax_compound_statements_SOURCES) $(sql_syntax_compound_statements_IDMAPS)
+sql-syntax-compound-statements-manprepped.xml: $(sql_syntax_compound_statements_SOURCES) $(sql_syntax_compound_statements_IDMAPS)
+sql-syntax-compound-statements-remprepped.xml: $(sql_syntax_compound_statements_SOURCES) $(sql_syntax_compound_statements_IDMAPS)
+
+sql_syntax_data_definition_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_data_definition_IMAGES =
+sql_syntax_data_definition_SOURCES = sql-syntax-data-definition.xml $(sql_syntax_data_definition_INCLUDES)
+sql_syntax_data_definition_IDMAPS = \
+	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
+	../refman-5.1/metadata/mysql-cluster-disk-data.idmap \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-management.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
+	metadata/apis-c.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-archive-core.idmap \
+	metadata/se-csv.idmap \
+	metadata/se-example.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-memory-core.idmap \
+	metadata/se-merge.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/stored-routines.idmap \
+	metadata/tutorial.idmap \
+	metadata/views.idmap
+sql-syntax-data-definition.validpure: $(sql_syntax_data_definition_SOURCES)
+sql-syntax-data-definition.titles: $(sql_syntax_data_definition_SOURCES)
+sql-syntax-data-definition.useless: $(sql_syntax_data_definition_SOURCES)
+sql-syntax-data-definition.valid: $(sql_syntax_data_definition_SOURCES) $(sql_syntax_data_definition_IDMAPS)
+sql-syntax-data-definition.validwarn: $(sql_syntax_data_definition_SOURCES) $(sql_syntax_data_definition_IDMAPS)
+sql-syntax-data-definition-prepped.xml: $(sql_syntax_data_definition_SOURCES) $(sql_syntax_data_definition_IDMAPS)
+sql-syntax-data-definition-manprepped.xml: $(sql_syntax_data_definition_SOURCES) $(sql_syntax_data_definition_IDMAPS)
+sql-syntax-data-definition-remprepped.xml: $(sql_syntax_data_definition_SOURCES) $(sql_syntax_data_definition_IDMAPS)
+
+sql_syntax_data_manipulation_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_data_manipulation_IMAGES =
+sql_syntax_data_manipulation_SOURCES = sql-syntax-data-manipulation.xml $(sql_syntax_data_manipulation_INCLUDES)
+sql_syntax_data_manipulation_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/tutorial.idmap
+sql-syntax-data-manipulation.validpure: $(sql_syntax_data_manipulation_SOURCES)
+sql-syntax-data-manipulation.titles: $(sql_syntax_data_manipulation_SOURCES)
+sql-syntax-data-manipulation.useless: $(sql_syntax_data_manipulation_SOURCES)
+sql-syntax-data-manipulation.valid: $(sql_syntax_data_manipulation_SOURCES) $(sql_syntax_data_manipulation_IDMAPS)
+sql-syntax-data-manipulation.validwarn: $(sql_syntax_data_manipulation_SOURCES) $(sql_syntax_data_manipulation_IDMAPS)
+sql-syntax-data-manipulation-prepped.xml: $(sql_syntax_data_manipulation_SOURCES) $(sql_syntax_data_manipulation_IDMAPS)
+sql-syntax-data-manipulation-manprepped.xml: $(sql_syntax_data_manipulation_SOURCES) $(sql_syntax_data_manipulation_IDMAPS)
+sql-syntax-data-manipulation-remprepped.xml: $(sql_syntax_data_manipulation_SOURCES) $(sql_syntax_data_manipulation_IDMAPS)
+
+sql_syntax_prepared_statements_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_prepared_statements_IMAGES =
+sql_syntax_prepared_statements_SOURCES = sql-syntax-prepared-statements.xml $(sql_syntax_prepared_statements_INCLUDES)
+sql_syntax_prepared_statements_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/stored-routines.idmap
+sql-syntax-prepared-statements.validpure: $(sql_syntax_prepared_statements_SOURCES)
+sql-syntax-prepared-statements.titles: $(sql_syntax_prepared_statements_SOURCES)
+sql-syntax-prepared-statements.useless: $(sql_syntax_prepared_statements_SOURCES)
+sql-syntax-prepared-statements.valid: $(sql_syntax_prepared_statements_SOURCES) $(sql_syntax_prepared_statements_IDMAPS)
+sql-syntax-prepared-statements.validwarn: $(sql_syntax_prepared_statements_SOURCES) $(sql_syntax_prepared_statements_IDMAPS)
+sql-syntax-prepared-statements-prepped.xml: $(sql_syntax_prepared_statements_SOURCES) $(sql_syntax_prepared_statements_IDMAPS)
+sql-syntax-prepared-statements-manprepped.xml: $(sql_syntax_prepared_statements_SOURCES) $(sql_syntax_prepared_statements_IDMAPS)
+sql-syntax-prepared-statements-remprepped.xml: $(sql_syntax_prepared_statements_SOURCES) $(sql_syntax_prepared_statements_IDMAPS)
+
+sql_syntax_replication_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_replication_IMAGES =
+sql_syntax_replication_SOURCES = sql-syntax-replication.xml $(sql_syntax_replication_INCLUDES)
+sql_syntax_replication_IDMAPS = \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-options-core.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap
+sql-syntax-replication.validpure: $(sql_syntax_replication_SOURCES)
+sql-syntax-replication.titles: $(sql_syntax_replication_SOURCES)
+sql-syntax-replication.useless: $(sql_syntax_replication_SOURCES)
+sql-syntax-replication.valid: $(sql_syntax_replication_SOURCES) $(sql_syntax_replication_IDMAPS)
+sql-syntax-replication.validwarn: $(sql_syntax_replication_SOURCES) $(sql_syntax_replication_IDMAPS)
+sql-syntax-replication-prepped.xml: $(sql_syntax_replication_SOURCES) $(sql_syntax_replication_IDMAPS)
+sql-syntax-replication-manprepped.xml: $(sql_syntax_replication_SOURCES) $(sql_syntax_replication_IDMAPS)
+sql-syntax-replication-remprepped.xml: $(sql_syntax_replication_SOURCES) $(sql_syntax_replication_IDMAPS)
+
+sql_syntax_server_administration_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_server_administration_IMAGES =
+sql_syntax_server_administration_SOURCES = sql-syntax-server-administration.xml $(sql_syntax_server_administration_INCLUDES)
+sql_syntax_server_administration_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster-limitations.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/apis-c.idmap \
+	metadata/backup.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-user-management-core.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-core.idmap \
+	metadata/internationalization.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/programs-admin-util-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-archive-core.idmap \
+	metadata/se-csv.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/se-myisam-core.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/storage-engines-core.idmap \
+	metadata/triggers.idmap
+sql-syntax-server-administration.validpure: $(sql_syntax_server_administration_SOURCES)
+sql-syntax-server-administration.titles: $(sql_syntax_server_administration_SOURCES)
+sql-syntax-server-administration.useless: $(sql_syntax_server_administration_SOURCES)
+sql-syntax-server-administration.valid: $(sql_syntax_server_administration_SOURCES) $(sql_syntax_server_administration_IDMAPS)
+sql-syntax-server-administration.validwarn: $(sql_syntax_server_administration_SOURCES) $(sql_syntax_server_administration_IDMAPS)
+sql-syntax-server-administration-prepped.xml: $(sql_syntax_server_administration_SOURCES) $(sql_syntax_server_administration_IDMAPS)
+sql-syntax-server-administration-manprepped.xml: $(sql_syntax_server_administration_SOURCES) $(sql_syntax_server_administration_IDMAPS)
+sql-syntax-server-administration-remprepped.xml: $(sql_syntax_server_administration_SOURCES) $(sql_syntax_server_administration_IDMAPS)
+
+sql_syntax_transactions_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_transactions_IMAGES =
+sql_syntax_transactions_SOURCES = sql-syntax-transactions.xml $(sql_syntax_transactions_INCLUDES)
+sql_syntax_transactions_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/connectors-apis.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/introduction.idmap \
+	metadata/optimization.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap
+sql-syntax-transactions.validpure: $(sql_syntax_transactions_SOURCES)
+sql-syntax-transactions.titles: $(sql_syntax_transactions_SOURCES)
+sql-syntax-transactions.useless: $(sql_syntax_transactions_SOURCES)
+sql-syntax-transactions.valid: $(sql_syntax_transactions_SOURCES) $(sql_syntax_transactions_IDMAPS)
+sql-syntax-transactions.validwarn: $(sql_syntax_transactions_SOURCES) $(sql_syntax_transactions_IDMAPS)
+sql-syntax-transactions-prepped.xml: $(sql_syntax_transactions_SOURCES) $(sql_syntax_transactions_IDMAPS)
+sql-syntax-transactions-manprepped.xml: $(sql_syntax_transactions_SOURCES) $(sql_syntax_transactions_IDMAPS)
+sql-syntax-transactions-remprepped.xml: $(sql_syntax_transactions_SOURCES) $(sql_syntax_transactions_IDMAPS)
+
+sql_syntax_utility_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+sql_syntax_utility_IMAGES =
+sql_syntax_utility_SOURCES = sql-syntax-utility.xml $(sql_syntax_utility_INCLUDES)
+sql_syntax_utility_IDMAPS = \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap
+sql-syntax-utility.validpure: $(sql_syntax_utility_SOURCES)
+sql-syntax-utility.titles: $(sql_syntax_utility_SOURCES)
+sql-syntax-utility.useless: $(sql_syntax_utility_SOURCES)
+sql-syntax-utility.valid: $(sql_syntax_utility_SOURCES) $(sql_syntax_utility_IDMAPS)
+sql-syntax-utility.validwarn: $(sql_syntax_utility_SOURCES) $(sql_syntax_utility_IDMAPS)
+sql-syntax-utility-prepped.xml: $(sql_syntax_utility_SOURCES) $(sql_syntax_utility_IDMAPS)
+sql-syntax-utility-manprepped.xml: $(sql_syntax_utility_SOURCES) $(sql_syntax_utility_IDMAPS)
+sql-syntax-utility-remprepped.xml: $(sql_syntax_utility_SOURCES) $(sql_syntax_utility_IDMAPS)
+
+sql_syntax_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	sql-syntax-compound-statements.xml \
+	sql-syntax-data-definition.xml \
+	sql-syntax-data-manipulation.xml \
+	sql-syntax-prepared-statements.xml \
+	sql-syntax-replication.xml \
+	sql-syntax-server-administration.xml \
+	sql-syntax-transactions.xml \
+	sql-syntax-utility.xml \
+	versions.ent
+sql_syntax_IMAGES =
+sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
+sql_syntax_IDMAPS =
+sql-syntax.validpure: $(sql_syntax_SOURCES)
+sql-syntax.titles: $(sql_syntax_SOURCES)
+sql-syntax.useless: $(sql_syntax_SOURCES)
+sql-syntax.valid: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
+sql-syntax.validwarn: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
+sql-syntax-prepped.xml: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
+sql-syntax-manprepped.xml: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
+sql-syntax-remprepped.xml: $(sql_syntax_SOURCES) $(sql_syntax_IDMAPS)
+
+storage_engines_core_INCLUDES =
+storage_engines_core_IMAGES =
+storage_engines_core_SOURCES = storage-engines-core.xml $(storage_engines_core_INCLUDES)
+storage_engines_core_IDMAPS =
+storage-engines-core.validpure: $(storage_engines_core_SOURCES)
+storage-engines-core.titles: $(storage_engines_core_SOURCES)
+storage-engines-core.useless: $(storage_engines_core_SOURCES)
+storage-engines-core.valid: $(storage_engines_core_SOURCES) $(storage_engines_core_IDMAPS)
+storage-engines-core.validwarn: $(storage_engines_core_SOURCES) $(storage_engines_core_IDMAPS)
+storage-engines-core-prepped.xml: $(storage_engines_core_SOURCES) $(storage_engines_core_IDMAPS)
+storage-engines-core-manprepped.xml: $(storage_engines_core_SOURCES) $(storage_engines_core_IDMAPS)
+storage-engines-core-remprepped.xml: $(storage_engines_core_SOURCES) $(storage_engines_core_IDMAPS)
+
+stored_programs_views_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	events.xml \
+	stored-routines.xml \
+	triggers.xml \
+	versions.ent \
+	views.xml
+stored_programs_views_IMAGES =
+stored_programs_views_SOURCES = stored-programs-views.xml $(stored_programs_views_INCLUDES)
+stored_programs_views_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/backup.idmap \
+	metadata/dba-log-files.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/events.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap \
+	metadata/triggers.idmap
+stored-programs-views.validpure: $(stored_programs_views_SOURCES)
+stored-programs-views.titles: $(stored_programs_views_SOURCES)
+stored-programs-views.useless: $(stored_programs_views_SOURCES)
+stored-programs-views.valid: $(stored_programs_views_SOURCES) $(stored_programs_views_IDMAPS)
+stored-programs-views.validwarn: $(stored_programs_views_SOURCES) $(stored_programs_views_IDMAPS)
+stored-programs-views-prepped.xml: $(stored_programs_views_SOURCES) $(stored_programs_views_IDMAPS)
+stored-programs-views-manprepped.xml: $(stored_programs_views_SOURCES) $(stored_programs_views_IDMAPS)
+stored-programs-views-remprepped.xml: $(stored_programs_views_SOURCES) $(stored_programs_views_IDMAPS)
+
+stored_routines_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+stored_routines_IMAGES =
+stored_routines_SOURCES = stored-routines.xml $(stored_routines_INCLUDES)
+stored_routines_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-installation.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+stored-routines.validpure: $(stored_routines_SOURCES)
+stored-routines.titles: $(stored_routines_SOURCES)
+stored-routines.useless: $(stored_routines_SOURCES)
+stored-routines.valid: $(stored_routines_SOURCES) $(stored_routines_IDMAPS)
+stored-routines.validwarn: $(stored_routines_SOURCES) $(stored_routines_IDMAPS)
+stored-routines-prepped.xml: $(stored_routines_SOURCES) $(stored_routines_IDMAPS)
+stored-routines-manprepped.xml: $(stored_routines_SOURCES) $(stored_routines_IDMAPS)
+stored-routines-remprepped.xml: $(stored_routines_SOURCES) $(stored_routines_IDMAPS)
+
+triggers_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+triggers_IMAGES =
+triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
+triggers_IDMAPS = \
+	metadata/faqs.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-installation.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/stored-programs-views.idmap
+triggers.validpure: $(triggers_SOURCES)
+triggers.titles: $(triggers_SOURCES)
+triggers.useless: $(triggers_SOURCES)
+triggers.valid: $(triggers_SOURCES) $(triggers_IDMAPS)
+triggers.validwarn: $(triggers_SOURCES) $(triggers_IDMAPS)
+triggers-prepped.xml: $(triggers_SOURCES) $(triggers_IDMAPS)
+triggers-manprepped.xml: $(triggers_SOURCES) $(triggers_IDMAPS)
+triggers-remprepped.xml: $(triggers_SOURCES) $(triggers_IDMAPS)
+
+tutorial_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+tutorial_IMAGES =
+tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
+tutorial_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/dba-privilege-system.idmap \
+	metadata/dba-security-core.idmap \
+	metadata/dba.idmap \
+	metadata/errors-problems-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure-core.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-client-core.idmap \
+	metadata/replication-notes.idmap \
+	metadata/se-innodb-core.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-prepared-statements.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap \
+	metadata/tutorial.idmap
+tutorial.validpure: $(tutorial_SOURCES)
+tutorial.titles: $(tutorial_SOURCES)
+tutorial.useless: $(tutorial_SOURCES)
+tutorial.valid: $(tutorial_SOURCES) $(tutorial_IDMAPS)
+tutorial.validwarn: $(tutorial_SOURCES) $(tutorial_IDMAPS)
+tutorial-prepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
+tutorial-manprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
+tutorial-remprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
+
+views_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../gui-common/gui-common.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+views_IMAGES =
+views_SOURCES = views.xml $(views_INCLUDES)
+views_IDMAPS = \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-installation.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap
+views.validpure: $(views_SOURCES)
+views.titles: $(views_SOURCES)
+views.useless: $(views_SOURCES)
+views.valid: $(views_SOURCES) $(views_IDMAPS)
+views.validwarn: $(views_SOURCES) $(views_IDMAPS)
+views-prepped.xml: $(views_SOURCES) $(views_IDMAPS)
+views-manprepped.xml: $(views_SOURCES) $(views_IDMAPS)
+views-remprepped.xml: $(views_SOURCES) $(views_IDMAPS)
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
+news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent news-monitor-2.0-aspec.xml ../gui-common/gui-common.ent ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
+	$(MAKE) news-monitor-2.0.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+news-monitor-2.0-arbitrary.xml: news-monitor-2.0-aspec.xml.mem-news.none.section.xml
+	$(MAKE) news-monitor-2.0.arbitrary
+	cp news-monitor-2.0.arbitrary news-monitor-2.0-arbitrary.xml
+
+
+# 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.1/images/published/mem-settings-global.png ../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 ../dynamic-docs/faq/monitor.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor!
 -2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/i!
 nstall-a
gent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-osx4.png
+	$(MAKE) monitor-refman-chapter.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+monitor-refman-chapter-arbitrary.xml: 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
+	$(MAKE) monitor-refman-chapter.arbitrary
+	cp monitor-refman-chapter.arbitrary monitor-refman-chapter-arbitrary.xml
+


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-6.0/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 53, Lines Added: 186, Lines Deleted: 189; 54065 bytes

@@ -99,13 +99,13 @@
 backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
 
 connectors_apis_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -644,10 +644,10 @@
 dba-user-management-core-remprepped.xml: $(dba_user_management_core_SOURCES) $(dba_user_management_core_IDMAPS)
 
 dba_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -679,9 +679,9 @@
 dba-remprepped.xml: $(dba_SOURCES) $(dba_IDMAPS)
 
 dynxml_common_connector_c_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-c.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -702,9 +702,9 @@
 dynxml-common-connector-c-remprepped.xml: $(dynxml_common_connector_c_SOURCES) $(dynxml_common_connector_c_IDMAPS)
 dynxml-common-connector-c.xml: $(dynxml_common_connector_c_INCLUDES)
 dynxml_common_connector_cpp_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-cpp.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -771,11 +771,11 @@
 dynxml-common-connector-cpp-remprepped.xml: $(dynxml_common_connector_cpp_SOURCES) $(dynxml_common_connector_cpp_IDMAPS)
 dynxml-common-connector-cpp.xml: $(dynxml_common_connector_cpp_INCLUDES)
 dynxml_common_connector_net_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -906,10 +906,10 @@
 dynxml-common-connector-net-remprepped.xml: $(dynxml_common_connector_net_SOURCES) $(dynxml_common_connector_net_IDMAPS)
 dynxml-common-connector-net.xml: $(dynxml_common_connector_net_INCLUDES)
 dynxml_common_news_ccpp_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -930,10 +930,10 @@
 dynxml-common-news-ccpp-remprepped.xml: $(dynxml_common_news_ccpp_SOURCES) $(dynxml_common_news_ccpp_IDMAPS)
 dynxml-common-news-ccpp.xml: $(dynxml_common_news_ccpp_INCLUDES)
 dynxml_common_news_cj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -954,10 +954,10 @@
 dynxml-common-news-cj-remprepped.xml: $(dynxml_common_news_cj_SOURCES) $(dynxml_common_news_cj_IDMAPS)
 dynxml-common-news-cj.xml: $(dynxml_common_news_cj_INCLUDES)
 dynxml_common_news_cmxj_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -978,10 +978,10 @@
 dynxml-common-news-cmxj-remprepped.xml: $(dynxml_common_news_cmxj_SOURCES) $(dynxml_common_news_cmxj_IDMAPS)
 dynxml-common-news-cmxj.xml: $(dynxml_common_news_cmxj_INCLUDES)
 dynxml_common_news_cnet_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1002,10 +1002,10 @@
 dynxml-common-news-cnet-remprepped.xml: $(dynxml_common_news_cnet_SOURCES) $(dynxml_common_news_cnet_IDMAPS)
 dynxml-common-news-cnet.xml: $(dynxml_common_news_cnet_INCLUDES)
 dynxml_common_news_codbc_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1028,10 +1028,10 @@
 dynxml-common-news-codbc-remprepped.xml: $(dynxml_common_news_codbc_SOURCES) $(dynxml_common_news_codbc_IDMAPS)
 dynxml-common-news-codbc.xml: $(dynxml_common_news_codbc_INCLUDES)
 dynxml_common_news_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1052,10 +1052,10 @@
 dynxml-common-news-mysql-proxy-remprepped.xml: $(dynxml_common_news_mysql_proxy_SOURCES) $(dynxml_common_news_mysql_proxy_IDMAPS)
 dynxml-common-news-mysql-proxy.xml: $(dynxml_common_news_mysql_proxy_INCLUDES)
 dynxml_common_news_vstudioplugin_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1077,10 +1077,10 @@
 dynxml-common-news-vstudioplugin-remprepped.xml: $(dynxml_common_news_vstudioplugin_SOURCES) $(dynxml_common_news_vstudioplugin_IDMAPS)
 dynxml-common-news-vstudioplugin.xml: $(dynxml_common_news_vstudioplugin_INCLUDES)
 dynxml_local_dba_mysqld_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1134,10 +1134,10 @@
 dynxml-local-dba-mysqld-server-remprepped.xml: $(dynxml_local_dba_mysqld_server_SOURCES) $(dynxml_local_dba_mysqld_server_IDMAPS)
 dynxml-local-dba-mysqld-server.xml: $(dynxml_local_dba_mysqld_server_INCLUDES)
 dynxml_local_dba_security_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1168,10 +1168,10 @@
 dynxml-local-dba-security-remprepped.xml: $(dynxml_local_dba_security_SOURCES) $(dynxml_local_dba_security_IDMAPS)
 dynxml-local-dba-security.xml: $(dynxml_local_dba_security_INCLUDES)
 dynxml_local_dba_user_management_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1205,10 +1205,10 @@
 dynxml-local-dba-user-management-remprepped.xml: $(dynxml_local_dba_user_management_SOURCES) $(dynxml_local_dba_user_management_IDMAPS)
 dynxml-local-dba-user-management.xml: $(dynxml_local_dba_user_management_INCLUDES)
 dynxml_local_functions_INCLUDES = \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1252,9 +1252,9 @@
 dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
 dynxml-local-functions.xml: $(dynxml_local_functions_INCLUDES)
 dynxml_local_installing_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1362,11 +1362,11 @@
 dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
 dynxml_local_news_5_2_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1391,11 +1391,11 @@
 dynxml-local-news-5.2-remprepped.xml: $(dynxml_local_news_5_2_SOURCES) $(dynxml_local_news_5_2_IDMAPS)
 dynxml-local-news-5.2.xml: $(dynxml_local_news_5_2_INCLUDES)
 dynxml_local_news_6_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1446,15 +1446,15 @@
 dynxml-local-news-6.0-remprepped.xml: $(dynxml_local_news_6_0_SOURCES) $(dynxml_local_news_6_0_IDMAPS)
 dynxml-local-news-6.0.xml: $(dynxml_local_news_6_0_INCLUDES)
 dynxml_local_programs_admin_util_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbackup.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqlbackup.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1487,16 +1487,16 @@
 dynxml-local-programs-admin-util-remprepped.xml: $(dynxml_local_programs_admin_util_SOURCES) $(dynxml_local_programs_admin_util_IDMAPS)
 dynxml-local-programs-admin-util.xml: $(dynxml_local_programs_admin_util_INCLUDES)
 dynxml_local_programs_client_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1534,10 +1534,10 @@
 dynxml-local-programs-client-remprepped.xml: $(dynxml_local_programs_client_SOURCES) $(dynxml_local_programs_client_IDMAPS)
 dynxml-local-programs-client.xml: $(dynxml_local_programs_client_INCLUDES)
 dynxml_local_programs_server_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1566,9 +1566,9 @@
 dynxml-local-programs-server-remprepped.xml: $(dynxml_local_programs_server_SOURCES) $(dynxml_local_programs_server_IDMAPS)
 dynxml-local-programs-server.xml: $(dynxml_local_programs_server_INCLUDES)
 dynxml_local_quickref_INCLUDES = \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1617,10 +1617,10 @@
 dynxml-local-quickref-remprepped.xml: $(dynxml_local_quickref_SOURCES) $(dynxml_local_quickref_IDMAPS)
 dynxml-local-quickref.xml: $(dynxml_local_quickref_INCLUDES)
 dynxml_local_replication_options_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1653,9 +1653,9 @@
 dynxml-local-replication-options-remprepped.xml: $(dynxml_local_replication_options_SOURCES) $(dynxml_local_replication_options_IDMAPS)
 dynxml-local-replication-options.xml: $(dynxml_local_replication_options_INCLUDES)
 dynxml_local_se_archive_INCLUDES = \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1679,11 +1679,11 @@
 dynxml-local-se-archive-remprepped.xml: $(dynxml_local_se_archive_SOURCES) $(dynxml_local_se_archive_IDMAPS)
 dynxml-local-se-archive.xml: $(dynxml_local_se_archive_INCLUDES)
 dynxml_local_se_falcon_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1708,11 +1708,11 @@
 dynxml-local-se-falcon-remprepped.xml: $(dynxml_local_se_falcon_SOURCES) $(dynxml_local_se_falcon_IDMAPS)
 dynxml-local-se-falcon.xml: $(dynxml_local_se_falcon_INCLUDES)
 dynxml_local_se_innodb_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1745,11 +1745,11 @@
 dynxml-local-se-innodb-remprepped.xml: $(dynxml_local_se_innodb_SOURCES) $(dynxml_local_se_innodb_IDMAPS)
 dynxml-local-se-innodb.xml: $(dynxml_local_se_innodb_INCLUDES)
 dynxml_local_se_maria_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1773,9 +1773,9 @@
 dynxml-local-se-maria-remprepped.xml: $(dynxml_local_se_maria_SOURCES) $(dynxml_local_se_maria_IDMAPS)
 dynxml-local-se-maria.xml: $(dynxml_local_se_maria_INCLUDES)
 dynxml_local_se_memory_INCLUDES = \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1799,11 +1799,11 @@
 dynxml-local-se-memory-remprepped.xml: $(dynxml_local_se_memory_SOURCES) $(dynxml_local_se_memory_IDMAPS)
 dynxml-local-se-memory.xml: $(dynxml_local_se_memory_INCLUDES)
 dynxml_local_se_myisam_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -1835,12 +1835,12 @@
 dynxml-local-se-myisam-remprepped.xml: $(dynxml_local_se_myisam_SOURCES) $(dynxml_local_se_myisam_IDMAPS)
 dynxml-local-se-myisam.xml: $(dynxml_local_se_myisam_INCLUDES)
 dynxml_local_storage_engines_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/storage-engines/engines.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -2301,58 +2301,58 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_INCLUDES = \
-	../../mysqldoc/dynamic-docs/build-configure/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbackup.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-c.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/faq/connector-net.xml \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/faq/se-maria.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
-	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
-	../../mysqldoc/dynamic-docs/storage-engines/engines.xml \
-	../../mysqldoc/dynamic-docs/topic-quickref/quickrefs.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/build-configure/mysqld.xml \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbackup.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/faq/connector-c.xml \
+	../dynamic-docs/faq/connector-cpp.xml \
+	../dynamic-docs/faq/connector-net.xml \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
+	../dynamic-docs/faq/se-maria.xml \
+	../dynamic-docs/metadata-titles.en.xml \
+	../dynamic-docs/opsfunctions/opfunctions.xml \
+	../dynamic-docs/storage-engines/engines.xml \
+	../dynamic-docs/topic-quickref/quickrefs.xml \
 	../gui-common/gui-common.ent \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \

@@ -2361,9 +2361,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -2412,7 +2409,11 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -2811,6 +2812,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -3003,6 +3006,7 @@
 	../mysql-monitor-2.0/metadata/install.idmap \
 	../mysql-monitor-2.0/metadata/log-files.idmap \
 	../mysql-monitor-2.0/metadata/monitor-faq-core.idmap \
+	../mysql-monitor-2.1/metadata/dashboard-whatsnew.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 \

@@ -3139,11 +3143,11 @@
 manual-remprepped.xml: $(manual_SOURCES) $(manual_IDMAPS)
 
 monitor_refman_chapter_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \

@@ -3151,9 +3155,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -3201,7 +3202,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -3273,6 +3278,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -3326,11 +3333,11 @@
 monitor-refman-chapter-base-remprepped.xml: $(monitor_refman_chapter_base_SOURCES) $(monitor_refman_chapter_base_IDMAPS)
 
 monitor_refman_chapter_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/monitor.xml \
 	../common/fixedchars.ent \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/all-entities.ent \
 	../mysql-monitor-2.0/dashboard-advisors.xml \

@@ -3338,9 +3345,6 @@
 	../mysql-monitor-2.0/dashboard-overview.xml \
 	../mysql-monitor-2.0/dashboard-replication.xml \
 	../mysql-monitor-2.0/deployment.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-configure.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml \
-	../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml \
 	../mysql-monitor-2.0/images/published/advisors-edit.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx1.png \
 	../mysql-monitor-2.0/images/published/agent-install-osx3.png \

@@ -3388,7 +3392,11 @@
 	../mysql-monitor-2.0/introduction.xml \
 	../mysql-monitor-2.0/monitor-faq-core.xml \
 	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-2.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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/enterprise.ent \
 	../mysql-monitor-common/enterprise.ent \
 	../mysql-monitor-common/images/published/events-screen.png \

@@ -3460,6 +3468,8 @@
 	../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.1/images/published/events-screen.png \
+	../mysql-monitor-2.1/images/published/mem-settings-global.png \
 	../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 \

@@ -3513,10 +3523,10 @@
 news-6.0-core-remprepped.xml: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
 
 news_monitor_2_0_arbitrary_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -3566,10 +3576,10 @@
 news-monitor-2.0-base-remprepped.xml: $(news_monitor_2_0_base_SOURCES) $(news_monitor_2_0_base_IDMAPS)
 
 news_monitor_2_0_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -3593,27 +3603,27 @@
 news-monitor-2.0-remprepped.xml: $(news_monitor_2_0_SOURCES) $(news_monitor_2_0_IDMAPS)
 
 news_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/monitor.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysql-proxy.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../dynamic-docs/changelog/connector-cpp.xml \
+	../dynamic-docs/changelog/connector-j-versions.xml \
+	../dynamic-docs/changelog/connector-j.xml \
+	../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../dynamic-docs/changelog/connector-mxj.xml \
+	../dynamic-docs/changelog/connector-net-versions.xml \
+	../dynamic-docs/changelog/connector-net.xml \
+	../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../dynamic-docs/changelog/connector-odbc.xml \
+	../dynamic-docs/changelog/monitor-versions.xml \
+	../dynamic-docs/changelog/monitor.xml \
+	../dynamic-docs/changelog/mysql-proxy-versions.xml \
+	../dynamic-docs/changelog/mysql-proxy.xml \
+	../dynamic-docs/changelog/mysqld-1.xml \
+	../dynamic-docs/changelog/mysqld-versions.xml \
+	../dynamic-docs/changelog/mysqld.xml \
+	../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../dynamic-docs/changelog/vstudioplugin.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/version.ent \

@@ -3930,23 +3940,23 @@
 programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
 
 programs_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysql.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqladmin.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbackup.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlbinlog.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlcheck.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldump.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqldumpslow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlhotcopy.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlimport.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlshow.xml \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqlslap.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/myisamchk.xml \
+	../dynamic-docs/command-optvars/mysql.xml \
+	../dynamic-docs/command-optvars/mysqlaccess.xml \
+	../dynamic-docs/command-optvars/mysqladmin.xml \
+	../dynamic-docs/command-optvars/mysqlbackup.xml \
+	../dynamic-docs/command-optvars/mysqlbinlog.xml \
+	../dynamic-docs/command-optvars/mysqlcheck.xml \
+	../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../dynamic-docs/command-optvars/mysqldump.xml \
+	../dynamic-docs/command-optvars/mysqldumpslow.xml \
+	../dynamic-docs/command-optvars/mysqlhotcopy.xml \
+	../dynamic-docs/command-optvars/mysqlimport.xml \
+	../dynamic-docs/command-optvars/mysqlshow.xml \
+	../dynamic-docs/command-optvars/mysqlslap.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -4016,10 +4026,10 @@
 quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
 
 replication_configuration_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -4126,19 +4136,6 @@
 replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 
-replication_options_core_INCLUDES =
-replication_options_core_IMAGES =
-replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
-replication_options_core_IDMAPS =
-replication-options-core.validpure: $(replication_options_core_SOURCES)
-replication-options-core.titles: $(replication_options_core_SOURCES)
-replication-options-core.useless: $(replication_options_core_SOURCES)
-replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-
 replication_solutions_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4199,10 +4196,10 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES) $(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
-	../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../dynamic-docs/metadata-titles.en.xml \
 	../gui-common/gui-common.ent \
 	../mysql-monitor-2.0/version.ent \
 	../mysql-monitor-common/enterprise.ent \

@@ -5057,7 +5054,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../../mysqldoc/dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../../mysqldoc/dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent news-monitor-2.0-aspec.xml ../gui-common/gui-common.ent ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
+news-monitor-2.0-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.0/news-monitor-core.xml ../dynamic-docs/changelog/monitor.xml news-monitor-2.0-base.xml ../dynamic-docs/changelog/monitor-versions.xml versions.ent ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.0/version.ent ../mysql-monitor-common/enterprise.ent news-monitor-2.0-aspec.xml ../gui-common/gui-common.ent ../mysql-monitor-2.0/metadata/news-monitor-core.idmap ../common/fixedchars.ent
 	$(MAKE) news-monitor-2.0.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -5067,7 +5064,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-2.0/images/published/monitor-update-install-7.png ../mysql-monitor-2.0/images/published/monitor-install-win1.png ../mysql-monitor-2.0/dashboard-graphs.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-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/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/im!
 ages/published/mem-settings-users.png ../mysql-monitor-2.0/ima!
 ges/publ
ished/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/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/dynsel-default-monitor-dashboard-configure.xml ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-configure.idmap ../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/metadata/install-upgrades.idmap!
  ../mysql-monitor-common/images/published/mem-settings-global.!
 png ../m
ysql-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 ../../mysqldoc/dynamic-docs/faq/monitor.xml ../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-monit!
 or-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/metadata/dynsel-default-monitor-dashboard-events.idmap ../mysql-monitor-2.0/dashboard-overview.xml ../mysql-monitor-2.0/dynsel-default-monitor-dashboard-query-analysis.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.0/metadata/dynsel-default-monitor-dashboard-q!
 uery-analysis.idmap ../mysql-monitor-2.0/metadata/install-post!
 install.
idmap ../mysql-monitor-2.0/dynsel-default-monitor-dashboard-events.xml ../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-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.1/images/published/mem-settings-global.png ../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 ../dynamic-docs/faq/monitor.xml ../mysql-monitor-2.0/version.ent ../mysql-monitor-2.0/images/published/monitor-update-install-4.png ../mysql-monitor-2.1/images/published/events-screen.png ../mysql-monitor!
 -2.0/metadata/install-postinstall.idmap ../mysql-monitor-2.0/i!
 nstall-a
gent.xml ../mysql-monitor-2.0/images/published/monitor-migration-confirm.png ../mysql-monitor-2.0/images/published/agent-install-osx4.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-common/Makefile.depends
===================================================================
--- trunk/refman-common/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/refman-common/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1519 bytes

@@ -162,9 +162,9 @@
 connector-odbc-remprepped.xml: $(connector_odbc_SOURCES) $(connector_odbc_IDMAPS)
 
 dynxml_common_ha_memcached_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/memcached.xml \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	ha-memcached-core.xml \

@@ -189,9 +189,9 @@
 dynxml-common-ha-memcached-remprepped.xml: $(dynxml_common_ha_memcached_SOURCES) $(dynxml_common_ha_memcached_IDMAPS)
 dynxml-common-ha-memcached.xml: $(dynxml_common_ha_memcached_INCLUDES)
 dynxml_common_mysql_proxy_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/mysql-proxy.xml \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/published/proxy-architecture.png \

@@ -306,10 +306,10 @@
 ha-zfs-remprepped.xml: $(ha_zfs_SOURCES) $(ha_zfs_IDMAPS)
 
 ha_INCLUDES = \
-	../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/faq/memcached.xml \
+	../dynamic-docs/faq/mysql-proxy.xml \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	dynxml-common-ha-memcached.xml \


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 10, Lines Added: 17, Lines Deleted: 17; 12803 bytes

@@ -1,7 +1,7 @@
 dynxml_local_mysql_security_faq_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.0/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \

@@ -433,12 +433,12 @@
 mysql-macosx-excerpt-remprepped.xml: $(mysql_macosx_excerpt_SOURCES) $(mysql_macosx_excerpt_IDMAPS)
 
 mysql_replication_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \
 	../../refman-5.0/all-entities.ent \

@@ -504,12 +504,12 @@
 mysql-replication-excerpt-base-remprepped.xml: $(mysql_replication_excerpt_base_SOURCES) $(mysql_replication_excerpt_base_IDMAPS)
 
 mysql_replication_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \
 	../../refman-5.0/all-entities.ent \

@@ -550,10 +550,10 @@
 mysql-replication-excerpt-remprepped.xml: $(mysql_replication_excerpt_SOURCES) $(mysql_replication_excerpt_IDMAPS)
 
 mysql_security_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/backup.xml \
 	../../refman-5.0/dba-privilege-system.xml \
 	../../refman-5.0/dba-security-core.xml \

@@ -605,11 +605,11 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/faq/mysql-security.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/backup.xml \
 	../../refman-5.0/dba-privilege-system.xml \
 	../../refman-5.0/dba-security-core.xml \

@@ -789,10 +789,10 @@
 mysql-sourcebuild-excerpt-remprepped.xml: $(mysql_sourcebuild_excerpt_SOURCES) $(mysql_sourcebuild_excerpt_IDMAPS)
 
 mysql_startstop_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/dba-mysqld-server-core.xml \
 	../../refman-5.0/installing-core.xml \
 	../../refman-5.0/programs-server-core.xml \

@@ -841,10 +841,10 @@
 mysql-startstop-excerpt-base-remprepped.xml: $(mysql_startstop_excerpt_base_SOURCES) $(mysql_startstop_excerpt_base_IDMAPS)
 
 mysql_startstop_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.0/dba-mysqld-server-core.xml \
 	../../refman-5.0/installing-core.xml \
 	../../refman-5.0/legalnotice.en.xml \

@@ -1095,7 +1095,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.0/metadata/programs-server-core.idmap ../../refman-common/urls.ent ../../refman-5.0/metadata/dba-mysqld-server-core.idmap ../../refman-5.0/programs-server-core.xml mysql-startstop-excerpt-base.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.0/metadata/installing-core.idmap ../../refman-5.0/dba-mysqld-server-core.xml all-entities.ent mysql-startstop-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.0/versions.ent ../../refman-5.0/installing-core.xml
+mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.0/metadata/programs-server-core.idmap ../../refman-common/urls.ent ../../refman-5.0/metadata/dba-mysqld-server-core.idmap ../../refman-5.0/programs-server-core.xml ../../dynamic-docs/metadata-titles.en.xml mysql-startstop-excerpt-base.xml ../../refman-5.0/metadata/installing-core.idmap ../../refman-5.0/dba-mysqld-server-core.xml ../../dynamic-docs/command-optvars/mysqld_safe.xml all-entities.ent mysql-startstop-excerpt-aspec.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.0/versions.ent ../../refman-5.0/installing-core.xml
 	$(MAKE) mysql-startstop-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1125,7 +1125,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.0/metadata/replication-implementation.idmap ../../refman-5.0/../refman-common/images/published/submaster-performance.png ../../refman-5.0/../refman-common/images/published/redundancy-after.png ../../refman-5.0/versions.ent ../../refman-5.0/../common/phrases.ent ../../refman-5.0/replication-solutions.xml ../../refman-5.0/../refman-common/images/published/redundancy-before.png all-entities.ent ../../refman-5.0/../refman-common/images/published/multi-db.png ../../common/phrases.ent ../../refman-5.0/../refman-common/images/published/scaleout.png ../../refman-5.0/replication-notes.xml mysql-replicatio!
 n-excerpt-aspec.xml ../../refman-5.0/../refman-5.0/replication-options-core.xml ../../refman-5.0/../refman-common/urls.ent ../../refman-5.0/metadata/replication-solutions.idmap ../../refman-common/urls.ent ../../refman-5.0/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.0/replication.xml ../../refman-5.0/metadata/replication-configuration.idmap ../../refman-5.0/../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/all-entities.ent ../../refman-5.0/metadata/replication.idmap ../../refman-5.0/replication-configuration.xml ../../common/fixedchars.ent ../../refman-5.0/dynxml-local-replication-options.xml ../../refman-5.0/../mysql-monitor-common/enterprise.ent ../../refman-5.0/../common/fixedchars.ent mysql-replication-excerpt-base.xml ../../refman-5.0/../mysql-monitor-2.0/version.ent ../../refman-5.0/replication-implementation.xml ../../refman-5.0/metadata/replication-notes.idmap
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.0/metadata/replication-implementation.idmap ../../refman-5.0/../refman-common/images/published/submaster-performance.png ../../refman-5.0/../refman-common/images/published/redundancy-after.png ../../refman-5.0/metadata/replication-options-core.idmap ../../refman-5.0/versions.ent ../../refman-5.0/../common/phrases.ent ../../refman-5.0/../dynamic-docs/metadata-titles.en.xml ../../refman-5.0/replication-solutions.xml ../../refman-5.0/../refman-common/images/published/redundancy-before.png all-entities.ent ../../refman-5.0/../refman-common/images/published/multi-db.png ../../common/phrases.ent ../../!
 refman-5.0/../refman-common/images/published/scaleout.png ../../refman-5.0/replication-notes.xml mysql-replication-excerpt-aspec.xml ../../refman-5.0/../refman-common/urls.ent ../../refman-5.0/metadata/replication-solutions.idmap ../../refman-common/urls.ent ../../refman-5.0/replication.xml ../../refman-5.0/metadata/replication-configuration.idmap ../../refman-5.0/replication-options-core.xml ../../refman-5.0/all-entities.ent ../../refman-5.0/metadata/replication.idmap ../../refman-5.0/replication-configuration.xml ../../common/fixedchars.ent ../../refman-5.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/dynxml-local-replication-options.xml ../../refman-5.0/../mysql-monitor-common/enterprise.ent ../../refman-5.0/../common/fixedchars.ent mysql-replication-excerpt-base.xml ../../refman-5.0/../mysql-monitor-2.0/version.ent ../../refman-5.0/replication-implementation.xml ../../refman-5.0/metadata/replication-notes.idmap
 	$(MAKE) mysql-replication-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1155,7 +1155,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-5.0/backup.xml ../../refman-common/urls.ent ../../refman-5.0/metadata/dba-privilege-system.idmap ../../refman-5.0/dba-security-core.xml mysql-security-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.0/metadata/dba-user-management-core.idmap ../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/dba-user-management-core.xml ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.0/versions.ent ../../refman-5.0/installing-core.xml ../../refman-5.0/dba-privilege-system.xml ../../refman-5.0/metadata/backup.idmap ../../refman-5.0/metadata/installing-core.id!
 map ../../refman-5.0/metadata/dba-security-core.idmap all-entities.ent ../../common/phrases.ent
+mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-5.0/backup.xml ../../refman-common/urls.ent ../../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.0/metadata/dba-privilege-system.idmap ../../refman-5.0/dba-security-core.xml ../../dynamic-docs/metadata-titles.en.xml mysql-security-excerpt-aspec.xml ../../refman-5.0/metadata/dba-user-management-core.idmap ../../refman-5.0/dba-user-management-core.xml ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.0/versions.ent ../../refman-5.0/installing-core.xml ../../refman-5.0/dba-privilege-system.xml ../../refman-5.0/metadata/backup.idmap ../../refman-5.0/metadata/installing-core.idmap ../../refman-5.0/met!
 adata/dba-security-core.idmap all-entities.ent ../../common/phrases.ent
 	$(MAKE) mysql-security-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 13, Lines Added: 42, Lines Deleted: 42; 27178 bytes

@@ -1,7 +1,7 @@
 dynxml_local_mysql_security_faq_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.1/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \

@@ -97,20 +97,20 @@
 mysql-backup-excerpt-remprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 
 mysql_cluster_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/command-optvars/ndb_common.xml \
+	../../dynamic-docs/command-optvars/ndb_config.xml \
+	../../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../../dynamic-docs/command-optvars/ndb_restore.xml \
+	../../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../../dynamic-docs/command-optvars/ndbd.xml \
+	../../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-4.1/mysql-cluster-faq.xml \
 	../../refman-5.1/mysql-cluster-configuration.xml \
 	../../refman-5.1/mysql-cluster-disk-data.xml \

@@ -209,20 +209,20 @@
 mysql-cluster-excerpt-base-remprepped.xml: $(mysql_cluster_excerpt_base_SOURCES) $(mysql_cluster_excerpt_base_IDMAPS)
 
 mysql_cluster_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_config.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml \
-	../../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/command-optvars/ndb_common.xml \
+	../../dynamic-docs/command-optvars/ndb_config.xml \
+	../../dynamic-docs/command-optvars/ndb_error_reporter.xml \
+	../../dynamic-docs/command-optvars/ndb_mgm.xml \
+	../../dynamic-docs/command-optvars/ndb_mgmd.xml \
+	../../dynamic-docs/command-optvars/ndb_restore.xml \
+	../../dynamic-docs/command-optvars/ndb_show_tables.xml \
+	../../dynamic-docs/command-optvars/ndb_size_pl.xml \
+	../../dynamic-docs/command-optvars/ndbd.xml \
+	../../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-4.1/mysql-cluster-faq.xml \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/mysql-cluster-configuration.xml \

@@ -754,12 +754,12 @@
 mysql-partitioning-excerpt-remprepped.xml: $(mysql_partitioning_excerpt_SOURCES) $(mysql_partitioning_excerpt_IDMAPS)
 
 mysql_replication_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -828,12 +828,12 @@
 mysql-replication-excerpt-base-remprepped.xml: $(mysql_replication_excerpt_base_SOURCES) $(mysql_replication_excerpt_base_IDMAPS)
 
 mysql_replication_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -877,10 +877,10 @@
 mysql-replication-excerpt-remprepped.xml: $(mysql_replication_excerpt_SOURCES) $(mysql_replication_excerpt_IDMAPS)
 
 mysql_security_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.1/backup.xml \
 	../../refman-5.1/dba-privilege-system.xml \
 	../../refman-5.1/dba-security-core.xml \

@@ -932,11 +932,11 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/faq/mysql-security.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.1/backup.xml \
 	../../refman-5.1/dba-privilege-system.xml \
 	../../refman-5.1/dba-security-core.xml \

@@ -1116,10 +1116,10 @@
 mysql-sourcebuild-excerpt-remprepped.xml: $(mysql_sourcebuild_excerpt_SOURCES) $(mysql_sourcebuild_excerpt_IDMAPS)
 
 mysql_startstop_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.1/dba-mysqld-server-core.xml \
 	../../refman-5.1/installing-core.xml \
 	../../refman-5.1/programs-server-core.xml \

@@ -1168,10 +1168,10 @@
 mysql-startstop-excerpt-base-remprepped.xml: $(mysql_startstop_excerpt_base_SOURCES) $(mysql_startstop_excerpt_base_IDMAPS)
 
 mysql_startstop_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.1/dba-mysqld-server-core.xml \
 	../../refman-5.1/installing-core.xml \
 	../../refman-5.1/legalnotice.en.xml \

@@ -1406,7 +1406,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.1/programs-server-core.xml ../../refman-common/urls.ent mysql-startstop-excerpt-base.xml ../../refman-5.1/metadata/programs-server-core.idmap ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.1/metadata/installing-core.idmap ../../refman-5.1/dba-mysqld-server-core.xml ../../refman-5.1/versions.ent all-entities.ent mysql-startstop-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml ../../common/phrases.ent ../../refman-5.1/installing-core.xml ../../common/fixedchars.ent ../../refman-5.1/metadata/dba-mysqld-server-core.idmap
+mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.1/programs-server-core.xml ../../refman-common/urls.ent ../../dynamic-docs/metadata-titles.en.xml mysql-startstop-excerpt-base.xml ../../refman-5.1/metadata/programs-server-core.idmap ../../refman-5.1/metadata/installing-core.idmap ../../refman-5.1/dba-mysqld-server-core.xml ../../dynamic-docs/command-optvars/mysqld_safe.xml ../../refman-5.1/versions.ent all-entities.ent mysql-startstop-excerpt-aspec.xml ../../common/phrases.ent ../../refman-5.1/installing-core.xml ../../common/fixedchars.ent ../../refman-5.1/metadata/dba-mysqld-server-core.idmap
 	$(MAKE) mysql-startstop-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1436,7 +1436,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-cluster-excerpt-aspec.xml.mysql-cluster-programs.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-faq.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-replication.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-interconnects.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-glossary.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-overview.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-disk-data.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-management.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-upgrade-downgrade.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-limitations.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-options-variables.none.chapter.xml mysql-cluster-excerpt-aspec.xm!
 l.mysql-cluster-security.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-multi-computer.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-roadmap.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/replicas-groups-1-2.png ../../../mysqldoc/dynamic-docs/command-optvars/ndbd.xml ../../../mysqldoc/dynamic-docs/command-optvars/ndb_common.xml ../../refman-5.1/mysql-cluster.xml ../../refman-5.1/metadata/mysql-cluster-replication.idmap ../../refman-5.1/../refman-common/images/published/rolling-restarts.png mysql-cluster-excerpt-aspec.xml ../../refman-5.1/mysql-cluster-replication.xml ../../refman-5.1/../refman-common/images/published/cluster-security-network-1.png ../../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap ../../refman-5.1/metadata/mysql-cluster-limitations.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-3.png ../../refman-5.1/mysql-cluster-overview.xml ../../refman-5.1/../refman-co!
 mmon/images/published/cluster-replication-overview.png ../../r!
 efman-5.
1/mysql-cluster-disk-data.xml ../../common/phrases.ent ../../refman-5.1/mysql-cluster-interconnects.xml ../../refman-5.1/metadata/mysql-cluster-configuration.idmap ../../refman-common/urls.ent ../../../mysqldoc/dynamic-docs/command-optvars/ndb_restore.xml ../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgm.xml ../../refman-5.1/metadata/mysql-cluster-disk-data.idmap ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.1/mysql-cluster-multi-computer.xml ../../../mysqldoc/dynamic-docs/command-optvars/ndb_error_reporter.xml ../../refman-5.1/versions.ent mysql-cluster-excerpt-base.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-2.png ../../common/fixedchars.ent ../../refman-5.1/mysql-cluster-limitations.xml ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master-mysqlds.png ../../refman-5.1/metadata/mysql-cluster-overview.idmap ../../refman-5.1/metadata/mysql-cluster-interconnects.idmap ../../refma!
 n-5.1/../refman-common/images/published/multi-comp-1.png ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master.png ../../refman-4.1/mysql-cluster-faq.xml ../../refman-5.1/mysql-cluster-optvar-core.xml ../../../mysqldoc/dynamic-docs/command-optvars/ndbd_redo_log_reader.xml ../../refman-5.1/metadata/mysql-cluster-optvar-core.idmap ../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap ../../refman-5.1/mysql-cluster-security.xml ../../refman-5.1/mysql-cluster-configuration.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.1/metadata/mysql-cluster-management.idmap ../../refman-5.1/../refman-common/images/published/cluster-components-1.png ../../../mysqldoc/dynamic-docs/command-optvars/ndb_size_pl.xml ../../refman-5.1/metadata/mysql-cluster-roadmap.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-2.png ../../refman-5.1/../refman-common/images/published/replicas-groups-1-1.png ../../..!
 /mysqldoc/dynamic-docs/command-optvars/ndb_config.xml ../../re!
 fman-5.1
/metadata/mysql-cluster.idmap ../../refman-5.1/metadata/mysql-cluster-security.idmap all-entities.ent ../../refman-5.1/mysql-cluster-management.xml ../../refman-5.1/mysql-cluster-glossary.xml ../../refman-5.1/../refman-common/images/published/cluster-replication-binlog-injector.png ../../../mysqldoc/dynamic-docs/command-optvars/ndb_show_tables.xml ../../refman-5.1/../refman-common/images/published/ndb-size-pl-1.png ../../../mysqldoc/dynamic-docs/command-optvars/ndb_mgmd.xml ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png ../../refman-5.1/../refman-common/images/published/cluster-replication-ipv6.png ../../refman-5.1/mysql-cluster-roadmap.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-1.png ../../refman-5.1/mysql-cluster-programs-core.xml ../../refman-5.1/mysql-cluster-upgrade-downgrade.xml ../../refman-5.1/!
 metadata/mysql-cluster-programs-core.idmap ../../refman-5.1/metadata/mysql-cluster-glossary.idmap
+mysql-cluster-excerpt-aspec.xml.mysql-cluster-programs.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-faq.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-replication.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-interconnects.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-glossary.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-overview.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-disk-data.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-management.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-upgrade-downgrade.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-limitations.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-options-variables.none.chapter.xml mysql-cluster-excerpt-aspec.xm!
 l.mysql-cluster-security.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-multi-computer.none.chapter.xml mysql-cluster-excerpt-aspec.xml.mysql-cluster-roadmap.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/replicas-groups-1-2.png ../../refman-5.1/mysql-cluster.xml ../../refman-5.1/metadata/mysql-cluster-replication.idmap ../../refman-5.1/../refman-common/images/published/rolling-restarts.png mysql-cluster-excerpt-aspec.xml ../../refman-5.1/mysql-cluster-replication.xml ../../refman-5.1/../refman-common/images/published/cluster-security-network-1.png ../../refman-5.1/metadata/mysql-cluster-upgrade-downgrade.idmap ../../refman-5.1/metadata/mysql-cluster-limitations.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-3.png ../../refman-5.1/mysql-cluster-overview.xml ../../refman-5.1/../refman-common/images/published/cluster-replication-overview.png ../../refman-5.1/mysql-cluster-disk-data.xml ../../common/phras!
 es.ent ../../refman-5.1/mysql-cluster-interconnects.xml ../../!
 refman-5
.1/metadata/mysql-cluster-configuration.idmap ../../refman-common/urls.ent ../../dynamic-docs/command-optvars/ndb_config.xml ../../refman-5.1/metadata/mysql-cluster-disk-data.idmap ../../refman-5.1/mysql-cluster-multi-computer.xml ../../refman-5.1/versions.ent mysql-cluster-excerpt-base.xml ../../dynamic-docs/command-optvars/ndb_show_tables.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-2.png ../../common/fixedchars.ent ../../refman-5.1/mysql-cluster-limitations.xml ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master-mysqlds.png ../../refman-5.1/metadata/mysql-cluster-overview.idmap ../../refman-5.1/metadata/mysql-cluster-interconnects.idmap ../../refman-5.1/../refman-common/images/published/multi-comp-1.png ../../dynamic-docs/command-optvars/ndb_size_pl.xml ../../refman-5.1/../refman-common/images/published/cluster-replication-multi-master.png ../../refman-4.1/mysql-cluster-faq.xml ../../refman-5.1/mysql-c!
 luster-optvar-core.xml ../../refman-5.1/metadata/mysql-cluster-optvar-core.idmap ../../dynamic-docs/command-optvars/ndb_error_reporter.xml ../../refman-5.1/metadata/mysql-cluster-multi-computer.idmap ../../dynamic-docs/command-optvars/mysqld.xml ../../refman-5.1/mysql-cluster-security.xml ../../dynamic-docs/metadata-titles.en.xml ../../dynamic-docs/command-optvars/ndb_common.xml ../../refman-5.1/mysql-cluster-configuration.xml ../../refman-5.1/metadata/mysql-cluster-management.idmap ../../refman-5.1/../refman-common/images/published/cluster-components-1.png ../../refman-5.1/metadata/mysql-cluster-roadmap.idmap ../../refman-5.1/../refman-common/images/published/cluster-security-network-2.png ../../refman-5.1/../refman-common/images/published/replicas-groups-1-1.png ../../refman-5.1/metadata/mysql-cluster.idmap ../../refman-5.1/metadata/mysql-cluster-security.idmap all-entities.ent ../../refman-5.1/mysql-cluster-management.xml ../../refman-5.1/mysql-cluster-glossary.xml ../..!
 /dynamic-docs/command-optvars/ndbd.xml ../../refman-5.1/../ref!
 man-comm
on/images/published/cluster-replication-binlog-injector.png ../../refman-5.1/../refman-common/images/published/ndb-size-pl-1.png ../../dynamic-docs/command-optvars/ndb_restore.xml ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png ../../refman-5.1/../refman-common/images/published/mysql-cluster-upgrade-downgrade-5-1.png ../../refman-5.1/../refman-common/images/published/cluster-replication-ipv6.png ../../dynamic-docs/command-optvars/ndbd_redo_log_reader.xml ../../refman-5.1/mysql-cluster-roadmap.xml ../../dynamic-docs/command-optvars/ndb_mgm.xml ../../refman-5.1/../refman-common/images/published/cluster-circular-replication-1.png ../../refman-5.1/mysql-cluster-programs-core.xml ../../dynamic-docs/command-optvars/ndb_mgmd.xml ../../refman-5.1/mysql-cluster-upgrade-downgrade.xml ../../refman-5.1/metadata/mysql-cluster-programs-core.idmap ../../refman-5.1/metadata/mysql-cluster-glossary.idmap
 	$(MAKE) mysql-cluster-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1446,7 +1446,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/scaleout.png ../../refman-5.1/replication-notes.xml ../../refman-5.1/../refman-common/images/published/multi-db.png ../../refman-5.1/../gui-common/gui-common.ent ../../refman-5.1/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.1/../common/fixedchars.ent ../../refman-5.1/replication.xml ../../refman-5.1/replication-options-core.xml ../../refman-5.1/../mysql-monitor-2.0/version.ent ../../refman-5.1/dynxml-local-replication-options.xml ../../refman-5.1/../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.1/../refman-common/urls.e!
 nt ../../refman-5.1/metadata/replication-implementation.idmap ../../refman-5.1/../refman-common/images/published/submaster-performance.png all-entities.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/redundancy-after.png mysql-replication-excerpt-aspec.xml ../../refman-common/urls.ent ../../refman-5.1/../refman-common/images/published/redundancy-before.png ../../refman-5.1/replication-configuration.xml ../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.1/versions.ent ../../refman-5.1/replication-implementation.xml ../../refman-5.1/metadata/replication.idmap ../../common/fixedchars.ent ../../refman-5.1/metadata/replication-configuration.idmap ../../refman-5.1/metadata/replication-notes.idmap ../../refman-5.1/metadata/replication-options-core.idmap ../../refman-5.1/../common/phrases.ent ../../refman-5.1/metadata/replication-solutions.idmap ../../refman-5.1/all-entities.ent ../../refman-5.1/replic!
 ation-solutions.xml ../../refman-5.1/../mysql-monitor-common/e!
 nterpris
e.ent mysql-replication-excerpt-base.xml
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.1/../refman-common/images/published/scaleout.png ../../refman-5.1/replication-notes.xml ../../refman-5.1/../refman-common/images/published/multi-db.png ../../refman-5.1/../gui-common/gui-common.ent ../../refman-5.1/../common/fixedchars.ent ../../refman-5.1/replication.xml ../../refman-5.1/replication-options-core.xml ../../refman-5.1/../mysql-monitor-2.0/version.ent ../../refman-5.1/dynxml-local-replication-options.xml ../../refman-5.1/../refman-common/urls.ent ../../refman-5.1/metadata/replication-implementation.idmap ../../refman-5.1/../refman-common/images/published/submaster-performance.png a!
 ll-entities.ent ../../common/phrases.ent ../../refman-5.1/../refman-common/images/published/redundancy-after.png mysql-replication-excerpt-aspec.xml ../../refman-common/urls.ent ../../refman-5.1/../refman-common/images/published/redundancy-before.png ../../refman-5.1/replication-configuration.xml ../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.1/versions.ent ../../refman-5.1/replication-implementation.xml ../../refman-5.1/metadata/replication.idmap ../../refman-5.1/../dynamic-docs/metadata-titles.en.xml ../../common/fixedchars.ent ../../refman-5.1/metadata/replication-configuration.idmap ../../refman-5.1/metadata/replication-notes.idmap ../../refman-5.1/metadata/replication-options-core.idmap ../../refman-5.1/../common/phrases.ent ../../refman-5.1/metadata/replication-solutions.idmap ../../refman-5.1/all-entities.ent ../../refman-5.1/replication-solutions.xml ../../refman-5.1/../mysql-monitor-common/enterprise.ent mysql-re!
 plication-excerpt-base.xml ../../refman-5.1/../dynamic-docs/co!
 mmand-op
tvars/mysqld.xml
 	$(MAKE) mysql-replication-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1486,7 +1486,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-5.1/metadata/dba-security-core.idmap ../../refman-common/urls.ent mysql-security-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.1/metadata/installing-core.idmap ../../refman-5.1/metadata/dba-user-management-core.idmap ../../refman-5.1/versions.ent ../../refman-5.1/dba-user-management-core.xml ../../refman-5.1/installing-core.xml ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.1/metadata/dba-privilege-system.idmap ../../refman-5.1/dba-privilege-system.xml all-entities.ent ../../common/phrases.ent ../../refm!
 an-5.1/dba-security-core.xml ../../refman-5.1/backup.xml ../../refman-5.1/metadata/backup.idmap
+mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-5.1/metadata/dba-security-core.idmap ../../refman-common/urls.ent ../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml mysql-security-excerpt-aspec.xml ../../refman-5.1/metadata/installing-core.idmap ../../refman-5.1/metadata/dba-user-management-core.idmap ../../refman-5.1/versions.ent ../../refman-5.1/dba-user-management-core.xml ../../refman-5.1/installing-core.xml ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.1/metadata/dba-privilege-system.idmap ../../refman-5.1/dba-privilege-system.xml all-entities.ent ../../common/phrases.ent ../../refman-5.1/dba-security-core!
 .xml ../../refman-5.1/backup.xml ../../refman-5.1/metadata/backup.idmap
 	$(MAKE) mysql-security-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/topic-guides/topics-5.4/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.4/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/topic-guides/topics-5.4/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 10, Lines Added: 17, Lines Deleted: 17; 13122 bytes

@@ -1,7 +1,7 @@
 dynxml_local_mysql_security_faq_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.4/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \

@@ -555,12 +555,12 @@
 mysql-partitioning-excerpt-remprepped.xml: $(mysql_partitioning_excerpt_SOURCES) $(mysql_partitioning_excerpt_IDMAPS)
 
 mysql_replication_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -629,12 +629,12 @@
 mysql-replication-excerpt-base-remprepped.xml: $(mysql_replication_excerpt_base_SOURCES) $(mysql_replication_excerpt_base_IDMAPS)
 
 mysql_replication_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -678,10 +678,10 @@
 mysql-replication-excerpt-remprepped.xml: $(mysql_replication_excerpt_SOURCES) $(mysql_replication_excerpt_IDMAPS)
 
 mysql_security_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.4/backup.xml \
 	../../refman-5.4/dba-privilege-system.xml \
 	../../refman-5.4/dba-security-core.xml \

@@ -733,11 +733,11 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/faq/mysql-security.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.4/backup.xml \
 	../../refman-5.4/dba-privilege-system.xml \
 	../../refman-5.4/dba-security-core.xml \

@@ -917,10 +917,10 @@
 mysql-sourcebuild-excerpt-remprepped.xml: $(mysql_sourcebuild_excerpt_SOURCES) $(mysql_sourcebuild_excerpt_IDMAPS)
 
 mysql_startstop_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.4/dba-mysqld-server-core.xml \
 	../../refman-5.4/installing-core.xml \
 	../../refman-5.4/programs-server-core.xml \

@@ -969,10 +969,10 @@
 mysql-startstop-excerpt-base-remprepped.xml: $(mysql_startstop_excerpt_base_SOURCES) $(mysql_startstop_excerpt_base_IDMAPS)
 
 mysql_startstop_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-5.4/dba-mysqld-server-core.xml \
 	../../refman-5.4/installing-core.xml \
 	../../refman-5.4/legalnotice.en.xml \

@@ -1207,7 +1207,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.4/metadata/dba-mysqld-server-core.idmap ../../refman-common/urls.ent ../../refman-5.4/programs-server-core.xml mysql-startstop-excerpt-base.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.4/metadata/programs-server-core.idmap ../../refman-5.4/installing-core.xml ../../refman-5.4/dba-mysqld-server-core.xml all-entities.ent mysql-startstop-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml ../../common/phrases.ent ../../refman-5.4/versions.ent ../../refman-5.4/metadata/installing-core.idmap ../../common/fixedchars.ent
+mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-5.4/metadata/dba-mysqld-server-core.idmap ../../refman-common/urls.ent ../../refman-5.4/programs-server-core.xml ../../dynamic-docs/metadata-titles.en.xml mysql-startstop-excerpt-base.xml ../../refman-5.4/metadata/programs-server-core.idmap ../../refman-5.4/installing-core.xml ../../refman-5.4/dba-mysqld-server-core.xml ../../dynamic-docs/command-optvars/mysqld_safe.xml all-entities.ent mysql-startstop-excerpt-aspec.xml ../../common/phrases.ent ../../refman-5.4/versions.ent ../../refman-5.4/metadata/installing-core.idmap ../../common/fixedchars.ent
 	$(MAKE) mysql-startstop-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1237,7 +1237,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.4/../common/phrases.ent ../../refman-5.4/../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.4/dynxml-local-replication-options.xml ../../refman-5.4/replication-implementation.xml ../../refman-5.4/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.4/replication.xml ../../refman-5.4/replication-solutions.xml ../../refman-5.4/replication-notes.xml ../../refman-5.4/metadata/replication-configuration.idmap ../../refman-5.4/../gui-common/gui-common.ent ../../refman-5.4/../mysql-monitor-common/enterprise.ent ../../refman-5.4/metadata/replication-solutions.idmap ../../re!
 fman-5.4/metadata/replication-notes.idmap ../../refman-5.4/../refman-common/images/published/redundancy-after.png all-entities.ent ../../common/phrases.ent ../../refman-5.4/versions.ent ../../refman-5.4/metadata/replication.idmap ../../refman-5.4/metadata/replication-options-core.idmap mysql-replication-excerpt-aspec.xml ../../refman-5.4/../common/fixedchars.ent ../../refman-common/urls.ent ../../refman-5.4/replication-configuration.xml ../../refman-5.4/../refman-common/images/published/multi-db.png ../../refman-5.4/all-entities.ent ../../refman-5.4/replication-options-core.xml ../../common/fixedchars.ent ../../refman-5.4/../refman-common/images/published/scaleout.png ../../refman-5.4/../refman-common/urls.ent ../../refman-5.4/../refman-common/images/published/redundancy-before.png ../../refman-5.4/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.4/../refman-common/images/published/submaster-performance.png ../../refman-5.4/../mysql-monitor!
 -2.0/version.ent ../../refman-5.4/metadata/replication-impleme!
 ntation.
idmap mysql-replication-excerpt-base.xml
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.4/../common/phrases.ent ../../refman-5.4/../dynamic-docs/metadata-titles.en.xml ../../refman-5.4/dynxml-local-replication-options.xml ../../refman-5.4/replication-implementation.xml ../../refman-5.4/replication.xml ../../refman-5.4/replication-solutions.xml ../../refman-5.4/replication-notes.xml ../../refman-5.4/metadata/replication-configuration.idmap ../../refman-5.4/../gui-common/gui-common.ent ../../refman-5.4/../mysql-monitor-common/enterprise.ent ../../refman-5.4/metadata/replication-solutions.idmap ../../refman-5.4/metadata/replication-notes.idmap ../../refman-5.4/../refman-common/images/p!
 ublished/redundancy-after.png all-entities.ent ../../common/phrases.ent ../../refman-5.4/versions.ent ../../refman-5.4/metadata/replication.idmap ../../refman-5.4/metadata/replication-options-core.idmap mysql-replication-excerpt-aspec.xml ../../refman-5.4/../common/fixedchars.ent ../../refman-common/urls.ent ../../refman-5.4/replication-configuration.xml ../../refman-5.4/../refman-common/images/published/multi-db.png ../../refman-5.4/all-entities.ent ../../refman-5.4/replication-options-core.xml ../../refman-5.4/../dynamic-docs/command-optvars/mysqld.xml ../../common/fixedchars.ent ../../refman-5.4/../refman-common/images/published/scaleout.png ../../refman-5.4/../refman-common/urls.ent ../../refman-5.4/../refman-common/images/published/redundancy-before.png ../../refman-5.4/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-5.4/../refman-common/images/published/submaster-performance.png ../../refman-5.4/../mysql-monitor-2.0/version.ent ../../r!
 efman-5.4/metadata/replication-implementation.idmap mysql-repl!
 ication-
excerpt-base.xml
 	$(MAKE) mysql-replication-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1277,7 +1277,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-common/urls.ent ../../refman-5.4/metadata/dba-security-core.idmap mysql-security-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.4/metadata/dba-privilege-system.idmap ../../refman-5.4/metadata/backup.idmap ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.4/metadata/dba-user-management-core.idmap ../../refman-5.4/backup.xml ../../refman-5.4/dba-privilege-system.xml ../../refman-5.4/installing-core.xml ../../refman-5.4/dba-security-core.xml all-entities.ent ../../refman-5.4/dba-user-management-core.xml ../../r!
 efman-5.4/versions.ent ../../common/phrases.ent ../../refman-5.4/metadata/installing-core.idmap
+mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-common/urls.ent ../../refman-5.4/metadata/dba-security-core.idmap ../../dynamic-docs/command-optvars/mysqld.xml ../../dynamic-docs/metadata-titles.en.xml mysql-security-excerpt-aspec.xml ../../refman-5.4/metadata/dba-privilege-system.idmap ../../refman-5.4/metadata/backup.idmap ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-5.4/metadata/dba-user-management-core.idmap ../../refman-5.4/backup.xml ../../refman-5.4/dba-privilege-system.xml ../../refman-5.4/installing-core.xml ../../refman-5.4/dba-security-core.xml all-entities.ent ../../refman-5.4/dba-user-management-core.xml ../../refman-5.4/versions.ent .!
 ./../common/phrases.ent ../../refman-5.4/metadata/installing-core.idmap
 	$(MAKE) mysql-security-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 10, Lines Added: 17, Lines Deleted: 17; 14815 bytes

@@ -1,7 +1,7 @@
 dynxml_local_mysql_security_faq_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-6.0/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \

@@ -559,12 +559,12 @@
 mysql-partitioning-excerpt-remprepped.xml: $(mysql_partitioning_excerpt_SOURCES) $(mysql_partitioning_excerpt_IDMAPS)
 
 mysql_replication_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -655,12 +655,12 @@
 mysql-replication-excerpt-base-remprepped.xml: $(mysql_replication_excerpt_base_SOURCES) $(mysql_replication_excerpt_base_IDMAPS)
 
 mysql_replication_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../gui-common/gui-common.ent \
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \

@@ -726,10 +726,10 @@
 mysql-replication-excerpt-remprepped.xml: $(mysql_replication_excerpt_SOURCES) $(mysql_replication_excerpt_IDMAPS)
 
 mysql_security_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-6.0/backup.xml \
 	../../refman-6.0/dba-privilege-system.xml \
 	../../refman-6.0/dba-security-core.xml \

@@ -781,11 +781,11 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/faq/mysql-security.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-6.0/backup.xml \
 	../../refman-6.0/dba-privilege-system.xml \
 	../../refman-6.0/dba-security-core.xml \

@@ -965,10 +965,10 @@
 mysql-sourcebuild-excerpt-remprepped.xml: $(mysql_sourcebuild_excerpt_SOURCES) $(mysql_sourcebuild_excerpt_IDMAPS)
 
 mysql_startstop_excerpt_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-6.0/dba-mysqld-server-core.xml \
 	../../refman-6.0/installing-core.xml \
 	../../refman-6.0/programs-server-core.xml \

@@ -1017,10 +1017,10 @@
 mysql-startstop-excerpt-base-remprepped.xml: $(mysql_startstop_excerpt_base_SOURCES) $(mysql_startstop_excerpt_base_IDMAPS)
 
 mysql_startstop_excerpt_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml \
-	../../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/command-optvars/mysqld_safe.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
 	../../refman-6.0/dba-mysqld-server-core.xml \
 	../../refman-6.0/installing-core.xml \
 	../../refman-6.0/legalnotice.en.xml \

@@ -1255,7 +1255,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-6.0/metadata/programs-server-core.idmap ../../refman-6.0/metadata/installing-core.idmap ../../refman-common/urls.ent ../../refman-6.0/dba-mysqld-server-core.xml mysql-startstop-excerpt-base.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-6.0/installing-core.xml ../../refman-6.0/programs-server-core.xml ../../refman-6.0/metadata/dba-mysqld-server-core.idmap ../../refman-6.0/versions.ent all-entities.ent mysql-startstop-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld_safe.xml ../../common/phrases.ent ../../common/fixedchars.ent
+mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.xml mysql-startstop-excerpt-aspec.xml.server-shutdown.none.chapter.xml mysql-startstop-excerpt-aspec.xml.installing-binary.none.chapter.xml mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.xml: ../../refman-6.0/metadata/programs-server-core.idmap ../../refman-6.0/metadata/installing-core.idmap ../../refman-common/urls.ent ../../refman-6.0/dba-mysqld-server-core.xml ../../dynamic-docs/metadata-titles.en.xml mysql-startstop-excerpt-base.xml ../../refman-6.0/installing-core.xml ../../refman-6.0/programs-server-core.xml ../../refman-6.0/metadata/dba-mysqld-server-core.idmap ../../dynamic-docs/command-optvars/mysqld_safe.xml ../../refman-6.0/versions.ent all-entities.ent mysql-startstop-excerpt-aspec.xml ../../common/phrases.ent ../../common/fixedchars.ent
 	$(MAKE) mysql-startstop-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1285,7 +1285,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-6.0/../common/phrases.ent ../../refman-6.0/../mysql-monitor-common/enterprise.ent ../../refman-6.0/../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/metadata/replication-implementation.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/redundancy-before.png ../../refman-6.0/dynxml-local-replication-options.xml ../../refman-6.0/replication-options-core.xml ../../refman-6.0/versions.ent ../../refman-6.0/all-entities.ent!
  ../../refman-6.0/metadata/replication-configuration.idmap ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png ../../refman-6.0/../refman-common/urls.ent ../../refman-6.0/../refman-common/images/published/multi-db.png ../../refman-6.0/metadata/replication-options-core.idmap ../../refman-6.0/replication-implementation.xml ../../refman-6.0/../gui-common/gui-common.ent all-entities.ent ../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml ../../common/phrases.ent ../../refman-6.0/metadata/replication-notes.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png mysql-replication-excerpt-aspec.xml ../../refman-6.0/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-common/urls.ent ../../refman-6.0/../mysql-monitor-2.0/vers!
 ion.ent ../../refman-6.0/replication.xml ../../common/fixedcha!
 rs.ent .
./../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-8.png ../../refman-6.0/../refman-common/images/published/redundancy-after.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/../common/fixedchars.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/metadata/replication-solutions.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/metadata/replication.idmap mysql-replication-excerpt-base.xml ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-6.0/../common/phrases.ent ../../refman-6.0/../mysql-monitor-common/enterprise.ent ../../refman-6.0/../dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/metadata/replication-implementation.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-7.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-1.png ../../refman-6.0/../refman-common/images/published/redundancy-before.png ../../refman-6.0/dynxml-local-replication-options.xml ../../refman-6.0/versions.ent ../../refman-6.0/all-entities.ent ../../refman-6.0/../dynamic-docs/metadata-titles.en.xml .!
 ./../refman-6.0/metadata/replication-configuration.idmap ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-4.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-5.png ../../refman-6.0/../refman-common/urls.ent ../../refman-6.0/../refman-common/images/published/multi-db.png ../../refman-6.0/../refman-6.0/replication-options-core.xml ../../refman-6.0/replication-implementation.xml ../../refman-6.0/../gui-common/gui-common.ent all-entities.ent ../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml ../../common/phrases.ent ../../refman-6.0/metadata/replication-notes.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-4.png mysql-replication-excerpt-aspec.xml ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-3.png ../../refman-common/urls.ent ../../refman-6.0/../mysql-monitor-2.0/version.ent ../../refman-6.0/replication.xml ../../common/fixedchars.en!
 t ../../refman-6.0/../refman-common/images/published/rpl-circu!
 lar-upgr
ade-8.png ../../refman-6.0/../refman-common/images/published/redundancy-after.png ../../refman-6.0/../refman-common/images/published/submaster-performance.png ../../refman-6.0/../common/fixedchars.ent ../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png ../../refman-6.0/metadata/replication-solutions.idmap ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png ../../refman-6.0/replication-solutions.xml ../../refman-6.0/metadata/replication.idmap mysql-replication-excerpt-base.xml ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-2.png ../../refman-6.0/../refman-common/images/published/scaleout.png ../../refman-6.0/../refman-common/images/published/rpl-multi-master-linear-1.png ../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-3.png
 	$(MAKE) mysql-replication-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -1325,7 +1325,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-6.0/metadata/dba-user-management-core.idmap ../../refman-6.0/backup.xml ../../refman-common/urls.ent ../../refman-6.0/metadata/backup.idmap mysql-security-excerpt-aspec.xml ../../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../../mysqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/versions.ent ../../refman-6.0/metadata/dba-privilege-system.idmap ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-6.0/metadata/installing-core.idmap ../../refman-6.0/metadata/dba-security-core.idmap ../../refman-6.0/dba-user-management-core.xml ../../refman-6.0/installing-core.xml ../../refman-6.0/dba-securi!
 ty-core.xml ../../refman-6.0/dba-privilege-system.xml all-entities.ent ../../common/phrases.ent
+mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.xml mysql-security-excerpt-aspec.xml.security.none.chapter.xml mysql-security-excerpt-aspec.xml.post-installation.none.chapter.xml mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.xml: ../../refman-6.0/metadata/dba-user-management-core.idmap ../../refman-6.0/backup.xml ../../refman-common/urls.ent ../../dynamic-docs/command-optvars/mysqld.xml ../../refman-6.0/metadata/backup.idmap ../../dynamic-docs/metadata-titles.en.xml mysql-security-excerpt-aspec.xml ../../refman-6.0/versions.ent ../../refman-6.0/metadata/dba-privilege-system.idmap ../../common/fixedchars.ent mysql-security-excerpt-base.xml ../../refman-6.0/metadata/installing-core.idmap ../../refman-6.0/metadata/dba-security-core.idmap ../../refman-6.0/dba-user-management-core.xml ../../refman-6.0/installing-core.xml ../../refman-6.0/dba-security-core.xml ../../refman!
 -6.0/dba-privilege-system.xml all-entities.ent ../../common/phrases.ent
 	$(MAKE) mysql-security-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/topic-guides/topics-common/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-common/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/topic-guides/topics-common/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 21, Lines Added: 63, Lines Deleted: 63; 65531 bytes

@@ -76,10 +76,10 @@
 apis-php-remprepped.xml: $(apis_php_SOURCES) $(apis_php_IDMAPS)
 
 connector_cpp_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../../dynamic-docs/changelog/connector-cpp.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \
 	../../refman-common/connector-cpp-core.xml \

@@ -135,10 +135,10 @@
 connector-cpp-base-remprepped.xml: $(connector_cpp_base_SOURCES) $(connector_cpp_base_IDMAPS)
 
 connector_cpp_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../../dynamic-docs/changelog/connector-cpp.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -169,10 +169,10 @@
 connector-cpp-remprepped.xml: $(connector_cpp_SOURCES) $(connector_cpp_IDMAPS)
 
 connector_j_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-j-versions.xml \
+	../../dynamic-docs/changelog/connector-j.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \
 	../../refman-common/connector-j-connprops.xml \

@@ -223,10 +223,10 @@
 connector-j-base-remprepped.xml: $(connector_j_base_SOURCES) $(connector_j_base_IDMAPS)
 
 connector_j_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-j-versions.xml \
+	../../dynamic-docs/changelog/connector-j.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -252,10 +252,10 @@
 connector-j-remprepped.xml: $(connector_j_SOURCES) $(connector_j_IDMAPS)
 
 connector_mxj_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../../dynamic-docs/changelog/connector-mxj.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \
 	../../refman-common/connector-mxj.xml \

@@ -306,10 +306,10 @@
 connector-mxj-base-remprepped.xml: $(connector_mxj_base_SOURCES) $(connector_mxj_base_IDMAPS)
 
 connector_mxj_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../../dynamic-docs/changelog/connector-mxj.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -335,12 +335,12 @@
 connector-mxj-remprepped.xml: $(connector_mxj_SOURCES) $(connector_mxj_IDMAPS)
 
 connector_net_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-net-versions.xml \
+	../../dynamic-docs/changelog/connector-net.xml \
 	../../gui-common/gui-common.ent \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \

@@ -487,12 +487,12 @@
 connector-net-base-remprepped.xml: $(connector_net_base_SOURCES) $(connector_net_base_IDMAPS)
 
 connector_net_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-net-versions.xml \
+	../../dynamic-docs/changelog/connector-net.xml \
 	../../gui-common/gui-common.ent \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \

@@ -614,10 +614,10 @@
 connector-net-remprepped.xml: $(connector_net_SOURCES) $(connector_net_IDMAPS)
 
 connector_odbc_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../../dynamic-docs/changelog/connector-odbc.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \
 	../../refman-common/connector-odbc.xml \

@@ -752,10 +752,10 @@
 connector-odbc-base-remprepped.xml: $(connector_odbc_base_SOURCES) $(connector_odbc_base_IDMAPS)
 
 connector_odbc_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../../dynamic-docs/changelog/connector-odbc.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -956,26 +956,26 @@
 connector-ooo-remprepped.xml: $(connector_ooo_SOURCES) $(connector_ooo_IDMAPS)
 
 connectors_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-ooo-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-ooo.xml \
-	../../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../../dynamic-docs/changelog/connector-cpp.xml \
+	../../dynamic-docs/changelog/connector-j-versions.xml \
+	../../dynamic-docs/changelog/connector-j.xml \
+	../../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../../dynamic-docs/changelog/connector-mxj.xml \
+	../../dynamic-docs/changelog/connector-net-versions.xml \
+	../../dynamic-docs/changelog/connector-net.xml \
+	../../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../../dynamic-docs/changelog/connector-odbc.xml \
+	../../dynamic-docs/changelog/connector-ooo-versions.xml \
+	../../dynamic-docs/changelog/connector-ooo.xml \
+	../../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../../dynamic-docs/changelog/vstudioplugin.xml \
+	../../dynamic-docs/faq/connector-cpp.xml \
+	../../dynamic-docs/faq/connector-net.xml \
 	../../gui-common/gui-common.ent \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \

@@ -1208,26 +1208,26 @@
 connectors-base-remprepped.xml: $(connectors_base_SOURCES) $(connectors_base_IDMAPS)
 
 connectors_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-net.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-ooo-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/connector-ooo.xml \
-	../../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml \
-	../../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml \
-	../../../mysqldoc/dynamic-docs/faq/connector-cpp.xml \
-	../../../mysqldoc/dynamic-docs/faq/connector-net.xml \
 	../../common/fixedchars.ent \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/changelog/connector-cpp-versions.xml \
+	../../dynamic-docs/changelog/connector-cpp.xml \
+	../../dynamic-docs/changelog/connector-j-versions.xml \
+	../../dynamic-docs/changelog/connector-j.xml \
+	../../dynamic-docs/changelog/connector-mxj-versions.xml \
+	../../dynamic-docs/changelog/connector-mxj.xml \
+	../../dynamic-docs/changelog/connector-net-versions.xml \
+	../../dynamic-docs/changelog/connector-net.xml \
+	../../dynamic-docs/changelog/connector-odbc-versions.xml \
+	../../dynamic-docs/changelog/connector-odbc.xml \
+	../../dynamic-docs/changelog/connector-ooo-versions.xml \
+	../../dynamic-docs/changelog/connector-ooo.xml \
+	../../dynamic-docs/changelog/vstudioplugin-versions.xml \
+	../../dynamic-docs/changelog/vstudioplugin.xml \
+	../../dynamic-docs/faq/connector-cpp.xml \
+	../../dynamic-docs/faq/connector-net.xml \
 	../../gui-common/gui-common.ent \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \

@@ -1526,10 +1526,10 @@
 mysql-ha-drbd-remprepped.xml: $(mysql_ha_drbd_SOURCES) $(mysql_ha_drbd_IDMAPS)
 
 mysql_ha_scalability_arbitrary_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/memcached.xml \
+	../../dynamic-docs/faq/mysql-proxy.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/versions.ent \
 	../../refman-common/ha-drbd.xml \

@@ -1610,10 +1610,10 @@
 mysql-ha-scalability-base-remprepped.xml: $(mysql_ha_scalability_base_SOURCES) $(mysql_ha_scalability_base_IDMAPS)
 
 mysql_ha_scalability_INCLUDES = \
-	../../../mysqldoc/dynamic-docs/faq/memcached.xml \
-	../../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../dynamic-docs/faq/memcached.xml \
+	../../dynamic-docs/faq/mysql-proxy.xml \
 	../../gui-common/gui-common.ent \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -2046,7 +2046,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connector-net-aspec.xml.connector-net-programming.none.chapter.xml connector-net-aspec.xml.connector-net-news.none.appendix.xml connector-net-aspec.xml.connector-net-versions.none.chapter.xml connector-net-aspec.xml.connector-net-installation.none.chapter.xml connector-net-aspec.xml.connector-net.all.preface.xml connector-net-aspec.xml.connector-net-visual-studio.none.chapter.xml connector-net-aspec.xml.connect-net-support.none.chapter.xml: ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png ../../refman-common/metadata/connector-net-core.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-net-versions.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-choose-data-source.png ../../refman-common/../common/phrases.ent ../../refman-common/metadata/connecto!
 r-net-programming-tutorial.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png ../../refman-common/metadata/connector-net-install.idmap ../../refman-common/../gui-common/gui-common.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png ../../refman-common/../refman-common/images/published/cnet-win-install-step4.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png ../../refman-common/../refman-common/images/published/cnet-win-install-ste!
 p5.png ../../refman-common/connector-net-programming-tutorial.!
 xml ../.
./common/phrases.ent ../../refman-common/connector-net-visual-studio.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png ../../refman-common/connector-net-core.xml ../../refman-common/urls.ent ../../refman-common/metadata/connector-net-programming.idmap ../../refman-common/connector-net-versions.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-sql-added.png ../../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial!
 -linq-2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-new-data-connection.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png ../../refman-common/../refman-common/images/published/connector-net-programming-tutorial-1.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-editing-new-table.png ../../refman-common/all-entities.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png ../../gui-common/gui-common.ent connector-net-base.xml ../../refman-common/connector-net-support.xml ../../refman-common/../refman-common/images/published/connector-net-vi!
 sual-studio-entity-framework-add-entity-data-model.png ../../r!
 efman-co
mmon/../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-newly-created-table.png ../../refman-common/connector-net-programming.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png connector-net-aspec.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png ../../refman-common/metadata/connector-net-visual-studio.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-net.xml ../../refman-common/../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entit!
 y-framework-data-source-configuration-wizard-1.png ../../refman-common/connector-net-programming-connection-options.xml all-entities.ent ../../refman-common/../refman-common/images/published/cnet-win-install-step3.png ../../refman-common/metadata/connector-net-programming-connection-options.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png ../../refman-common/metadata/connector-net-support.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-choose-table-name.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png ../../refman-common/metadata/news-cnet-core.idmap ../../refman-common/../refman-common/images/published/cnet-win-install-step2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png !
 ../../refman-common/connector-net-install.xml ../../refman-com!
 mon/../r
efman-common/images/published/connector-net-visual-studio-entity-framework-data-sources.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png ../../refman-common/news-cnet-core.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png ../../refman-common/../refman-common/images/published/cnet-win-install-step1.png ../../refman-common/metadata/connector-net-versions.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-add-connection.png
+connector-net-aspec.xml.connector-net-programming.none.chapter.xml connector-net-aspec.xml.connector-net-news.none.appendix.xml connector-net-aspec.xml.connector-net-versions.none.chapter.xml connector-net-aspec.xml.connector-net-installation.none.chapter.xml connector-net-aspec.xml.connector-net.all.preface.xml connector-net-aspec.xml.connector-net-visual-studio.none.chapter.xml connector-net-aspec.xml.connect-net-support.none.chapter.xml: ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-diagram.png ../../refman-common/metadata/connector-net-core.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-stored-procedure-edit.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-choose-data-source.png ../../refman-common/../common/phrases.ent ../../refman-common/metadata/connector-net-programming-tutorial.idmap ../../refman-common/../refman-commo!
 n/images/published/connector-net-visual-studio-entity-framework-form-add-code.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2.png ../../refman-common/metadata/connector-net-install.idmap ../../refman-common/../gui-common/gui-common.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-app-running-1.png ../../refman-common/../refman-common/images/published/cnet-win-install-step4.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-sql-saved.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-edit-sql.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-5.png ../../refman-common/../refman-common/images/published/cnet-win-install-step5.png ../../dynamic-docs/changelog/connector-net.xml ../../refman-c!
 ommon/connector-net-programming-tutorial.xml ../../common/phra!
 ses.ent 
../../refman-common/connector-net-visual-studio.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-indexes-dialog.png ../../refman-common/connector-net-core.xml ../../refman-common/urls.ent ../../refman-common/metadata/connector-net-programming.idmap ../../dynamic-docs/changelog/connector-net-versions.xml ../../refman-common/connector-net-versions.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-views-sql-added.png ../../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-6.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-7.png ../../refman-common/../refman-common/images/published/connector-net-visu!
 al-studio-entity-framework-tutorial-linq-2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-new-data-connection.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-3.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-1.png ../../refman-common/../refman-common/images/published/connector-net-programming-tutorial-1.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-editing-new-table.png ../../refman-common/all-entities.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-selecting-table-properties.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-foreign-key-relationships.png ../../gui-common/gui-common.ent connector-net-base.xml ../../refman-common/connector-net-support.xml ../../refman-common/../refman-commo!
 n/images/published/connector-net-visual-studio-entity-framewor!
 k-add-en
tity-data-model.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-add-connection-dialog.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-form-design.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-newly-created-table.png ../../refman-common/connector-net-programming.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-table-designer-menu-item.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-form-add-code-save.png connector-net-aspec.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-stored-procedure-saved.png ../../refman-common/metadata/connector-net-visual-studio.idmap ../../refman-common/../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-!
 configuration-wizard-1.png ../../refman-common/connector-net-programming-connection-options.xml all-entities.ent ../../refman-common/../refman-common/images/published/cnet-win-install-step3.png ../../refman-common/metadata/connector-net-programming-connection-options.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-3.png ../../refman-common/metadata/connector-net-support.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-choose-table-name.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3.png ../../refman-common/metadata/news-cnet-core.idmap ../../refman-common/../refman-common/images/published/cnet-win-install-step2.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-entity-data-model-wizard-1.png ../../refman-common/conn!
 ector-net-install.xml ../../refman-common/../refman-common/ima!
 ges/publ
ished/connector-net-visual-studio-entity-framework-data-sources.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-tutorial-linq-4.png ../../refman-common/../refman-common/images/published/connector-net-visual-studio-table-properties-menu.png ../../refman-common/news-cnet-core.xml ../../refman-common/../refman-common/images/published/connector-net-visual-studio-entity-framework-save-enabled.png ../../refman-common/../refman-common/images/published/cnet-win-install-step1.png ../../refman-common/metadata/connector-net-versions.idmap ../../refman-common/../refman-common/images/published/connector-net-visual-studio-add-connection.png
 	$(MAKE) connector-net.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2056,7 +2056,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connectors-aspec.xml.news-connector-mxj.none.appendix.xml connectors-aspec.xml.connector-net.none.chapter.xml connectors-aspec.xml.ccpp-news.none.appendix.xml connectors-aspec.xml.vstudio-plugin-news.none.appendix.xml connectors-aspec.xml.connector-odbc.none.chapter.xml connectors-aspec.xml.connector-ooo.none.chapter.xml connectors-aspec.xml.cj-news.none.appendix.xml connectors-aspec.xml.apis-php.none.chapter.xml connectors-aspec.xml.connector-cpp.none.chapter.xml connectors-aspec.xml.cooo-news.none.appendix.xml connectors-aspec.xml.connector-j.none.chapter.xml connectors-aspec.xml.connector-mxj.none.chapter.xml connectors-aspec.xml.connector-odbc-news.none.appendix.xml connectors-aspec.xml.connector-net-news.none.appendix.xml connectors-aspec.xml.connector-vstudio.none.chapter.xml: ../../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../../refman-common/news-cj-core.xml ../../refman-common/metadata/news-vstudioplugin-core.idmap ../../../mysqldoc/dynam!
 ic-docs/changelog/connector-net-versions.xml ../../refman-common/images/published/myodbc-excel-step2.png ../../refman-common/connector-odbc.xml ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png ../../refman-common/images/published/myodbc-crystal-3.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../../refman-common/images/published/myflowchart.png ../../refman-common/../refman-common/apis-php-pdo-mysql.xml ../../refman-common/images/published/myodbc-link-step1.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-library-dir.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-dependencies.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../../refman-common/images/published/connector-ooo-base.png ../../../mysqldoc/dynamic-docs/changelog/connector-ooo-versions.xml ../../refm!
 an-common/connector-net-visual-studio.xml ../../refman-common/!
 metadata
/connector-j.idmap ../../refman-common/images/published/myodbc-excel-step4.png ../../refman-common/urls.ent ../../refman-common/metadata/connector-net-programming.idmap ../../refman-common/images/published/myodbc-macosx-install-step6.png ../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml ../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml ../../refman-common/images/published/mysql-vstudioplugin-1.png ../../refman-common/../refman-common/images/published/connector-cpp-netbeans.png ../../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png ../../refman-common/connector-net-versions.xml ../../refman-5.1/versions.ent ../../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-static-run.png ../../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png ../../refman-common/images/publis!
 hed/myodbc-crystal-4.png ../../refman-common/connector-mxj.xml ../../refman-common/metadata/connector-mxj.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml ../../refman-common/metadata/news-cooo-core.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml ../../refman-common/news-codbc-core.xml ../../refman-common/../refman-common/images/published/connector-cpp-mysql-include-dir.png ../../refman-common/images/published/myaccess.png ../../refman-common/images/published/connector-ooo-user-authentication.png ../../refman-common/connector-net-programming.xml ../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml ../../refman-common/../refman-common/images/published/connector-cpp-additional-lib-dir-select.png ../../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png ../../refman-common/../refman-common/apis-php-mysql.xml ../../../mysqldoc/dynamic-docs/changelog/vstudioplugin.xml ../../refman-common/images/publ!
 ished/myodbc-win-odbcadmin-main.png ../../refman-common/images!
 /publish
ed/myodbc-win-odbcadmin-advanced.png ../../refman-common/metadata/apis-php.idmap ../../refman-common/../refman-common/images/published/connector-cpp-installer-custom.png ../../refman-common/metadata/connector-net-ref.idmap ../../refman-common/images/published/myarchitecture.png ../../refman-common/images/published/myodbc-excel-step1.png ../../refman-common/metadata/connector-net-support.idmap ../../refman-common/metadata/connector-cpp-core.idmap ../../refman-common/images/published/myaccess-odbc.png ../../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../../refman-common/images/published/myodbc-crystal-1.png ../../refman-common/../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png ../../refman-common/connector-net-install.xml ../../../mysqldoc/dynamic-docs/faq/connector-net.xml ../../refman-common/images/published/myodbc-link-step3.png ../../refman-common/../refman-common/images/published/connector-cpp-win32-application-wizard.png ../../ref!
 man-common/../refman-common/images/published/connector-cpp-menu-new-project.png ../../refman-common/images/published/connector-ooo-dbwizard2.png ../../refman-common/news-cnet-core.xml ../../refman-common/images/published/myodbc-win-tracing.png ../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml ../../refman-common/images/published/mysql-vstudioplugin-3.png ../../refman-common/images/published/myodbc-link-step4.png ../../refman-common/../refman-common/images/published/connector-cpp-menu-project-properties.png ../../refman-common/connector-j.xml ../../refman-common/images/published/myodbc-win-install-step3.png ../../refman-common/metadata/connector-net-core.idmap ../../refman-common/../refman-common/apis-php-mysqli.xml ../../refman-common/../common/phrases.ent ../../refman-common/images/published/cmxj-overview.png ../../refman-common/images/published/myodbc-macosx-install-step4.png ../../refman-common/news-cmxj-core.xml ../../refman-common/metadata/connector-net-instal!
 l.idmap ../../refman-common/images/published/myodbc-macosx-ins!
 tall-ste
p1.png ../../refman-common/connector-ooo.xml ../../../mysqldoc/dynamic-docs/changelog/connector-j.xml ../../refman-common/../gui-common/gui-common.ent ../../refman-common/images/published/myodbc-macosx-install-step3.png ../../refman-common/images/published/mysql-vstudioplugin-4.png ../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml ../../refman-common/metadata/news-cmxj-core.idmap ../../refman-common/metadata/connector-odbc.idmap ../../refman-common/images/published/connector-ooo-add-extension.png ../../common/phrases.ent ../../refman-common/connector-net-core.xml ../../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../../refman-common/../refman-common/connector-j-connprops.xml ../../refman-common/images/published/myodbc-crystal-2.png ../../refman-common/metadata/connector-vstudioplugin.idmap ../../refman-common/images/published/myodbc-excel-step3.png ../../refman-common/news-cooo-core.xml ../../refman-common/../refman-common/images/published/co!
 nnector-cpp-netbeans-dynamic-properties-lib.png ../../../mysqldoc/dynamic-docs/faq/connector-cpp.xml ../../refman-common/images/published/myodbc-crystal-6.png ../../refman-common/images/published/myodbc-win-odbcadmin-options.png connectors-aspec.xml ../../refman-common/images/published/myodbc-macosx-install-step2.png ../../refman-common/images/published/myodbc-link-step5.png ../../refman-common/images/published/connector-ooo-user-authentication-credentials.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-dependencies-added.png ../../refman-common/all-entities.ent ../../refman-common/connector-vstudioplugin.xml ../../refman-common/../refman-common/images/published/connector-cpp-cppconn-public-func.png ../../refman-common/metadata/connector-ooo.idmap ../../gui-common/gui-common.ent ../../refman-common/connector-net-support.xml ../../refman-common/news-ccpp-core.xml ../../refman-common/metadata/news-ccpp-core.idmap ../../refman-common/../refma!
 n-common/images/published/connector-cpp-mysql-include-select-d!
 irectory
-dialog.png ../../refman-common/connector-cpp-core.xml ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-static-properties-lib.png ../../refman-common/metadata/news-cj-core.idmap ../../refman-common/images/published/myodbc-excel-step5.png ../../refman-common/metadata/news-codbc-core.idmap ../../refman-common/../refman-common/images/published/connector-cpp-installer-overview.png ../../refman-common/metadata/connector-net-visual-studio.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-net.xml ../../refman-common/../common/fixedchars.ent ../../../mysqldoc/dynamic-docs/changelog/vstudioplugin-versions.xml ../../refman-common/news-vstudioplugin-core.xml all-entities.ent ../../refman-common/images/published/myodbc-win-install-step1.png ../../../mysqldoc/dynamic-docs/changelog/connector-ooo.xml ../../refman-common/../refman-common/images/published/connector-cpp-new-project-wizard.png ../../refman-common/images/published/connector-ooo-dbwizard1.png !
 ../../refman-common/../refman-common/images/published/connector-cpp-select-release-build.png ../../refman-common/metadata/news-cnet-core.idmap ../../refman-common/apis-php.xml connectors-base.xml ../../refman-common/images/published/myodbc-win-install-step4.png ../../refman-common/images/published/myodbc-macosx-install-step5.png ../../refman-common/../refman-common/connector-j-errormap.xml ../../refman-common/images/published/myodbc-win-install-step2.png ../../refman-common/images/published/myodbc-crystal-5.png ../../refman-common/../refman-common/images/published/connector-cpp-installer-welcome.png ../../refman-common/metadata/connector-net-versions.idmap ../../refman-common/connector-net-ref.xml ../../refman-common/../refman-common/images/published/connector-cpp-properties.png
+connectors-aspec.xml.news-connector-mxj.none.appendix.xml connectors-aspec.xml.connector-net.none.chapter.xml connectors-aspec.xml.ccpp-news.none.appendix.xml connectors-aspec.xml.vstudio-plugin-news.none.appendix.xml connectors-aspec.xml.connector-odbc.none.chapter.xml connectors-aspec.xml.connector-ooo.none.chapter.xml connectors-aspec.xml.cj-news.none.appendix.xml connectors-aspec.xml.apis-php.none.chapter.xml connectors-aspec.xml.connector-cpp.none.chapter.xml connectors-aspec.xml.cooo-news.none.appendix.xml connectors-aspec.xml.connector-j.none.chapter.xml connectors-aspec.xml.connector-mxj.none.chapter.xml connectors-aspec.xml.connector-odbc-news.none.appendix.xml connectors-aspec.xml.connector-net-news.none.appendix.xml connectors-aspec.xml.connector-vstudio.none.chapter.xml: ../../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../../refman-common/news-cj-core.xml ../../refman-common/metadata/news-vstudioplugin-core.idmap ../../refman-common/ima!
 ges/published/myodbc-excel-step2.png ../../refman-common/connector-odbc.xml ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png ../../refman-common/images/published/myodbc-crystal-3.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../../refman-common/images/published/myflowchart.png ../../refman-common/../refman-common/apis-php-pdo-mysql.xml ../../refman-common/images/published/myodbc-link-step1.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-library-dir.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-dependencies.png ../../dynamic-docs/changelog/connector-net.xml ../../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../../refman-common/images/published/connector-ooo-base.png ../../refman-common/connector-net-visual-studio.xml ../../refman-common/metadata/connector-j.idmap !
 ../../refman-common/images/published/myodbc-excel-step4.png ..!
 /../refm
an-common/urls.ent ../../refman-common/metadata/connector-net-programming.idmap ../../refman-common/images/published/myodbc-macosx-install-step6.png ../../refman-common/images/published/mysql-vstudioplugin-1.png ../../refman-common/../refman-common/images/published/connector-cpp-netbeans.png ../../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png ../../dynamic-docs/changelog/connector-net-versions.xml ../../dynamic-docs/changelog/vstudioplugin.xml ../../refman-common/connector-net-versions.xml ../../dynamic-docs/changelog/connector-j.xml ../../refman-5.1/versions.ent ../../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-static-run.png ../../common/fixedchars.ent ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-static-properties-include.png ../../refman-common/images/published/myodbc-crystal-4.png ../../refman-common/connector-mxj.xml ../../!
 refman-common/metadata/connector-mxj.idmap ../../refman-common/metadata/news-cooo-core.idmap ../../refman-common/news-codbc-core.xml ../../refman-common/../refman-common/images/published/connector-cpp-mysql-include-dir.png ../../refman-common/images/published/myaccess.png ../../dynamic-docs/changelog/connector-odbc-versions.xml ../../refman-common/images/published/connector-ooo-user-authentication.png ../../refman-common/connector-net-programming.xml ../../refman-common/../refman-common/images/published/connector-cpp-additional-lib-dir-select.png ../../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png ../../refman-common/../refman-common/apis-php-mysql.xml ../../dynamic-docs/changelog/connector-mxj-versions.xml ../../refman-common/images/published/myodbc-win-odbcadmin-main.png ../../refman-common/images/published/myodbc-win-odbcadmin-advanced.png ../../refman-common/metadata/apis-php.idmap ../../refman-common/../refman-common/images/published/connector-cpp!
 -installer-custom.png ../../refman-common/metadata/connector-n!
 et-ref.i
dmap ../../refman-common/images/published/myarchitecture.png ../../dynamic-docs/changelog/connector-mxj.xml ../../refman-common/images/published/myodbc-excel-step1.png ../../refman-common/metadata/connector-net-support.idmap ../../refman-common/metadata/connector-cpp-core.idmap ../../refman-common/images/published/myaccess-odbc.png ../../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../../refman-common/images/published/myodbc-crystal-1.png ../../refman-common/../refman-common/images/published/connector-cpp-mysql-lib-opt-dir.png ../../refman-common/connector-net-install.xml ../../refman-common/images/published/myodbc-link-step3.png ../../refman-common/../refman-common/images/published/connector-cpp-win32-application-wizard.png ../../refman-common/../refman-common/images/published/connector-cpp-menu-new-project.png ../../refman-common/images/published/connector-ooo-dbwizard2.png ../../refman-common/news-cnet-core.xml ../../refman-common/images/published/myo!
 dbc-win-tracing.png ../../refman-common/images/published/mysql-vstudioplugin-3.png ../../dynamic-docs/changelog/connector-odbc.xml ../../dynamic-docs/changelog/vstudioplugin-versions.xml ../../refman-common/images/published/myodbc-link-step4.png ../../refman-common/../refman-common/images/published/connector-cpp-menu-project-properties.png ../../refman-common/connector-j.xml ../../refman-common/images/published/myodbc-win-install-step3.png ../../refman-common/metadata/connector-net-core.idmap ../../refman-common/../refman-common/apis-php-mysqli.xml ../../refman-common/../common/phrases.ent ../../dynamic-docs/faq/connector-net.xml ../../refman-common/images/published/cmxj-overview.png ../../refman-common/images/published/myodbc-macosx-install-step4.png ../../refman-common/news-cmxj-core.xml ../../refman-common/metadata/connector-net-install.idmap ../../refman-common/images/published/myodbc-macosx-install-step1.png ../../refman-common/connector-ooo.xml ../../refman-common/../!
 gui-common/gui-common.ent ../../refman-common/images/published!
 /myodbc-
macosx-install-step3.png ../../refman-common/images/published/mysql-vstudioplugin-4.png ../../dynamic-docs/changelog/connector-ooo.xml ../../refman-common/metadata/news-cmxj-core.idmap ../../refman-common/metadata/connector-odbc.idmap ../../refman-common/images/published/connector-ooo-add-extension.png ../../dynamic-docs/changelog/connector-cpp.xml ../../common/phrases.ent ../../refman-common/connector-net-core.xml ../../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../../dynamic-docs/changelog/connector-j-versions.xml ../../refman-common/../refman-common/connector-j-connprops.xml ../../refman-common/images/published/myodbc-crystal-2.png ../../refman-common/metadata/connector-vstudioplugin.idmap ../../refman-common/images/published/myodbc-excel-step3.png ../../refman-common/news-cooo-core.xml ../../refman-common/../refman-common/images/published/connector-cpp-netbeans-dynamic-properties-lib.png ../../refman-common/images/published/myodbc-crystal-6.png !
 ../../refman-common/images/published/myodbc-win-odbcadmin-options.png connectors-aspec.xml ../../refman-common/images/published/myodbc-macosx-install-step2.png ../../refman-common/images/published/myodbc-link-step5.png ../../dynamic-docs/changelog/connector-cpp-versions.xml ../../refman-common/images/published/connector-ooo-user-authentication-credentials.png ../../refman-common/../refman-common/images/published/connector-cpp-additional-dependencies-added.png ../../refman-common/all-entities.ent ../../refman-common/connector-vstudioplugin.xml ../../refman-common/../refman-common/images/published/connector-cpp-cppconn-public-func.png ../../refman-common/metadata/connector-ooo.idmap ../../gui-common/gui-common.ent ../../refman-common/connector-net-support.xml ../../refman-common/news-ccpp-core.xml ../../refman-common/metadata/news-ccpp-core.idmap ../../refman-common/../refman-common/images/published/connector-cpp-mysql-include-select-directory-dialog.png ../../refman-common/c!
 onnector-cpp-core.xml ../../refman-common/../refman-common/ima!
 ges/publ
ished/connector-cpp-netbeans-static-properties-lib.png ../../dynamic-docs/changelog/connector-ooo-versions.xml ../../refman-common/metadata/news-cj-core.idmap ../../refman-common/images/published/myodbc-excel-step5.png ../../refman-common/metadata/news-codbc-core.idmap ../../refman-common/../refman-common/images/published/connector-cpp-installer-overview.png ../../refman-common/metadata/connector-net-visual-studio.idmap ../../refman-common/../common/fixedchars.ent ../../refman-common/news-vstudioplugin-core.xml all-entities.ent ../../refman-common/images/published/myodbc-win-install-step1.png ../../refman-common/../refman-common/images/published/connector-cpp-new-project-wizard.png ../../refman-common/images/published/connector-ooo-dbwizard1.png ../../refman-common/../refman-common/images/published/connector-cpp-select-release-build.png ../../refman-common/metadata/news-cnet-core.idmap ../../dynamic-docs/faq/connector-cpp.xml ../../refman-common/apis-php.xml connectors-base.!
 xml ../../refman-common/images/published/myodbc-win-install-step4.png ../../refman-common/images/published/myodbc-macosx-install-step5.png ../../refman-common/../refman-common/connector-j-errormap.xml ../../refman-common/images/published/myodbc-win-install-step2.png ../../refman-common/images/published/myodbc-crystal-5.png ../../refman-common/../refman-common/images/published/connector-cpp-installer-welcome.png ../../refman-common/metadata/connector-net-versions.idmap ../../refman-common/connector-net-ref.xml ../../refman-common/../refman-common/images/published/connector-cpp-properties.png
 	$(MAKE) connectors.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2076,7 +2076,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connector-cpp-aspec.xml.connector-cpp-installation-source.none.chapter.xml connector-cpp-aspec.xml.ccpp-news.none.appendix.xml connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-installation-binary.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml connector-cpp-aspec.xml.connector-cpp.all.preface.xml: ../../refman-common/urls.ent ../../gui-common/gui-common.ent connector-cpp-base.xml ../../refman-common/news-ccpp-core.xml ../../refman-common/metadata/connector-cpp-core.idmap ../../refman-common/metadata/news-ccpp-core.idmap ../../refman-5.1/versions.ent ../../common/fixedchars.ent ../../refman-common/connector-cpp-core.xml ../../refman-common/../refman-common/images/published/connector-!
 cpp-installer-overview.png ../../../mysqldoc/dynamic-docs/changelog/connector-cpp.xml all-entities.ent connector-cpp-aspec.xml ../../refman-common/../refman-common/images/published/connector-cpp-installer-welcome.png ../../common/phrases.ent ../../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml ../../refman-common/../refman-common/images/published/connector-cpp-installer-custom.png
+connector-cpp-aspec.xml.connector-cpp-installation-source.none.chapter.xml connector-cpp-aspec.xml.ccpp-news.none.appendix.xml connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-installation-binary.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml connector-cpp-aspec.xml.connector-cpp.all.preface.xml: ../../refman-common/urls.ent ../../gui-common/gui-common.ent connector-cpp-base.xml ../../refman-common/news-ccpp-core.xml ../../refman-common/metadata/connector-cpp-core.idmap ../../refman-common/metadata/news-ccpp-core.idmap ../../refman-5.1/versions.ent ../../common/fixedchars.ent ../../refman-common/connector-cpp-core.xml ../../refman-common/../refman-common/images/published/connector-!
 cpp-installer-overview.png all-entities.ent ../../dynamic-docs/changelog/connector-cpp.xml ../../dynamic-docs/changelog/connector-cpp-versions.xml connector-cpp-aspec.xml ../../refman-common/../refman-common/images/published/connector-cpp-installer-welcome.png ../../common/phrases.ent ../../refman-common/../refman-common/images/published/connector-cpp-installer-custom.png
 	$(MAKE) connector-cpp.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2086,7 +2086,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-ha-scalability-aspec.xml.load-balancer.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-vm.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-overview.all.chapter.xml mysql-ha-scalability-aspec.xml.ha-memcached.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-heartbeat.none.chapter.xml mysql-ha-scalability-aspec.xml.mysql-proxy.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-drbd.none.chapter.xml: ../../refman-common/ha-vm.xml ../../refman-common/images/published/stdrepl-style2.png ../../refman-common/images/published/drbd-main.png ../../gui-common/gui-common.ent ../../refman-common/metadata/ha-heartbeat.idmap ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/../refman-common/images/published/proxy-architecture.png ../../refman-common/ha-memcached-core.xml ../../../mysqldoc/dynamic-docs/faq/mysql-proxy.xml all-entities.ent mysql-ha-scalability-base.xml ../../common/phrases.ent ../../refman-common/../refman-common/images/published/me!
 mcached-overview.png ../../refman-common/ha.xml ../../refman-common/../refman-common/images/published/memcached-memalloc.png ../../refman-common/urls.ent ../../refman-common/images/published/ec2fig2.png ../../refman-common/images/published/stdrepl-style1.png mysql-ha-scalability-aspec.xml ../../refman-5.1/versions.ent ../../refman-common/mysql-proxy-core.xml ../../common/fixedchars.ent ../../refman-common/ha-drbd.xml ../../refman-common/../refman-common/images/published/memcached-flow.png ../../../mysqldoc/dynamic-docs/faq/memcached.xml ../../refman-common/metadata/load-balancer.idmap ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/metadata/ha.idmap ../../refman-common/metadata/mysql-proxy-core.idmap ../../refman-common/images/published/ec2fig1.png ../../refman-common/images/published/ec2fig3.png ../../refman-common/images/published/stdlb.png ../../refman-common/metadata/ha-memcached-core.idmap ../../refman-common/ha-heartbeat.xml ../../re!
 fman-common/metadata/ha-drbd.idmap ../../refman-common/metadat!
 a/ha-vm.
idmap ../../refman-common/load-balancer.xml
+mysql-ha-scalability-aspec.xml.load-balancer.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-vm.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-overview.all.chapter.xml mysql-ha-scalability-aspec.xml.ha-memcached.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-heartbeat.none.chapter.xml mysql-ha-scalability-aspec.xml.mysql-proxy.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-drbd.none.chapter.xml: ../../refman-common/ha-vm.xml ../../refman-common/images/published/stdrepl-style2.png ../../refman-common/images/published/drbd-main.png ../../gui-common/gui-common.ent ../../refman-common/metadata/ha-heartbeat.idmap ../../dynamic-docs/faq/memcached.xml ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/../refman-common/images/published/proxy-architecture.png ../../refman-common/ha-memcached-core.xml all-entities.ent mysql-ha-scalability-base.xml ../../common/phrases.ent ../../refman-common/../refman-common/images/published/memcached-overvi!
 ew.png ../../refman-common/ha.xml ../../refman-common/../refman-common/images/published/memcached-memalloc.png ../../refman-common/urls.ent ../../refman-common/images/published/ec2fig2.png ../../refman-common/images/published/stdrepl-style1.png mysql-ha-scalability-aspec.xml ../../refman-5.1/versions.ent ../../dynamic-docs/faq/mysql-proxy.xml ../../refman-common/mysql-proxy-core.xml ../../common/fixedchars.ent ../../refman-common/ha-drbd.xml ../../refman-common/../refman-common/images/published/memcached-flow.png ../../refman-common/metadata/load-balancer.idmap ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/metadata/ha.idmap ../../refman-common/metadata/mysql-proxy-core.idmap ../../refman-common/images/published/ec2fig1.png ../../refman-common/images/published/ec2fig3.png ../../refman-common/images/published/stdlb.png ../../refman-common/ha-heartbeat.xml ../../refman-common/metadata/ha-memcached-core.idmap ../../refman-common/metadata/ha-!
 drbd.idmap ../../refman-common/metadata/ha-vm.idmap ../../refm!
 an-commo
n/load-balancer.xml
 	$(MAKE) mysql-ha-scalability.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2106,7 +2106,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connector-mxj-aspec.xml.connector-mxj.all.preface.xml connector-mxj-aspec.xml.connector-mxj-install.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-usagenotes.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-configuration.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-overview.none.chapter.xml connector-mxj-aspec.xml.news-connector-mxj.none.appendix.xml connector-mxj-aspec.xml.connector-mxj-support.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-versions.none.chapter.xml: ../../refman-common/urls.ent ../../gui-common/gui-common.ent ../../../mysqldoc/dynamic-docs/changelog/connector-mxj-versions.xml ../../refman-common/metadata/news-cmxj-core.idmap ../../refman-common/connector-mxj.xml ../../refman-common/metadata/connector-mxj.idmap ../../refman-common/images/published/cmxj-overview.png ../../refman-5.1/versions.ent all-entities.ent ../../refman-common/news-cmxj-core.xml ../../../mysqldoc/dynamic-docs/changelog/connector-mxj.xml ../../common/phra!
 ses.ent ../../common/fixedchars.ent connector-mxj-aspec.xml connector-mxj-base.xml
+connector-mxj-aspec.xml.connector-mxj.all.preface.xml connector-mxj-aspec.xml.connector-mxj-install.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-usagenotes.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-configuration.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-overview.none.chapter.xml connector-mxj-aspec.xml.news-connector-mxj.none.appendix.xml connector-mxj-aspec.xml.connector-mxj-support.none.chapter.xml connector-mxj-aspec.xml.connector-mxj-versions.none.chapter.xml: ../../refman-common/urls.ent ../../dynamic-docs/changelog/connector-mxj.xml ../../gui-common/gui-common.ent ../../refman-common/metadata/news-cmxj-core.idmap ../../refman-common/connector-mxj.xml ../../refman-common/metadata/connector-mxj.idmap ../../refman-common/images/published/cmxj-overview.png ../../refman-5.1/versions.ent all-entities.ent ../../refman-common/news-cmxj-core.xml ../../dynamic-docs/changelog/connector-mxj-versions.xml ../../common/phrases.ent ../../common/fix!
 edchars.ent connector-mxj-aspec.xml connector-mxj-base.xml
 	$(MAKE) connector-mxj.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2116,7 +2116,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connector-j-aspec.xml.connector-j.all.preface.xml connector-j-aspec.xml.connector-j-usagenotes.none.chapter.xml connector-j-aspec.xml.connector-j-versions.none.chapter.xml connector-j-aspec.xml.connector-j-examples.none.chapter.xml connector-j-aspec.xml.cj-news.none.appendix.xml connector-j-aspec.xml.connector-j-installing.none.chapter.xml connector-j-aspec.xml.connector-j-reference.none.chapter.xml connector-j-aspec.xml.connector-j-support.none.chapter.xml: ../../refman-common/news-cj-core.xml ../../refman-common/urls.ent ../../gui-common/gui-common.ent ../../refman-common/../refman-common/connector-j-connprops.xml ../../refman-5.1/versions.ent ../../common/fixedchars.ent connector-j-aspec.xml ../../../mysqldoc/dynamic-docs/changelog/connector-j.xml ../../refman-common/metadata/news-cj-core.idmap ../../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml ../../refman-common/../refman-common/connector-j-errormap.xml connector-j-base.xml all-entities.ent ../../common/!
 phrases.ent ../../refman-common/metadata/connector-j.idmap ../../refman-common/connector-j.xml
+connector-j-aspec.xml.connector-j.all.preface.xml connector-j-aspec.xml.connector-j-usagenotes.none.chapter.xml connector-j-aspec.xml.connector-j-versions.none.chapter.xml connector-j-aspec.xml.connector-j-examples.none.chapter.xml connector-j-aspec.xml.cj-news.none.appendix.xml connector-j-aspec.xml.connector-j-installing.none.chapter.xml connector-j-aspec.xml.connector-j-reference.none.chapter.xml connector-j-aspec.xml.connector-j-support.none.chapter.xml: ../../refman-common/news-cj-core.xml ../../refman-common/urls.ent ../../gui-common/gui-common.ent ../../dynamic-docs/changelog/connector-j-versions.xml ../../refman-common/../refman-common/connector-j-connprops.xml ../../dynamic-docs/changelog/connector-j.xml ../../refman-5.1/versions.ent ../../common/fixedchars.ent connector-j-aspec.xml ../../refman-common/metadata/news-cj-core.idmap ../../refman-common/../refman-common/connector-j-errormap.xml connector-j-base.xml all-entities.ent ../../common/phrases.ent ../../refman!
 -common/metadata/connector-j.idmap ../../refman-common/connector-j.xml
 	$(MAKE) connector-j.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target

@@ -2126,7 +2126,7 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-connector-odbc-aspec.xml.connector-odbc-examples.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-news.none.appendix.xml connector-odbc-aspec.xml.connector-odbc-reference.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-introduction.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-installation.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-configuration.none.chapter.xml connector-odbc-aspec.xml.connector-odbc.all.preface.xml connector-odbc-aspec.xml.connector-odbc-support.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-usagenotes.none.chapter.xml: ../../refman-common/news-codbc-core.xml ../../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../../refman-common/images/published/myodbc-win-install-step3.png ../../gui-common/gui-common.ent ../../refman-common/images/published/myodbc-excel-step2.png ../../refman-common/connector-odbc.xml ../../refman-common/images/published/myodbc-crystal-3.png ../../refman-common/i!
 mages/published/myodbc-win-odbcadmin-adddsn-5-1.png ../../refman-common/images/published/myaccess.png ../../refman-common/images/published/myodbc-macosx-install-step4.png ../../refman-common/images/published/myflowchart.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../../refman-common/images/published/myodbc-macosx-install-step1.png connector-odbc-aspec.xml ../../refman-common/images/published/myodbc-excel-step5.png ../../refman-common/images/published/myodbc-macosx-install-step3.png ../../refman-common/metadata/news-codbc-core.idmap ../../refman-common/images/published/myodbc-link-step1.png ../../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png ../../refman-common/metadata/connector-odbc.idmap ../../refman-common/images/published/myodbc-macosx-odbcadmin-main.png all-entities.ent ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../../refman-common/images/published/myodbc-win-install-step1.png ../../refman!
 -common/images/published/myodbc-win-odbcadmin-advanced.png ../!
 ../refma
n-common/images/published/myodbc-win-odbcadmin-main.png ../../common/phrases.ent connector-odbc-base.xml ../../refman-common/images/published/myodbc-excel-step4.png ../../refman-common/images/published/myarchitecture.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../../refman-common/urls.ent ../../../mysqldoc/dynamic-docs/changelog/connector-odbc.xml ../../refman-common/images/published/myodbc-macosx-install-step6.png ../../refman-common/images/published/myodbc-excel-step1.png ../../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png ../../refman-common/images/published/myodbc-crystal-2.png ../../refman-common/images/published/myodbc-excel-step3.png ../../refman-common/images/published/myaccess-odbc.png ../../refman-5.1/versions.ent ../../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../../common/fixedchars.ent ../../refman-common/images/pub!
 lished/myodbc-win-install-step4.png ../../refman-common/images/published/myodbc-crystal-1.png ../../refman-common/images/published/myodbc-macosx-install-step5.png ../../refman-common/images/published/myodbc-crystal-6.png ../../refman-common/images/published/myodbc-win-install-step2.png ../../refman-common/images/published/myodbc-link-step3.png ../../refman-common/images/published/myodbc-win-odbcadmin-options.png ../../refman-common/images/published/myodbc-crystal-5.png ../../refman-common/images/published/myodbc-macosx-install-step2.png ../../refman-common/images/published/myodbc-crystal-4.png ../../../mysqldoc/dynamic-docs/changelog/connector-odbc-versions.xml ../../refman-common/images/published/myodbc-link-step5.png ../../refman-common/images/published/myodbc-win-tracing.png ../../refman-common/images/published/myodbc-link-step4.png
+connector-odbc-aspec.xml.connector-odbc-examples.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-news.none.appendix.xml connector-odbc-aspec.xml.connector-odbc-reference.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-introduction.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-installation.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-configuration.none.chapter.xml connector-odbc-aspec.xml.connector-odbc.all.preface.xml connector-odbc-aspec.xml.connector-odbc-support.none.chapter.xml connector-odbc-aspec.xml.connector-odbc-usagenotes.none.chapter.xml: ../../refman-common/news-codbc-core.xml ../../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../../refman-common/images/published/myodbc-win-install-step3.png ../../gui-common/gui-common.ent ../../refman-common/images/published/myodbc-excel-step2.png ../../refman-common/connector-odbc.xml ../../refman-common/images/published/myodbc-crystal-3.png ../../refman-common/i!
 mages/published/myodbc-win-odbcadmin-adddsn-5-1.png ../../refman-common/images/published/myaccess.png ../../refman-common/images/published/myodbc-macosx-install-step4.png ../../refman-common/images/published/myflowchart.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../../refman-common/images/published/myodbc-macosx-install-step1.png connector-odbc-aspec.xml ../../dynamic-docs/changelog/connector-odbc-versions.xml ../../refman-common/images/published/myodbc-excel-step5.png ../../refman-common/images/published/myodbc-macosx-install-step3.png ../../refman-common/metadata/news-codbc-core.idmap ../../refman-common/images/published/myodbc-link-step1.png ../../refman-common/images/published/myodbc-win-odbcadmin-options-5-1.png ../../refman-common/metadata/connector-odbc.idmap ../../refman-common/images/published/myodbc-macosx-odbcadmin-main.png all-entities.ent ../../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../../refman-common/i!
 mages/published/myodbc-win-install-step1.png ../../refman-comm!
 on/image
s/published/myodbc-win-odbcadmin-advanced.png ../../refman-common/images/published/myodbc-win-odbcadmin-main.png ../../common/phrases.ent connector-odbc-base.xml ../../refman-common/images/published/myodbc-excel-step4.png ../../refman-common/images/published/myarchitecture.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../../refman-common/urls.ent ../../refman-common/images/published/myodbc-macosx-install-step6.png ../../refman-common/images/published/myodbc-excel-step1.png ../../refman-common/images/published/myodbc-win-odbcadmin-ssl-5-1.png ../../refman-common/images/published/myodbc-crystal-2.png ../../refman-common/images/published/myodbc-excel-step3.png ../../refman-common/images/published/myaccess-odbc.png ../../refman-5.1/versions.ent ../../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../../common/fixedchars.ent ../../refman-common/images/publis!
 hed/myodbc-win-install-step4.png ../../refman-common/images/published/myodbc-crystal-1.png ../../refman-common/images/published/myodbc-macosx-install-step5.png ../../refman-common/images/published/myodbc-crystal-6.png ../../refman-common/images/published/myodbc-win-install-step2.png ../../refman-common/images/published/myodbc-link-step3.png ../../refman-common/images/published/myodbc-win-odbcadmin-options.png ../../refman-common/images/published/myodbc-crystal-5.png ../../refman-common/images/published/myodbc-macosx-install-step2.png ../../refman-common/images/published/myodbc-crystal-4.png ../../refman-common/images/published/myodbc-link-step5.png ../../refman-common/images/published/myodbc-win-tracing.png ../../dynamic-docs/changelog/connector-odbc.xml ../../refman-common/images/published/myodbc-link-step4.png
 	$(MAKE) connector-odbc.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target


Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends	2009-06-25 12:10:45 UTC (rev 15432)
+++ trunk/workbench/Makefile.depends	2009-06-25 12:11:47 UTC (rev 15433)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1142 bytes

@@ -39,9 +39,9 @@
 documenting-database-remprepped.xml: $(documenting_database_SOURCES) $(documenting_database_IDMAPS)
 
 dynxml_local_news_workbench_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/workbench-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/workbench.xml \
 	../common/fixedchars.ent \
+	../dynamic-docs/changelog/workbench-versions.xml \
+	../dynamic-docs/changelog/workbench.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	news-workbench-core.xml \

@@ -592,9 +592,9 @@
 views-remprepped.xml: $(views_SOURCES) $(views_IDMAPS)
 
 workbench_INCLUDES = \
-	../../mysqldoc/dynamic-docs/changelog/workbench-versions.xml \
-	../../mysqldoc/dynamic-docs/changelog/workbench.xml \
 	../common/fixedchars.ent \
+	../dynamic-docs/changelog/workbench-versions.xml \
+	../dynamic-docs/changelog/workbench.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dbdoc-templates.xml \


Thread
svn commit - mysqldoc@docsrva: r15433 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysql-monitor-common mysqlqb quick-guides refman-4.1 refman-5.0 ...martin.brown25 Jun