List:Commits« Previous MessageNext Message »
From:martin.brown Date:February 27 2009 11:34am
Subject:svn commit - mysqldoc@docsrva: r13991 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 topic-guides/topics-5.0 topic-guides/to...
View as plain text  
Author: mcbrown
Date: 2009-02-27 11:34:20 +0100 (Fri, 27 Feb 2009)
New Revision: 13991

Log:
Fixing some build issues
Dependency update



Modified:
   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-6.0/Makefile.depends
   trunk/topic-guides/topics-5.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile.depends
   trunk/topic-guides/topics-6.0/Makefile.depends
   trunk/topic-guides/topics-common/Makefile.depends
   trunk/topic-guides/topics-common/connector-cpp-aspec.xml


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/refman-4.1/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 664 bytes

@@ -2413,6 +2413,7 @@
 	../refman-4.1/metadata/se-innodb-core.idmap \
 	../refman-4.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-4.1/metadata/sql-syntax-data-manipulation.idmap \
+	../refman-4.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-4.1/metadata/sql-syntax-transactions.idmap
 se-innodb-core.validpure: $(se_innodb_core_SOURCES)
 se-innodb-core.titles: $(se_innodb_core_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/refman-5.0/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 14, Lines Added: 21, Lines Deleted: 25; 7202 bytes

@@ -267,6 +267,7 @@
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -1319,16 +1320,16 @@
 dynxml-local-releasenotes-es-5.0-remprepped.xml:
$(dynxml_local_releasenotes_es_5_0_SOURCES) $(dynxml_local_releasenotes_es_5_0_IDMAPS)
 dynxml-local-releasenotes-es-5.0.xml: $(dynxml_local_releasenotes_es_5_0_INCLUDES)
 dynxml_local_replication_options_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	replication-options-core.xml \
 	versions.ent
 dynxml_local_replication_options_IMAGES =
 dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml
$(dynxml_local_replication_options_INCLUDES)

@@ -1337,6 +1338,7 @@
 	../refman-5.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
+	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
 	../refman-5.0/metadata/replication-options-core.idmap \

@@ -1409,6 +1411,7 @@
 	../refman-5.0/metadata/se-innodb-core.idmap \
 	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
+	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/sql-syntax-transactions.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)

@@ -1879,6 +1882,9 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_sun_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/command-optvars/myisamchk.xml \

@@ -2249,7 +2255,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2537,6 +2542,7 @@
 	../refman-common/metadata/ha-memcached-core.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -2551,6 +2557,9 @@
 manual-sun-remprepped.xml: $(manual_sun_SOURCES) $(manual_sun_IDMAPS)
 
 manual_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/changelog/connector-j-versions.xml \

@@ -2965,7 +2974,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -3253,7 +3261,8 @@
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \
 	../refman-common/metadata/ha-memcached-core.idmap \
 	../refman-common/metadata/load-balancer.idmap \
-	../refman-common/metadata/mysql-proxy-core.idmap
+	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -4548,17 +4557,17 @@
 releasenotes-es-remprepped.xml: $(releasenotes_es_SOURCES) $(releasenotes_es_IDMAPS)
 
 replication_configuration_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \
-	replication-options-core.xml \
 	versions.ent
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml
$(replication_configuration_INCLUDES)

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

@@ -4695,10 +4691,11 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES)
$(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -4713,7 +4710,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/refman-5.1/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 19, Lines Added: 21, Lines Deleted: 28; 9087 bytes

@@ -272,6 +272,7 @@
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -336,6 +337,7 @@
 	../refman-5.1/metadata/dba-log-files.idmap \
 	../refman-5.1/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
+	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
 	../refman-5.1/metadata/programs-installation.idmap \

@@ -1401,16 +1403,16 @@
 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 = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	replication-options-core.xml \
 	versions.ent
 dynxml_local_replication_options_IMAGES =
 dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml
$(dynxml_local_replication_options_INCLUDES)

@@ -1419,7 +1421,6 @@
 	../refman-5.1/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.1/metadata/dba-user-management-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \

@@ -1487,6 +1488,7 @@
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/sql-syntax-data-definition.idmap \
 	../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \
+	../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.1/metadata/sql-syntax-transactions.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)

@@ -2006,6 +2008,9 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_sun_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/build-configure/mysqld.xml \

@@ -2423,7 +2428,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2722,6 +2726,7 @@
 	../refman-common/metadata/ha-memcached-core.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -2736,6 +2741,9 @@
 manual-sun-remprepped.xml: $(manual_sun_SOURCES) $(manual_sun_IDMAPS)
 
 manual_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/build-configure/mysqld.xml \

@@ -3191,7 +3199,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -3985,7 +3992,6 @@
 	../refman-5.1/metadata/information-schema.idmap \
 	../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.1/metadata/mysql-cluster-management.idmap \
-	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-process-management.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster-security.idmap \

@@ -4691,6 +4697,7 @@
 programs_installation_IDMAPS = \
 	../refman-5.1/metadata/installing-core.idmap \
 	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.idmap \
 	../refman-5.1/metadata/programs-installation.idmap \
 	../refman-5.1/metadata/sql-syntax-server-administration.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)

@@ -4815,6 +4822,7 @@
 	../refman-5.1/metadata/events.idmap \
 	../refman-5.1/metadata/installing-core.idmap \
 	../refman-5.1/metadata/internationalization.idmap \
+	../refman-5.1/metadata/language-structure-core.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 \

@@ -4856,17 +4864,17 @@
 quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
 
 replication_configuration_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \
-	replication-options-core.xml \
 	versions.ent
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml
$(replication_configuration_INCLUDES)

@@ -4875,7 +4883,6 @@
 	../refman-5.1/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.1/metadata/dba-user-management-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
-	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \

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

@@ -5016,10 +5010,11 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES)
$(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-5.1/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -5035,7 +5030,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \

@@ -5054,7 +5048,6 @@
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/functions-core.idmap \
 	../refman-5.1/metadata/information-schema.idmap \
-	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/optimization.idmap \


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 4, Lines Added: 3, Lines Deleted: 1; 1692 bytes

@@ -462,6 +462,7 @@
 	../refman-5.1/../mysql-monitor-2.0/enterprise.ent \
 	../refman-5.1/../mysql-monitor-2.0/urls.ent \
 	../refman-5.1/../mysql-monitor-2.0/version.ent \
+	../refman-5.1/../refman-5.1/replication-options-core.xml \
 	../refman-5.1/../refman-common/../common/fixedchars.ent \
 	../refman-5.1/../refman-common/../common/phrases.ent \
 	../refman-5.1/../refman-common/../refman-common/apis-php-mysql.xml \

@@ -625,7 +626,6 @@
 	../refman-5.1/replication-configuration.xml \
 	../refman-5.1/replication-implementation.xml \
 	../refman-5.1/replication-notes.xml \
-	../refman-5.1/replication-options-core.xml \
 	../refman-5.1/replication-solutions.xml \
 	../refman-5.1/replication.xml \
 	../refman-5.1/restrictions.xml \

@@ -887,6 +887,7 @@
 	../refman-5.1/metadata/mysql-cluster-utilities.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/news.idmap \
+	../refman-5.1/metadata/replication-options-core.idmap \
 	../refman-5.1/metadata/storage-engines-core.idmap \
 	../refman-6.0/metadata/manual-sun.idmap \
 	../refman-6.0/metadata/se-maria-core.idmap \

@@ -913,6 +914,7 @@
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/what-is.en.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/refman-6.0/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 19, Lines Added: 21, Lines Deleted: 28; 8894 bytes

@@ -274,6 +274,7 @@
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -1025,6 +1026,7 @@
 	../refman-6.0/metadata/installing-core.idmap \
 	../refman-6.0/metadata/internationalization.idmap \
 	../refman-6.0/metadata/introduction.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/partitioning.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \

@@ -1152,7 +1154,6 @@
 dynxml_local_programs_server_IMAGES =
 dynxml_local_programs_server_SOURCES = dynxml-local-programs-server.xml
$(dynxml_local_programs_server_INCLUDES)
 dynxml_local_programs_server_IDMAPS = \
-	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/dba-log-files.idmap \
 	../refman-6.0/metadata/dba-multiple-servers.idmap \
 	../refman-6.0/metadata/dba-mysqld-server-core.idmap \

@@ -1222,16 +1223,16 @@
 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 = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-6.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	replication-options-core.xml \
 	versions.ent
 dynxml_local_replication_options_IMAGES =
 dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml
$(dynxml_local_replication_options_INCLUDES)

@@ -1335,6 +1336,7 @@
 	../refman-6.0/metadata/se-innodb-core.idmap \
 	../refman-6.0/metadata/sql-syntax-data-definition.idmap \
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
+	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/sql-syntax-transactions.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)

@@ -1892,6 +1894,9 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 manual_sun_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-6.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/build-configure/mysqld.xml \

@@ -2194,7 +2199,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2391,7 +2395,6 @@
 	../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.1/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/apis-c.idmap \
 	../refman-6.0/metadata/apis-libmysqld.idmap \
 	../refman-6.0/metadata/backup.idmap \

@@ -2468,6 +2471,7 @@
 	../refman-common/metadata/ha-memcached-core.idmap \
 	../refman-common/metadata/load-balancer.idmap \
 	../refman-common/metadata/mysql-proxy-core.idmap \
+	../refman-common/metadata/news-ccpp-core.idmap \
 	../refman-common/metadata/news-cj-core.idmap \
 	../refman-common/metadata/news-cmxj-core.idmap \
 	../refman-common/metadata/news-cnet-core.idmap \

@@ -2482,6 +2486,9 @@
 manual-sun-remprepped.xml: $(manual_sun_SOURCES) $(manual_sun_IDMAPS)
 
 manual_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-6.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../dynamic-docs/build-configure/mysqld.xml \

@@ -2827,7 +2834,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -3024,7 +3030,6 @@
 	../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.1/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/apis-c.idmap \
 	../refman-6.0/metadata/apis-libmysqld.idmap \
 	../refman-6.0/metadata/backup.idmap \

@@ -3711,6 +3716,7 @@
 programs_installation_IDMAPS = \
 	../refman-6.0/metadata/installing-core.idmap \
 	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
 	../refman-6.0/metadata/programs-installation.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)

@@ -3822,7 +3828,6 @@
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
 	../refman-4.1/metadata/installing.idmap \
-	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/apis-c.idmap \
 	../refman-6.0/metadata/backup.idmap \
 	../refman-6.0/metadata/dba-log-files.idmap \

@@ -3834,6 +3839,7 @@
 	../refman-6.0/metadata/events.idmap \
 	../refman-6.0/metadata/installing-core.idmap \
 	../refman-6.0/metadata/internationalization.idmap \
+	../refman-6.0/metadata/language-structure-core.idmap \
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \

@@ -3872,17 +3878,17 @@
 quickref-core-remprepped.xml: $(quickref_core_SOURCES) $(quickref_core_IDMAPS)
 
 replication_configuration_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-6.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \
-	replication-options-core.xml \
 	versions.ent
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml
$(replication_configuration_INCLUDES)

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

@@ -4053,10 +4046,11 @@
 replication-solutions-remprepped.xml: $(replication_solutions_SOURCES)
$(replication_solutions_IDMAPS)
 
 replication_INCLUDES = \
+	../../dynamic-docs/command-optvars/mysqld.xml \
+	../../dynamic-docs/metadata-titles.en.xml \
+	../../refman-6.0/replication-options-core.xml \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
-	../dynamic-docs/command-optvars/mysqld.xml \
-	../dynamic-docs/metadata-titles.en.xml \
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \

@@ -4083,7 +4077,6 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
-	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 5452 bytes

@@ -309,6 +309,7 @@
 	../../refman-5.0/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-5.0/../mysql-monitor-2.0/urls.ent \
 	../../refman-5.0/../mysql-monitor-2.0/version.ent \
+	../../refman-5.0/../refman-5.0/replication-options-core.xml \
 	../../refman-5.0/../refman-common/images/published/multi-db.png \
 	../../refman-5.0/../refman-common/images/published/redundancy-after.png \
 	../../refman-5.0/../refman-common/images/published/redundancy-before.png \

@@ -320,7 +321,6 @@
 	../../refman-5.0/replication-configuration.xml \
 	../../refman-5.0/replication-implementation.xml \
 	../../refman-5.0/replication-notes.xml \
-	../../refman-5.0/replication-options-core.xml \
 	../../refman-5.0/replication-solutions.xml \
 	../../refman-5.0/replication.xml \
 	../../refman-5.0/versions.ent \

@@ -381,6 +381,7 @@
 	../../refman-5.0/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-5.0/../mysql-monitor-2.0/urls.ent \
 	../../refman-5.0/../mysql-monitor-2.0/version.ent \
+	../../refman-5.0/../refman-5.0/replication-options-core.xml \
 	../../refman-5.0/../refman-common/images/published/multi-db.png \
 	../../refman-5.0/../refman-common/images/published/redundancy-after.png \
 	../../refman-5.0/../refman-common/images/published/redundancy-before.png \

@@ -392,7 +393,6 @@
 	../../refman-5.0/replication-configuration.xml \
 	../../refman-5.0/replication-implementation.xml \
 	../../refman-5.0/replication-notes.xml \
-	../../refman-5.0/replication-options-core.xml \
 	../../refman-5.0/replication-solutions.xml \
 	../../refman-5.0/replication.xml \
 	../../refman-5.0/versions.ent \

@@ -910,7 +910,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/../refman-common/urls.ent ../../refman-common/urls.ent
../../refman-5.0/replication.xml
../../refman-5.0/../refman-common/images/published/submaster-performance.png
../../refman-5.0/../mysql-monitor-2.0/enterprise.ent
../../refman-5.0/replication-options-core.xml ../../refman-5.0/all-entities.ent
../../refman-5.0/../mysql-monitor-2.0/urls.ent
../../refman-5.0/replication-configuration.xml
../../refman-5.0/../refman-common/images/published/redundancy-after.png
../../common/fixedchars.ent ../../refman-5.0/versions.ent
../../refman-5.0/dynxml-local-replication-options.xml ../../refman-5.0/../dynam!
 ic-docs/command-optvars/mysqld.xml ../../refman-5.0/../common/fixedchars.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-base.xml
../../refman-5.0/replication-implementation.xml mysql-replication-excerpt-aspec.xml
../../refman-5.0/../mysql-monitor-2.0/version.ent
+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/../refman-common/urls.ent ../../refman-common/urls.ent
../../refman-5.0/replication.xml
../../refman-5.0/../refman-common/images/published/submaster-performance.png
../../refman-5.0/../mysql-monitor-2.0/enterprise.ent ../../refman-5.0/all-entities.ent
../../refman-5.0/../mysql-monitor-2.0/urls.ent
../../refman-5.0/replication-configuration.xml
../../refman-5.0/../refman-common/images/published/redundancy-after.png
../../common/fixedchars.ent ../../refman-5.0/versions.ent
../../refman-5.0/dynxml-local-replication-options.xml
../../refman-5.0/../dynamic-docs/command-optvars/mysqld.xml ../../refma!
 n-5.0/../common/fixedchars.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-base.xml
../../refman-5.0/replication-implementation.xml mysql-replication-excerpt-aspec.xml
../../refman-5.0/../mysql-monitor-2.0/version.ent
../../refman-5.0/../refman-5.0/replication-options-core.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.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 5624 bytes

@@ -625,6 +625,7 @@
 	../../refman-5.1/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-5.1/../mysql-monitor-2.0/urls.ent \
 	../../refman-5.1/../mysql-monitor-2.0/version.ent \
+	../../refman-5.1/../refman-5.1/replication-options-core.xml \
 	../../refman-5.1/../refman-common/images/published/multi-db.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-after.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-before.png \

@@ -637,7 +638,6 @@
 	../../refman-5.1/replication-configuration.xml \
 	../../refman-5.1/replication-implementation.xml \
 	../../refman-5.1/replication-notes.xml \
-	../../refman-5.1/replication-options-core.xml \
 	../../refman-5.1/replication-solutions.xml \
 	../../refman-5.1/replication.xml \
 	../../refman-5.1/versions.ent \

@@ -699,6 +699,7 @@
 	../../refman-5.1/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-5.1/../mysql-monitor-2.0/urls.ent \
 	../../refman-5.1/../mysql-monitor-2.0/version.ent \
+	../../refman-5.1/../refman-5.1/replication-options-core.xml \
 	../../refman-5.1/../refman-common/images/published/multi-db.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-after.png \
 	../../refman-5.1/../refman-common/images/published/redundancy-before.png \

@@ -711,7 +712,6 @@
 	../../refman-5.1/replication-configuration.xml \
 	../../refman-5.1/replication-implementation.xml \
 	../../refman-5.1/replication-notes.xml \
-	../../refman-5.1/replication-options-core.xml \
 	../../refman-5.1/replication-solutions.xml \
 	../../refman-5.1/replication.xml \
 	../../refman-5.1/versions.ent \

@@ -1230,7 +1230,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-common/urls.ent ../../refman-5.1/replication-notes.xml
../../refman-5.1/../refman-common/images/published/redundancy-before.png
../../refman-5.1/../refman-common/images/published/multi-db.png
../../refman-5.1/../mysql-monitor-2.0/urls.ent
../../refman-5.1/../mysql-monitor-2.0/enterprise.ent
../../refman-5.1/replication-configuration.xml
../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../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/replication-implementation.xml ../../refman-5.1/versions.ent
../../refman-5.1/../dynamic-docs/metadata-titles.en.xml ../../common/fixedchars.ent
../../refman-5.1/dynxml-local-replication-options.xml
../../refman-5.1/../common/phrases.ent ../../refman-5.1/../refman-common/urls.ent
../../refman-5.1/replication-solutions.xml ../../refman-5.1/all-entities.ent
../../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-base.xml mysql-replication-excerpt-aspec.xml
../../refman-5.1/../dynamic-docs/command-optvars/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-common/urls.ent ../../refman-5.1/replication-notes.xml
../../refman-5.1/../refman-common/images/published/redundancy-before.png
../../refman-5.1/../refman-common/images/published/multi-db.png
../../refman-5.1/../mysql-monitor-2.0/urls.ent
../../refman-5.1/../mysql-monitor-2.0/enterprise.ent
../../refman-5.1/replication-configuration.xml
../../refman-5.1/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../refman-5.1/../common/fixedchars.ent ../../refman-5.1/replication.xml
../../refman-5.1/../mysql-monitor-2.0/vers!
 ion.ent ../../refman-5.1/replication-implementation.xml ../../refman-5.1/versions.ent
../../refman-5.1/../refman-5.1/replication-options-core.xml
../../refman-5.1/../dynamic-docs/metadata-titles.en.xml ../../common/fixedchars.ent
../../refman-5.1/dynxml-local-replication-options.xml
../../refman-5.1/../common/phrases.ent ../../refman-5.1/../refman-common/urls.ent
../../refman-5.1/replication-solutions.xml ../../refman-5.1/all-entities.ent
../../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-base.xml mysql-replication-excerpt-aspec.xml
../../refman-5.1/../dynamic-docs/command-optvars/mysqld.xml
 	$(MAKE) mysql-replication-excerpt.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary
(true) target


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 5, Lines Added: 3, Lines Deleted: 3; 7358 bytes

@@ -449,6 +449,7 @@
 	../../refman-6.0/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-6.0/../mysql-monitor-2.0/urls.ent \
 	../../refman-6.0/../mysql-monitor-2.0/version.ent \
+	../../refman-6.0/../refman-6.0/replication-options-core.xml \
 	../../refman-6.0/../refman-common/images/published/multi-db.png \
 	../../refman-6.0/../refman-common/images/published/redundancy-after.png \
 	../../refman-6.0/../refman-common/images/published/redundancy-before.png \

@@ -472,7 +473,6 @@
 	../../refman-6.0/replication-configuration.xml \
 	../../refman-6.0/replication-implementation.xml \
 	../../refman-6.0/replication-notes.xml \
-	../../refman-6.0/replication-options-core.xml \
 	../../refman-6.0/replication-solutions.xml \
 	../../refman-6.0/replication.xml \
 	../../refman-6.0/versions.ent \

@@ -545,6 +545,7 @@
 	../../refman-6.0/../mysql-monitor-2.0/enterprise.ent \
 	../../refman-6.0/../mysql-monitor-2.0/urls.ent \
 	../../refman-6.0/../mysql-monitor-2.0/version.ent \
+	../../refman-6.0/../refman-6.0/replication-options-core.xml \
 	../../refman-6.0/../refman-common/images/published/multi-db.png \
 	../../refman-6.0/../refman-common/images/published/redundancy-after.png \
 	../../refman-6.0/../refman-common/images/published/redundancy-before.png \

@@ -568,7 +569,6 @@
 	../../refman-6.0/replication-configuration.xml \
 	../../refman-6.0/replication-implementation.xml \
 	../../refman-6.0/replication-notes.xml \
-	../../refman-6.0/replication-options-core.xml \
 	../../refman-6.0/replication-solutions.xml \
 	../../refman-6.0/replication.xml \
 	../../refman-6.0/versions.ent \

@@ -1088,7 +1088,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/../dynamic-docs/command-optvars/mysqld.xml
../../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/../dynamic-docs/metadata-titles.en.xml
../../refman-6.0/../refman-common/images/published/rpl-multi-master-li!
 near-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/replication-implementation.xml all-entities.ent
../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml
../../common/phrases.ent
../../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/enterprise.ent
../../refman-6.0/../mysql-monitor-2.0/version.ent ../../refman-6.0/replication.xml
../../refman-6.0/../mysql-monitor-2.0/urls.ent ../../common/fixedchars.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-comm!
 on/images/published/submaster-performance.png ../../refman-6.0!
 /../comm
on/fixedchars.ent
../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png
../../refman-6.0/replication-solutions.xml 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/../dynamic-docs/command-optvars/mysqld.xml
../../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/../refman-common/images/published/rpl-multi-master-linear-4.png
../../refman-6.0/../refman-common/i!
 mages/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 all-entities.ent
../../refman-6.0/replication-configuration.xml ../../refman-6.0/replication-notes.xml
../../common/phrases.ent
../../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/enterprise.ent
../../refman-6.0/../mysql-monitor-2.0/version.ent ../../refman-6.0/replication.xml
../../refman-6.0/../mysql-monitor-2.0/urls.ent ../../common/fixedchars.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 ..!
 /../refm
an-6.0/../common/fixedchars.ent
../../refman-6.0/../refman-common/images/published/rpl-create-select-failure-rbr.png
../../refman-6.0/../refman-common/images/published/rpl-circular-upgrade-6.png
../../refman-6.0/replication-solutions.xml 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/topic-guides/topics-common/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-common/Makefile.depends	2009-02-27 10:19:28 UTC (rev 13990)
+++ trunk/topic-guides/topics-common/Makefile.depends	2009-02-27 10:34:20 UTC (rev 13991)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 3601 bytes

@@ -1758,11 +1758,11 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has
changed
-connector-cpp-aspec.xml.connector-cpp-installation.none.chapter.xml
connector-cpp-aspec.xml.ccpp-news.none.appendix.xml
connector-cpp-aspec.xml.connector-cpp-contact.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp.all.preface.xml: ../../refman-common/urls.ent
connector-cpp-base.xml ../../refman-common/news-ccpp-core.xml
../../refman-5.1/versions.ent all-entities.ent connector-cpp-aspec.xml
../../dynamic-docs/changelog/connector-cpp-versions.xml
../../dynamic-docs/changelog/connector-cpp.xml ../../refman-common/connector-cpp.xml
../../common/phrases.ent ../../common/fixedchars.ent
+connector-cpp-aspec.xml.connector-cpp-installation.none.chapter.xml
connector-cpp-aspec.xml.ccpp-news.none.appendix.xml
connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp.all.preface.xml: ../../refman-common/urls.ent
connector-cpp-base.xml ../../refman-common/news-ccpp-core.xml
../../refman-5.1/versions.ent all-entities.ent connector-cpp-aspec.xml
../../dynamic-docs/changelog/connector-cpp-versions.xml
../../dynamic-docs/changelog/connector-cpp.xml ../../refman-common/connector-cpp.xml
../../common/phrases.ent ../../common/fixedchars.ent
 	$(MAKE) connector-cpp.arbitraryforce
 
 # This rules sets the fragments of a final arby file to be dependent for the -arbitrary
(true) target
-connector-cpp-arbitrary.xml:
connector-cpp-aspec.xml.connector-cpp-installation.none.chapter.xml
connector-cpp-aspec.xml.ccpp-news.none.appendix.xml
connector-cpp-aspec.xml.connector-cpp-contact.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp.all.preface.xml
+connector-cpp-arbitrary.xml:
connector-cpp-aspec.xml.connector-cpp-installation.none.chapter.xml
connector-cpp-aspec.xml.ccpp-news.none.appendix.xml
connector-cpp-aspec.xml.connector-cpp-debug-tracing.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-requests.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-bugs.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-references.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp-getting-started-examples.none.chapter.xml
connector-cpp-aspec.xml.connector-cpp.all.preface.xml
 	$(MAKE) connector-cpp.arbitrary
 	cp connector-cpp.arbitrary connector-cpp-arbitrary.xml
 


Modified: trunk/topic-guides/topics-common/connector-cpp-aspec.xml
===================================================================
--- trunk/topic-guides/topics-common/connector-cpp-aspec.xml	2009-02-27 10:19:28 UTC (rev
13990)
+++ trunk/topic-guides/topics-common/connector-cpp-aspec.xml	2009-02-27 10:34:20 UTC (rev
13991)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 509 bytes

@@ -17,8 +17,6 @@
 
     <include src="connector-cpp-requests" markas="chapter"/>
 
-    <include src="connector-cpp-contact" markas="chapter"/>
-
   </fragment>
 
   <fragment id="ccpp-news">


Thread
svn commit - mysqldoc@docsrva: r13991 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 topic-guides/topics-5.0 topic-guides/to...martin.brown27 Feb 2009