MySQL Lists: commits: svn commit - mysqldoc@docsrva: r15558 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysqlqb quick-guides refman-4.1 refman-5.0 refman-5.1 refman-5.1...

List:	Commits	« Previous Message Next Message »
From:	anthony.bedford	Date:	July 2 2009 2:28pm
Subject:	svn commit - mysqldoc@docsrva: r15558 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysqlqb quick-guides refman-4.1 refman-5.0 refman-5.1 refman-5.1...
View as plain text
Author: tbedford
Date: 2009-07-02 16:28:40 +0200 (Thu, 02 Jul 2009)
New Revision: 15558

Log:
First half of forward engineering rewritten. New screenshots added. Updated dependencies to ensure images loaded.

Modified:
   trunk/mysql-monitor-2.0/Makefile.depends
   trunk/mysql-monitor-2.1/Makefile.depends
   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/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/workbench/Makefile.depends
   trunk/workbench/forward-engineering.xml


Modified: trunk/mysql-monitor-2.0/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.0/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/mysql-monitor-2.0/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 8; 2573 bytes

@@ -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 \

@@ -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 \

@@ -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 \


Modified: trunk/mysql-monitor-2.1/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.1/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/mysql-monitor-2.1/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1633 bytes

@@ -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 \

@@ -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 \


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/mysqlqb/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/quick-guides/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-4.1/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 28, Lines Added: 143, Lines Deleted: 135; 25447 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 \

@@ -1417,6 +1417,7 @@
 introduction_IDMAPS = \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/connector-j.idmap \

@@ -1508,49 +1509,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 \

@@ -1898,6 +1899,7 @@
 	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \
 	../refman-common/metadata/apis-eiffel.idmap \

@@ -1921,8 +1923,11 @@
 	../refman-common/metadata/connector-net-support.idmap \
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cluster.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \

@@ -2294,19 +2299,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 +2474,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 \

@@ -2574,7 +2579,10 @@
 	versions.ent
 preface_IMAGES =
 preface_SOURCES = preface.xml $(preface_INCLUDES)
-preface_IDMAPS =
+preface_IDMAPS = \
+	../refman-common/metadata/copyright.en.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap
 preface.validpure: $(preface_SOURCES)
 preface.titles: $(preface_SOURCES)
 preface.useless: $(preface_SOURCES)

@@ -2709,22 +2717,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 +2798,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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-5.0/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 38, Lines Added: 318, Lines Deleted: 310; 48451 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 \

@@ -1533,10 +1533,10 @@
 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_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 \

@@ -1560,18 +1560,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 \

@@ -1604,11 +1604,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 \

@@ -1667,15 +1667,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 \

@@ -1709,15 +1709,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 \

@@ -1753,10 +1753,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 \

@@ -1785,9 +1785,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 \

@@ -1833,10 +1833,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 \

@@ -1868,10 +1868,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 \

@@ -1898,10 +1898,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 \

@@ -1935,10 +1935,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 \

@@ -2308,6 +2308,7 @@
 introduction_IDMAPS = \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/introduction.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/connector-j.idmap \

@@ -2391,133 +2392,133 @@
 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/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/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/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/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 \

@@ -3156,6 +3157,7 @@
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \
 	../refman-common/metadata/apis-eiffel.idmap \

@@ -3182,6 +3184,7 @@
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-drbd.idmap \
 	../refman-common/metadata/ha-heartbeat.idmap \

@@ -3189,6 +3192,8 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \

@@ -3931,19 +3936,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 \

@@ -4109,25 +4114,25 @@
 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/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/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 \

@@ -4295,7 +4300,10 @@
 	versions.ent
 preface_IMAGES =
 preface_SOURCES = preface.xml $(preface_INCLUDES)
-preface_IDMAPS =
+preface_IDMAPS = \
+	../refman-common/metadata/copyright.en.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap
 preface.validpure: $(preface_SOURCES)
 preface.titles: $(preface_SOURCES)
 preface.useless: $(preface_SOURCES)

@@ -4441,22 +4449,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 \

@@ -4526,10 +4534,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 \

@@ -4672,10 +4680,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 \

@@ -5289,10 +5297,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 \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-5.1/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 50, Lines Added: 422, Lines Deleted: 414; 64337 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 \

@@ -1790,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 \

@@ -1841,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 \

@@ -1895,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 \

@@ -1925,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 \

@@ -1973,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 \

@@ -2039,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 \

@@ -2080,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 \

@@ -2127,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 \

@@ -2160,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 \

@@ -2212,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 \

@@ -2249,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 \

@@ -2275,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 \

@@ -2300,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 \

@@ -2315,7 +2315,7 @@
 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 \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \
 	metadata/dba-mysqld-server-core.idmap \

@@ -2337,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 \

@@ -2363,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 \

@@ -2399,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 \

@@ -2436,7 +2436,7 @@
 	../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.0/metadata/windows-config-wizard.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \
 	metadata/dba-multiple-servers.idmap \

@@ -2773,6 +2773,7 @@
 introduction_IDMAPS = \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-5.0/metadata/introduction.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/connector-j.idmap \

@@ -2858,174 +2859,174 @@
 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/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/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/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/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 \

@@ -3741,10 +3742,11 @@
 	../ndbapi/metadata/struct-partitionspec.idmap \
 	../ndbapi/metadata/struct-recordspecification.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.0/metadata/windows-config-wizard.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-6.0/metadata/manual.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \

@@ -3772,6 +3774,7 @@
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-drbd.idmap \
 	../refman-common/metadata/ha-heartbeat.idmap \

@@ -3779,6 +3782,8 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \

@@ -4665,23 +4670,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 \

@@ -4895,25 +4900,25 @@
 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/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/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 \

@@ -5080,7 +5085,10 @@
 	versions.ent
 preface_IMAGES =
 preface_SOURCES = preface.xml $(preface_INCLUDES)
-preface_IDMAPS =
+preface_IDMAPS = \
+	../refman-common/metadata/copyright.en.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap
 preface.validpure: $(preface_SOURCES)
 preface.titles: $(preface_SOURCES)
 preface.useless: $(preface_SOURCES)

@@ -5213,7 +5221,7 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-user-management-core.idmap \

@@ -5232,22 +5240,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 \

@@ -5267,7 +5275,7 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/apis-c.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \

@@ -5320,10 +5328,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 \

@@ -5481,10 +5489,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 \


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 16, Lines Added: 202, Lines Deleted: 198; 27447 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,6 +244,161 @@
 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/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/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 \

@@ -254,161 +409,6 @@
 	../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/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/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 \

@@ -1135,6 +1135,7 @@
 	../refman-5.1/metadata/triggers.idmap \
 	../refman-5.1/metadata/tutorial.idmap \
 	../refman-5.1/metadata/views.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-6.0/metadata/introduction.idmap \
 	../refman-6.0/metadata/manual.idmap \
 	../refman-6.0/metadata/se-maria-core.idmap \

@@ -1163,6 +1164,7 @@
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-drbd.idmap \
 	../refman-common/metadata/ha-heartbeat.idmap \

@@ -1170,6 +1172,8 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \

@@ -1616,28 +1620,28 @@
 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/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/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 \

@@ -1709,16 +1713,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 \


Modified: trunk/refman-5.4/Makefile.depends
===================================================================
--- trunk/refman-5.4/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-5.4/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 46, Lines Added: 234, Lines Deleted: 224; 42184 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 \

@@ -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 \

@@ -1132,10 +1132,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 \

@@ -1166,10 +1166,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 \

@@ -1251,10 +1251,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 \

@@ -1298,9 +1298,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 \

@@ -1376,43 +1376,43 @@
 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.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 \
 	../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 \

@@ -1739,11 +1739,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_news_5_4_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 \

@@ -1754,7 +1754,10 @@
 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
+	metadata/installing-core.idmap \
+	metadata/introduction.idmap \
+	metadata/programs-using.idmap \
+	metadata/sql-syntax-compound-statements.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)

@@ -1765,14 +1768,14 @@
 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 = \
+	../../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 \

@@ -1805,16 +1808,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 \

@@ -1852,10 +1855,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 \

@@ -1884,9 +1887,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 \

@@ -1933,10 +1936,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 \

@@ -1970,9 +1973,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 \

@@ -1996,10 +1999,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 \

@@ -2021,11 +2024,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 \

@@ -2036,7 +2039,7 @@
 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 \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \
 	metadata/dba-mysqld-server-core.idmap \

@@ -2059,9 +2062,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 \

@@ -2085,11 +2088,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 \

@@ -2121,12 +2124,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 \

@@ -2158,7 +2161,7 @@
 	../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.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \

@@ -2574,89 +2577,89 @@
 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/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/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/mysql-proxy.xml \
+	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+	../../mysqldoc/dynamic-docs/opsfunctions/opfunctions.xml \
+	../../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/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/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/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 \

@@ -2913,8 +2916,8 @@
 	../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-netlib.xml \
 	../refman-common/license-regex.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy-core.xml \

@@ -3301,10 +3304,10 @@
 	../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.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \

@@ -3351,6 +3354,7 @@
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-drbd.idmap \
 	../refman-common/metadata/ha-heartbeat.idmap \

@@ -3358,6 +3362,9 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-netlib.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \

@@ -3876,25 +3883,25 @@
 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/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/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 \

@@ -4051,15 +4058,19 @@
 	../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-netlib.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_IDMAPS = \
+	../refman-common/metadata/copyright.en.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-netlib.idmap \
+	../refman-common/metadata/license-regex.idmap
 preface.validpure: $(preface_SOURCES)
 preface.titles: $(preface_SOURCES)
 preface.useless: $(preface_SOURCES)

@@ -4132,7 +4143,6 @@
 	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)

@@ -4191,7 +4201,7 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
 	metadata/dba-multiple-servers.idmap \

@@ -4210,22 +4220,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 \

@@ -4245,7 +4255,7 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \

@@ -4297,10 +4307,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 \

@@ -4457,10 +4467,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 \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/refman-6.0/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 48, Lines Added: 185, Lines Deleted: 160; 36526 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 \

@@ -1656,11 +1656,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_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 \

@@ -1685,11 +1685,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 \

@@ -1740,15 +1740,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 \

@@ -1781,16 +1781,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 \

@@ -1828,10 +1828,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 \

@@ -1860,9 +1860,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 \

@@ -1911,10 +1911,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 \

@@ -1947,9 +1947,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 \

@@ -1973,11 +1973,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 \

@@ -2002,11 +2002,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 \

@@ -2017,7 +2017,7 @@
 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 \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \
 	metadata/dba-mysqld-server-core.idmap \

@@ -2039,11 +2039,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 \

@@ -2067,9 +2067,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 \

@@ -2093,11 +2093,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 \

@@ -2129,12 +2129,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 \

@@ -2169,7 +2169,7 @@
 dynxml_local_storage_engines_SOURCES = dynxml-local-storage-engines.xml $(dynxml_local_storage_engines_INCLUDES)
 dynxml_local_storage_engines_IDMAPS = \
 	../query-browser/metadata/query-browser.idmap \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \

@@ -2529,6 +2529,7 @@
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net-core.idmap \

@@ -2595,55 +2596,55 @@
 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/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/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/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/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 \

@@ -2912,6 +2913,7 @@
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \
 	../refman-common/license-libedit.xml \
+	../refman-common/license-netlib.xml \
 	../refman-common/license-regex.xml \
 	../refman-common/license-unicode.xml \
 	../refman-common/manual-conventions.en.xml \

@@ -3311,16 +3313,17 @@
 	../mysql-monitor-common/metadata/dashboard-query-analysis-core.idmap \
 	../query-browser/metadata/query-browser.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.0/metadata/windows-config-wizard.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/faqs.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-roadmap.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
+	../refman-5.4/metadata/introduction.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \
 	../refman-common/metadata/apis-eiffel.idmap \
 	../refman-common/metadata/apis-perl.idmap \

@@ -3346,6 +3349,7 @@
 	../refman-common/metadata/connector-net-visual-studio.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
+	../refman-common/metadata/copyright.en.idmap \
 	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-drbd.idmap \
 	../refman-common/metadata/ha-heartbeat.idmap \

@@ -3353,6 +3357,9 @@
 	../refman-common/metadata/ha-vm.idmap \
 	../refman-common/metadata/ha.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-netlib.idmap \
+	../refman-common/metadata/license-regex.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
 	../refman-common/metadata/news-ccpp-core.idmap \

@@ -3886,25 +3893,25 @@
 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/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/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 \

@@ -4063,6 +4070,7 @@
 	../refman-common/all-entities.ent \
 	../refman-common/copyright.en.xml \
 	../refman-common/license-libedit.xml \
+	../refman-common/license-netlib.xml \
 	../refman-common/license-regex.xml \
 	../refman-common/license-unicode.xml \
 	../refman-common/urls.ent \

@@ -4070,7 +4078,11 @@
 	versions.ent
 preface_IMAGES =
 preface_SOURCES = preface.xml $(preface_INCLUDES)
-preface_IDMAPS =
+preface_IDMAPS = \
+	../refman-common/metadata/copyright.en.idmap \
+	../refman-common/metadata/license-libedit.idmap \
+	../refman-common/metadata/license-netlib.idmap \
+	../refman-common/metadata/license-regex.idmap
 preface.validpure: $(preface_SOURCES)
 preface.titles: $(preface_SOURCES)
 preface.useless: $(preface_SOURCES)

@@ -4203,7 +4215,7 @@
 programs_using_IMAGES =
 programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
 programs_using_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-user-management-core.idmap \

@@ -4220,23 +4232,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 \

@@ -4256,7 +4268,7 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	../refman-4.1/metadata/installing.idmap \
+	../refman-5.0/metadata/windows-config-wizard.idmap \
 	metadata/apis-c.idmap \
 	metadata/backup.idmap \
 	metadata/dba-log-files.idmap \

@@ -4306,10 +4318,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 \

@@ -4416,6 +4428,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 \

@@ -4476,10 +4501,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 \


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 6476 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 \

@@ -601,9 +601,9 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
+	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.0/backup.xml \
 	../../refman-5.0/dba-privilege-system.xml \
 	../../refman-5.0/dba-security-core.xml \

@@ -1111,7 +1111,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/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
+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/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.pn!
 g ../../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/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.0/replication.xml ../../refman-5.0/metadata/replication-configuration.idmap ../../refman-5.0/replication-options-core.xml ../../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
 	$(MAKE) mysql-replication-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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 6752 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 \

@@ -724,12 +724,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 \

@@ -798,12 +798,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 \

@@ -898,9 +898,9 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
+	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.1/backup.xml \
 	../../refman-5.1/dba-privilege-system.xml \
 	../../refman-5.1/dba-security-core.xml \

@@ -1402,7 +1402,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/../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
+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
 	$(MAKE) mysql-replication-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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/topic-guides/topics-5.4/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 6752 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 \

@@ -553,12 +553,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 \

@@ -627,12 +627,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 \

@@ -727,9 +727,9 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
+	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-5.4/backup.xml \
 	../../refman-5.4/dba-privilege-system.xml \
 	../../refman-5.4/dba-security-core.xml \

@@ -1221,7 +1221,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/../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
+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
 	$(MAKE) mysql-replication-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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 7; 8443 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 \

@@ -557,12 +557,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 \

@@ -653,12 +653,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 \

@@ -775,9 +775,9 @@
 mysql-security-excerpt-base-remprepped.xml: $(mysql_security_excerpt_base_SOURCES) $(mysql_security_excerpt_base_IDMAPS)
 
 mysql_security_excerpt_INCLUDES = \
+	../../../mysqldoc/dynamic-docs/faq/mysql-security.xml \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../dynamic-docs/faq/mysql-security.xml \
 	../../refman-6.0/backup.xml \
 	../../refman-6.0/dba-privilege-system.xml \
 	../../refman-6.0/dba-security-core.xml \

@@ -1269,7 +1269,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/../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
+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
 	$(MAKE) mysql-replication-excerpt.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-07-02 13:33:44 UTC (rev 15557)
+++ trunk/workbench/Makefile.depends	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 1; 2679 bytes

@@ -127,10 +127,20 @@
 	../refman-common/urls.ent \
 	all-entities.ent \
 	images/published/wb-diff-sources.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-options.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-script.png \
+	images/published/wb-forward-engineer-sql-script-wizard-export-options.png \
+	images/published/wb-forward-engineer-sql-script-wizard-filter.png \
+	images/published/wb-forward-engineer-sql-script-wizard-review-script.png \
 	version.ent \
 	workbench.ent
 forward_engineering_IMAGES = \
-	images/published/wb-diff-sources.png
+	images/published/wb-diff-sources.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-options.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-script.png \
+	images/published/wb-forward-engineer-sql-script-wizard-export-options.png \
+	images/published/wb-forward-engineer-sql-script-wizard-filter.png \
+	images/published/wb-forward-engineer-sql-script-wizard-review-script.png
 forward_engineering_SOURCES = forward-engineering.xml $(forward_engineering_INCLUDES)
 forward_engineering_IDMAPS = \
 	metadata/forward-engineering.idmap \

@@ -629,6 +639,11 @@
 	images/published/wb-drawSplit.png \
 	images/published/wb-find-window.png \
 	images/published/wb-foreign-key.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-options.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-script.png \
+	images/published/wb-forward-engineer-sql-script-wizard-export-options.png \
+	images/published/wb-forward-engineer-sql-script-wizard-filter.png \
+	images/published/wb-forward-engineer-sql-script-wizard-review-script.png \
 	images/published/wb-grt-shell.png \
 	images/published/wb-index-tab.png \
 	images/published/wb-installing-mac-install-screen.png \

@@ -687,6 +702,11 @@
 	images/published/wb-drawSplit.png \
 	images/published/wb-find-window.png \
 	images/published/wb-foreign-key.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-options.png \
+	images/published/wb-forward-engineer-sql-alter-script-wizard-script.png \
+	images/published/wb-forward-engineer-sql-script-wizard-export-options.png \
+	images/published/wb-forward-engineer-sql-script-wizard-filter.png \
+	images/published/wb-forward-engineer-sql-script-wizard-review-script.png \
 	images/published/wb-grt-shell.png \
 	images/published/wb-index-tab.png \
 	images/published/wb-installing-mac-install-screen.png \


Modified: trunk/workbench/forward-engineering.xml
===================================================================
--- trunk/workbench/forward-engineering.xml	2009-07-02 13:33:44 UTC (rev 15557)
+++ trunk/workbench/forward-engineering.xml	2009-07-02 14:28:40 UTC (rev 15558)
Changed blocks: 3, Lines Added: 157, Lines Deleted: 72; 11924 bytes

@@ -11,8 +11,7 @@
 
   <para>
     It is possible to forward engineer a database using an SQL script or
-    by connecting to a live database. Forward engineering to a live
-    database is available for commercial versions of &workbench; only.
+    by connecting to a live database.
   </para>
 
   <section id="wb-forward-engineering-sql-scripts">

@@ -39,85 +38,143 @@
       <title>Creating a Schema</title>
 
       <para>
-        The SQL export options are as follows:
+        Selecting <guimenu>File</guimenu>, <guimenu>Export</guimenu>,
+        <guimenu>Forward Engineer SQL CREATE Script</guimenu> will start
+        the Forward Engineer SQL Script wizard. The first page of the
+        wizard is:
+      </para>
 
-        <itemizedlist>
+      <figure id="wb-forward-engineer-sql-script-wizard-export-options">
+        <title>SQL Export Options</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-forward-engineer-sql-script-wizard-export-options.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">SQL Export Options</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
 
-          <listitem>
-            <para>
-              Generate DROP statements (except DROP DATABASE)
-            </para>
-          </listitem>
+      <para>
+        The SQL Export Options displays the following facilities:
+      </para>
 
-          <listitem>
-            <para>
-              Generate separate CREATE INDEX statements
-            </para>
-          </listitem>
+      <para>
+        <emphasis role="bold">Output SQL Script File</emphasis>
+      </para>
 
-          <listitem>
-            <para>
-              Generate SHOW WARNINGS after every DDL statement
-            </para>
-          </listitem>
+      <para>
+        You can enter the name of your output file by entering it into
+        the <guilabel>Output SQL Script File</guilabel> text box, or by
+        using the <guibutton>Browse</guibutton> button to select a file.
+        If this text box is left blank you will be able to view the
+        generated script, but it will not be saved to a file.
+      </para>
 
-          <listitem>
-            <para>
-              Do not create users, just export privileges
-            </para>
-          </listitem>
+      <para>
+        <emphasis role="bold"> Generate DROP Statements Before Each
+        CREATE Statement</emphasis>
+      </para>
 
-          <listitem>
-            <para>
-              Generate INSERT statements for tables
-            </para>
-          </listitem>
+      <para>
+        <emphasis role="bold"> Omit Schema Qualifier in Object
+        Names</emphasis>
+      </para>
 
-        </itemizedlist>
+      <para>
+        <emphasis role="bold"> Generate Separate CREATE INDEX
+        Statements</emphasis>
       </para>
 
       <para>
-        Choosing the option <literal>Generate separate CREATE INDEX
-        statements</literal> creates separate statements for index
+        Choosing this option creates separate statements for index
         creation instead of creating indexes as part of a
-        <literal>CREATE TABLE</literal> statement. To update the
-        privileges of existing users as opposed to creating new users,
-        select the <literal>Do not create users, just export
-        privileges</literal> check box. Exporting privileges for
-        nonexistent users will result in errors when you execute the
+        <literal>CREATE TABLE</literal> statement.
+      </para>
+
+      <para>
+        <emphasis role="bold"> Add SHOW WARNINGS after every DDL
+        statement</emphasis>
+      </para>
+
+      <para>
+        <emphasis role="bold"> Do Not Create Users. Only Export
+        Privileges</emphasis>
+      </para>
+
+      <para>
+        To update the privileges of existing users as opposed to
+        creating new users, select this check box. Exporting privileges
+        for nonexistent users will result in errors when you execute the
         <literal>CREATE</literal> script. Exporting users that already
         exist, will also result in an error.
       </para>
 
       <para>
+        <emphasis role="bold"> Generate INSERT Statements for
+        Tables</emphasis>
+      </para>
+
+      <para>
         If you have added any records to a table using the
-        <literal>INSERT</literal> tab of the &table_editor;, choose the
-        <literal>Generate INSERT statements for tables</literal> option.
-        For more information about inserting records see
+        <guilabel>Insert</guilabel> tab of the &table_editor;, choose
+        this option. For more information about inserting records see
         <xref linkend="wb-table-editor-inserts"/>.
       </para>
 
       <para>
-        Use the <guilabel>Output Options</guilabel> frame to set the
-        name of your script file. The <guibutton>Next</guibutton> button
-        is disabled until a script file name is supplied.
+        Clicking <guibutton>Next</guibutton> takes you to the
+        <guilabel>SQL Object Export Filter</guilabel> page where you can
+        select the objects you wish to export.
       </para>
 
+      <figure id="wb-forward-engineer-sql-script-wizard-filter">
+        <title>SQL Object Export Filter</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-forward-engineer-sql-script-wizard-filter.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">SQL Object Export Filter</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
+
       <para>
-        Clicking <guibutton>Next</guibutton> takes you to the
-        <guilabel>SQL Export Filter</guilabel> window where you can
-        select the objects you wish to export. For a description of this
-        window see <xref linkend="wb-reverse-engineer-live"/>.
+        Precise control over the objects to be exported can be fine
+        tuned by clicking the <guibutton>Show Filter</guibutton> button.
+        Once the objects to be exported have been selected it is
+        possible to reduce the expanded panel by clicking the same
+        button, now labelled <guibutton>Hide Filter</guibutton>.
       </para>
 
       <para>
+        Having selected the objects you wish to export you can click the
+        <guibutton>Next</guibutton> button to review the script that has
+        been generated:
+      </para>
+
+      <figure id="wb-forward-engineer-sql-script-wizard-review-script">
+        <title>Review Generated Script</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-forward-engineer-sql-script-wizard-review-script.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">Review Generated Script</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
+
+      <para>
         The <guibutton>Finish</guibutton> button saves the script file
         and exits. You may return to the previous screen using the
         <guibutton>Back</guibutton> button.
       </para>
 
       <para>
-        Use the saved script to create a database.
+        You can then use the saved script to create a database.
       </para>
 
     </section>

@@ -128,45 +185,73 @@
 
       <para>
         The menu option for altering a schema, <guimenu>Forward Engineer
-        Alter Script ...</guimenu>, is used for updating a database that
-        has been redesigned within &workbench;. Typically, this option
-        is used when the SQL script of a database has been imported into
-        &workbench; and changed. For instructions on importing a DDL
-        script see <xref linkend="wb-reverse-engineer-create-script"/>.
+        SQL ALTER Script ...</guimenu>, is used for updating a database
+        that has been redesigned within &workbench;. Typically, this
+        option is used when the SQL script of a database has been
+        imported into &workbench; and changed. For instructions on
+        importing a DDL script see
+        <xref linkend="wb-reverse-engineer-create-script"/>.
       </para>
 
       <para>
-        Choose this menu option and on the first screen, <guilabel>SQL
-        Sync Options</guilabel>, you are asked to supply an input file.
-        In most cases this will be the file that you imported into
-        &workbench; using the <guimenu>Reverse Engineer MySQL Create
-        Script</guimenu> menu option found under the
-        <guimenu>File</guimenu>, <guimenu>Import</guimenu> options. In
-        any case, this file should represent the state of the
-        re-engineered database prior to alteration.
+        Select <guimenu>File</guimenu>, <guimenu>Export</guimenu>,
+        <guimenu>Forward Engineer SQL ALTER Script</guimenu> to start
+        the Foward Engineer an ALTER Script wizard. You will be
+        presented with the first page:
       </para>
 
+      <figure id="wb-forward-engineer-sql-alter-script-wizard-options">
+        <title>Options</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-forward-engineer-sql-alter-script-wizard-options.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">Options</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
+
       <para>
-        The differences between the original database and the altered
-        database are displayed on the next screen, the <guilabel>SQL
-        Diff Tree</guilabel> window. To view the details, click the
-        <guibutton>+</guibutton> button to the left of the model
-        database.
+        This first screen allows you to select a SQL script and compare
+        it with the model currently in &workbench;. The difference
+        between the two models will be used to create an alter script
+        that can be used to modify the target schema so that it matches
+        the model held in &workbench;. You can also simply view the
+        script generated, rather than saving it to a file, by leaving
+        the <guilabel>Output File</guilabel> text box empty.
       </para>
 
       <para>
         Pressing <guibutton>Next</guibutton> brings you to the
-        <guilabel>SQL Script</guilabel> screen. Here you can review and
-        change the ALTER script that will be generated. Make any changes
-        you wish and, if you are happy with the changes, save the
-        <literal>ALTER</literal> script to file using the
-        <guibutton>Save to file ...</guibutton> button.
+        <guilabel>Review SQL Script</guilabel> screen.
       </para>
 
+      <figure id="wb-forward-engineer-sql-alter-script-wizard-script">
+        <title>Script</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-forward-engineer-sql-alter-script-wizard-script.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">Script</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
+
       <para>
-        Use the saved script to update the database.
+        Here you can review and change the alter script that will be
+        generated. Make any changes you wish and, if you are happy with
+        the changes, save the <literal>ALTER</literal> script to file
+        using the <guibutton>Save to File ...</guibutton> button. You
+        can also click the <guibutton>Execute</guibutton> button to
+        write the script to the previously specified output file.
       </para>
 
+      <para>
+        The generated script can then be used to update the database.
+      </para>
+
     </section>
 
   </section>
Thread
• svn commit - mysqldoc@docsrva: r15558 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1 mysqlqb quick-guides refman-4.1 refman-5.0 refman-5.1 refman-5.1...	anthony.bedford	2 Jul