List:Commits« Previous MessageNext Message »
From:jon Date:February 21 2008 10:59am
Subject:svn commit - mysqldoc@docsrva: r9964 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
View as plain text  
Author: jstephens
Date: 2008-02-21 11:59:15 +0100 (Thu, 21 Feb 2008)
New Revision: 9964

Log:

Forgot to include dynxml file instead of core, updated dpendencies

(Thanks, MC!)



Modified:
   trunk/refman-4.1/Makefile.depends
   trunk/refman-4.1/mysql-cluster.xml
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.0/mysql-cluster.xml
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/mysql-cluster.xml
   trunk/refman-6.0/Makefile.depends
   trunk/refman-6.0/mysql-cluster.xml


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-4.1/Makefile.depends	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 5, Lines Added: 30, Lines Deleted: 11; 4340 bytes

@@ -443,6 +443,31 @@
 dynxml-local-functions-manprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
 dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES) $(dynxml_local_functions_IDMAPS)
 dynxml-local-functions.xml: $(dynxml_local_functions_INCLUDES)
+dynxml_local_mysql_cluster_optvar_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	mysql-cluster-optvar-core.xml \
+	versions.ent
+dynxml_local_mysql_cluster_optvar_IMAGES =
+dynxml_local_mysql_cluster_optvar_SOURCES = dynxml-local-mysql-cluster-optvar.xml $(dynxml_local_mysql_cluster_optvar_INCLUDES)
+dynxml_local_mysql_cluster_optvar_IDMAPS = \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
+	../refman-4.1/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
+	../refman-4.1/metadata/mysql-cluster-utilities.idmap
+dynxml-local-mysql-cluster-optvar.validpure: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.titles: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.useless: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.valid: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar.validwarn: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-prepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-manprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+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_news_4_1_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -874,6 +899,7 @@
 	dynxml-common-news-mysql-proxy.xml \
 	dynxml-local-dba.xml \
 	dynxml-local-functions.xml \
+	dynxml-local-mysql-cluster-optvar.xml \
 	dynxml-local-news-4.1.xml \
 	errmsgs-client.xml \
 	errmsgs-server.xml \

@@ -1251,19 +1277,10 @@
 mysql-cluster-multi-computer-manprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 mysql-cluster-multi-computer-remprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 
-mysql_cluster_optvar_core_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
+mysql_cluster_optvar_core_INCLUDES =
 mysql_cluster_optvar_core_IMAGES =
 mysql_cluster_optvar_core_SOURCES = mysql-cluster-optvar-core.xml $(mysql_cluster_optvar_core_INCLUDES)
-mysql_cluster_optvar_core_IDMAPS = \
-	../refman-4.1/metadata/dba-core.idmap \
-	../refman-4.1/metadata/mysql-cluster-configuration.idmap \
-	../refman-4.1/metadata/mysql-cluster-process-management.idmap \
-	../refman-4.1/metadata/mysql-cluster-utilities.idmap
+mysql_cluster_optvar_core_IDMAPS =
 mysql-cluster-optvar-core.validpure: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.titles: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.useless: $(mysql_cluster_optvar_core_SOURCES)

@@ -1410,6 +1427,7 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.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 \

@@ -1422,6 +1440,7 @@
 	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	dynxml-local-mysql-cluster-optvar.xml \
 	mysql-cluster-backup.xml \
 	mysql-cluster-configuration.xml \
 	mysql-cluster-faq.xml \


Modified: trunk/refman-4.1/mysql-cluster.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster.xml	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-4.1/mysql-cluster.xml	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 885 bytes

@@ -139,9 +139,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-optvar-core.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-process-management.xml"/>


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-5.0/Makefile.depends	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 5, Lines Added: 28, Lines Deleted: 9; 4220 bytes

@@ -625,6 +625,29 @@
 dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_mysql_cluster_optvar_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	mysql-cluster-optvar-core.xml \
+	versions.ent
+dynxml_local_mysql_cluster_optvar_IMAGES =
+dynxml_local_mysql_cluster_optvar_SOURCES = dynxml-local-mysql-cluster-optvar.xml $(dynxml_local_mysql_cluster_optvar_INCLUDES)
+dynxml_local_mysql_cluster_optvar_IDMAPS = \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-5.0/metadata/mysql-cluster-optvar-core.idmap
+dynxml-local-mysql-cluster-optvar.validpure: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.titles: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.useless: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.valid: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar.validwarn: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-prepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-manprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+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_news_5_0_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -1539,6 +1562,7 @@
 	dynxml-local-functions.xml \
 	dynxml-local-installing-cs.xml \
 	dynxml-local-language-structure.xml \
+	dynxml-local-mysql-cluster-optvar.xml \
 	dynxml-local-news-5.0.xml \
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \

@@ -1979,17 +2003,10 @@
 mysql-cluster-multi-computer-manprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 mysql-cluster-multi-computer-remprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 
-mysql_cluster_optvar_core_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
+mysql_cluster_optvar_core_INCLUDES =
 mysql_cluster_optvar_core_IMAGES =
 mysql_cluster_optvar_core_SOURCES = mysql-cluster-optvar-core.xml $(mysql_cluster_optvar_core_INCLUDES)
-mysql_cluster_optvar_core_IDMAPS = \
-	../refman-5.0/metadata/dba-core.idmap \
-	../refman-5.0/metadata/mysql-cluster-configuration.idmap
+mysql_cluster_optvar_core_IDMAPS =
 mysql-cluster-optvar-core.validpure: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.titles: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.useless: $(mysql_cluster_optvar_core_SOURCES)

@@ -2157,6 +2174,7 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.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 \

@@ -2169,6 +2187,7 @@
 	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	dynxml-local-mysql-cluster-optvar.xml \
 	mysql-cluster-backup.xml \
 	mysql-cluster-configuration.xml \
 	mysql-cluster-glossary.xml \


Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-5.0/mysql-cluster.xml	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 885 bytes

@@ -136,9 +136,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-optvar-core.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-process-management.xml"/>


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-5.1/Makefile.depends	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 6, Lines Added: 30, Lines Deleted: 9; 4687 bytes

@@ -655,6 +655,30 @@
 dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_mysql_cluster_optvar_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	mysql-cluster-optvar-core.xml \
+	versions.ent
+dynxml_local_mysql_cluster_optvar_IMAGES =
+dynxml_local_mysql_cluster_optvar_SOURCES = dynxml-local-mysql-cluster-optvar.xml $(dynxml_local_mysql_cluster_optvar_INCLUDES)
+dynxml_local_mysql_cluster_optvar_IDMAPS = \
+	../refman-5.1/metadata/dba-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
+	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap
+dynxml-local-mysql-cluster-optvar.validpure: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.titles: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.useless: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.valid: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar.validwarn: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-prepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-manprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+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_news_5_1_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -1395,6 +1419,7 @@
 	dynxml-local-functions.xml \
 	dynxml-local-installing.xml \
 	dynxml-local-language-structure.xml \
+	dynxml-local-mysql-cluster-optvar.xml \
 	dynxml-local-news-5.1.xml \
 	dynxml-local-programs-admin-util.xml \
 	dynxml-local-programs-client.xml \

@@ -1831,17 +1856,10 @@
 mysql-cluster-multi-computer-manprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 mysql-cluster-multi-computer-remprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 
-mysql_cluster_optvar_core_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
+mysql_cluster_optvar_core_INCLUDES =
 mysql_cluster_optvar_core_IMAGES =
 mysql_cluster_optvar_core_SOURCES = mysql-cluster-optvar-core.xml $(mysql_cluster_optvar_core_INCLUDES)
-mysql_cluster_optvar_core_IDMAPS = \
-	../refman-5.1/metadata/dba-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap
+mysql_cluster_optvar_core_IDMAPS =
 mysql-cluster-optvar-core.validpure: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.titles: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.useless: $(mysql_cluster_optvar_core_SOURCES)

@@ -2031,6 +2049,7 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
 	../refman-common/images/published/cluster-circular-replication-1.png \
 	../refman-common/images/published/cluster-circular-replication-2.png \
 	../refman-common/images/published/cluster-components-1.png \

@@ -2047,6 +2066,7 @@
 	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	dynxml-local-mysql-cluster-optvar.xml \
 	mysql-cluster-backup.xml \
 	mysql-cluster-cge.xml \
 	mysql-cluster-configuration.xml \

@@ -2094,6 +2114,7 @@
 	../refman-5.1/metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \
 	../refman-5.1/metadata/news-5.1-core.idmap \
 	../refman-5.1/metadata/partitioning.idmap \


Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-5.1/mysql-cluster.xml	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 680 bytes

@@ -153,7 +153,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-optvar-core.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>
 


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-5.1-maria/Makefile.depends	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 635 bytes

@@ -213,6 +213,7 @@
 	../refman-5.1/dynxml-local-functions.xml \
 	../refman-5.1/dynxml-local-installing.xml \
 	../refman-5.1/dynxml-local-language-structure.xml \
+	../refman-5.1/dynxml-local-mysql-cluster-optvar.xml \
 	../refman-5.1/dynxml-local-news-5.1.xml \
 	../refman-5.1/dynxml-local-programs-admin-util.xml \
 	../refman-5.1/dynxml-local-programs-client.xml \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-6.0/Makefile.depends	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 5, Lines Added: 31, Lines Deleted: 11; 4519 bytes

@@ -562,6 +562,32 @@
 dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
 dynxml-local-language-structure.xml: $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_mysql_cluster_optvar_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	mysql-cluster-optvar-core.xml \
+	versions.ent
+dynxml_local_mysql_cluster_optvar_IMAGES =
+dynxml_local_mysql_cluster_optvar_SOURCES = dynxml-local-mysql-cluster-optvar.xml $(dynxml_local_mysql_cluster_optvar_INCLUDES)
+dynxml_local_mysql_cluster_optvar_IDMAPS = \
+	../refman-6.0/metadata/dba-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
+	../refman-6.0/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
+	../refman-6.0/metadata/mysql-cluster-replication.idmap \
+	../refman-6.0/metadata/mysql-cluster-utilities.idmap
+dynxml-local-mysql-cluster-optvar.validpure: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.titles: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.useless: $(dynxml_local_mysql_cluster_optvar_SOURCES)
+dynxml-local-mysql-cluster-optvar.valid: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar.validwarn: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-prepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+dynxml-local-mysql-cluster-optvar-manprepped.xml: $(dynxml_local_mysql_cluster_optvar_SOURCES) $(dynxml_local_mysql_cluster_optvar_IDMAPS)
+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_news_5_2_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -1284,6 +1310,7 @@
 	dynxml-local-functions.xml \
 	dynxml-local-installing.xml \
 	dynxml-local-language-structure.xml \
+	dynxml-local-mysql-cluster-optvar.xml \
 	dynxml-local-news-5.2.xml \
 	dynxml-local-news-6.0.xml \
 	dynxml-local-programs-admin-util.xml \

@@ -1729,19 +1756,10 @@
 mysql-cluster-multi-computer-manprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 mysql-cluster-multi-computer-remprepped.xml: $(mysql_cluster_multi_computer_SOURCES) $(mysql_cluster_multi_computer_IDMAPS)
 
-mysql_cluster_optvar_core_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
+mysql_cluster_optvar_core_INCLUDES =
 mysql_cluster_optvar_core_IMAGES =
 mysql_cluster_optvar_core_SOURCES = mysql-cluster-optvar-core.xml $(mysql_cluster_optvar_core_INCLUDES)
-mysql_cluster_optvar_core_IDMAPS = \
-	../refman-6.0/metadata/dba-core.idmap \
-	../refman-6.0/metadata/mysql-cluster-configuration.idmap \
-	../refman-6.0/metadata/mysql-cluster-process-management.idmap \
-	../refman-6.0/metadata/mysql-cluster-utilities.idmap
+mysql_cluster_optvar_core_IDMAPS =
 mysql-cluster-optvar-core.validpure: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.titles: $(mysql_cluster_optvar_core_SOURCES)
 mysql-cluster-optvar-core.useless: $(mysql_cluster_optvar_core_SOURCES)

@@ -1944,6 +1962,7 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../dynamic-docs/command-optvars/mysqld.xml \
 	../refman-common/images/published/cluster-circular-replication-1.png \
 	../refman-common/images/published/cluster-circular-replication-2.png \
 	../refman-common/images/published/cluster-components-1.png \

@@ -1960,6 +1979,7 @@
 	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	dynxml-local-mysql-cluster-optvar.xml \
 	mysql-cluster-backup.xml \
 	mysql-cluster-configuration.xml \
 	mysql-cluster-disk-data.xml \


Modified: trunk/refman-6.0/mysql-cluster.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster.xml	2008-02-21 10:36:36 UTC (rev 9963)
+++ trunk/refman-6.0/mysql-cluster.xml	2008-02-21 10:59:15 UTC (rev 9964)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 885 bytes

@@ -157,9 +157,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-optvar-core.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-process-management.xml"/>


Thread
svn commit - mysqldoc@docsrva: r9964 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0jon21 Feb