List:Commits« Previous MessageNext Message »
From:martin.brown Date:October 3 2008 11:46am
Subject:svn commit - mysqldoc@docsrva: r11966 - in trunk/topic-guides: topics-5.0 topics-5.1 topics-6.0 topics-common
View as plain text  
Author: mcbrown
Date: 2008-10-03 13:46:47 +0200 (Fri, 03 Oct 2008)
New Revision: 11966

Log:
Dependency update



Modified:
   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


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2008-10-03 11:33:49 UTC (rev 11965)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2008-10-03 11:46:47 UTC (rev 11966)
Changed blocks: 17, Lines Added: 45, Lines Deleted: 65; 15333 bytes

@@ -9,12 +9,10 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
+		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/errors-problems.idmap \
 		../../refman-5.0/metadata/extending-mysql.idmap \
-		../../refman-5.0/metadata/installing-core.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+		../../refman-5.0/metadata/installing-core.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -40,16 +38,16 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
+		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-client-core.idmap \
+		../../refman-5.0/metadata/replication-configuration.idmap \
+		../../refman-5.0/metadata/replication-solutions.idmap \
+		../../refman-5.0/metadata/replication.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 \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication.all.preface.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
+		../../refman-5.0/metadata/sql-syntax-transactions.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -124,6 +122,19 @@
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/faqs.idmap \
 		../../refman-5.0/metadata/installing-core.idmap \
+		../../refman-5.0/metadata/mysql-cluster-backup.idmap \
+		../../refman-5.0/metadata/mysql-cluster-configuration.idmap \
+		../../refman-5.0/metadata/mysql-cluster-glossary.idmap \
+		../../refman-5.0/metadata/mysql-cluster-interconnects.idmap \
+		../../refman-5.0/metadata/mysql-cluster-limitations.idmap \
+		../../refman-5.0/metadata/mysql-cluster-management.idmap \
+		../../refman-5.0/metadata/mysql-cluster-multi-computer.idmap \
+		../../refman-5.0/metadata/mysql-cluster-optvar-core.idmap \
+		../../refman-5.0/metadata/mysql-cluster-overview.idmap \
+		../../refman-5.0/metadata/mysql-cluster-process-management.idmap \
+		../../refman-5.0/metadata/mysql-cluster-security.idmap \
+		../../refman-5.0/metadata/mysql-cluster-upgrade-downgrade.idmap \
+		../../refman-5.0/metadata/mysql-cluster-utilities.idmap \
 		../../refman-5.0/metadata/optimization.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \

@@ -134,22 +145,7 @@
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../ndbapi/metadata/ndbapi.idmap \
 	../../refman-5.1/metadata/mysql-cluster.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-backup.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-glossary.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-interconnects.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-limitations.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-management.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-multi-computer.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-options-variables.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-overview.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-process-management.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-security.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-upgrade-downgrade.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-utilities.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-cluster-excerpt.validpure: $(mysql_cluster_excerpt_SOURCES)
 mysql-cluster-excerpt.titles: $(mysql_cluster_excerpt_SOURCES)
 mysql-cluster-excerpt.useless: $(mysql_cluster_excerpt_SOURCES)

@@ -187,8 +183,8 @@
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/internationalization.idmap \
 		../../refman-5.0/metadata/programs-installation.idmap \
-		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.idmap
+		../../refman-5.0/metadata/replication-notes.idmap \
+		../../refman-5.0/metadata/sql-syntax-server-administration.idmap
 mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)

@@ -222,17 +218,14 @@
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/installing-cs.idmap \
 		../../refman-5.0/metadata/internationalization.idmap \
+		../../refman-5.0/metadata/mysql-cluster-configuration.idmap \
+		../../refman-5.0/metadata/mysql-cluster-utilities.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/se-bdb-core.idmap \
 		../../refman-5.0/metadata/se-innodb-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-utilities.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -257,8 +250,7 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/programs-installation.idmap \
-		../../refman-5.0/metadata/programs-using.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
+		../../refman-5.0/metadata/programs-using.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -301,21 +293,20 @@
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/errors-problems.idmap \
 		../../refman-5.0/metadata/functions-core.idmap \
+		../../refman-5.0/metadata/mysql-cluster.idmap \
 		../../refman-5.0/metadata/optimization.idmap \
 		../../refman-5.0/metadata/programs-client-core.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-solutions.idmap \
 		../../refman-5.0/metadata/se-innodb-core.idmap \
 		../../refman-5.0/metadata/se-memory.idmap \
 		../../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 		../../refman-5.0/metadata/sql-syntax-replication.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 		../../refman-5.0/metadata/stored-programs-views.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-replication-excerpt.validpure: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.titles: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.useless: $(mysql_replication_excerpt_SOURCES)

@@ -347,6 +338,7 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-5.0/metadata/apis-c.idmap \
+		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/errors-problems.idmap \
 		../../refman-5.0/metadata/extending-mysql.idmap \

@@ -354,6 +346,9 @@
 		../../refman-5.0/metadata/functions-core.idmap \
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/internationalization.idmap \
+		../../refman-5.0/metadata/mysql-cluster-backup.idmap \
+		../../refman-5.0/metadata/mysql-cluster-configuration.idmap \
+		../../refman-5.0/metadata/mysql-cluster.idmap \
 		../../refman-5.0/metadata/optimization.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-client-core.idmap \

@@ -361,6 +356,8 @@
 		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/programs.idmap \
+		../../refman-5.0/metadata/replication-configuration.idmap \
+		../../refman-5.0/metadata/replication.idmap \
 		../../refman-5.0/metadata/se-bdb-core.idmap \
 		../../refman-5.0/metadata/se-innodb-core.idmap \
 		../../refman-5.0/metadata/se-myisam-core.idmap \

@@ -371,17 +368,7 @@
 		../../refman-5.0/metadata/sql-syntax.idmap \
 		../../refman-5.0/metadata/stored-programs-views.idmap \
 	../../refman-common/metadata/apis-php.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-backup.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster-configuration.none.chapter.idmap \
-	metadata/mysql-cluster-excerpt-aspec.xml.mysql-cluster.all.preface.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.idmap \
-	metadata/mysql-replication-excerpt-aspec.xml.replication.all.preface.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -422,8 +409,7 @@
 		../../refman-5.0/metadata/installing-cs.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-server-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -466,9 +452,7 @@
 		../../refman-5.0/metadata/se-innodb-core.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -502,10 +486,7 @@
 		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -559,6 +540,7 @@
 	../../refman-5.0/images/published/mysql-es-win32-fig4.png
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
+		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/connectors-apis.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/installing-core.idmap \

@@ -569,9 +551,7 @@
 		../../refman-5.0/metadata/restrictions.idmap \
 		../../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2008-10-03 11:33:49 UTC (rev 11965)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2008-10-03 11:46:47 UTC (rev 11966)
Changed blocks: 19, Lines Added: 24, Lines Deleted: 80; 15411 bytes

@@ -9,12 +9,10 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
+		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/errors-problems-core.idmap \
 		../../refman-5.1/metadata/extending-mysql.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+		../../refman-5.1/metadata/installing-core.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -40,6 +38,7 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
+		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \

@@ -48,9 +47,7 @@
 		../../refman-5.1/metadata/replication.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 \
-	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
+		../../refman-5.1/metadata/sql-syntax-transactions.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -158,11 +155,7 @@
 	../../ndbapi/metadata/ndb-errors.idmap \
 	../../ndbapi/metadata/ndb-internals.idmap \
 	../../ndbapi/metadata/ndbapi.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source.all.preface.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-cluster-excerpt.validpure: $(mysql_cluster_excerpt_SOURCES)
 mysql-cluster-excerpt.titles: $(mysql_cluster_excerpt_SOURCES)
 mysql-cluster-excerpt.useless: $(mysql_cluster_excerpt_SOURCES)

@@ -197,11 +190,11 @@
 		../../refman-5.1/metadata/faqs.idmap \
 		../../refman-5.1/metadata/functions-core.idmap \
 		../../refman-5.1/metadata/information-schema.idmap \
+		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/internationalization.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
 		../../refman-5.1/metadata/replication-notes.idmap \
-		../../refman-5.1/metadata/sql-syntax-server-administration.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap
+		../../refman-5.1/metadata/sql-syntax-server-administration.idmap
 mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)

@@ -299,21 +292,10 @@
 		../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 		../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
+		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.installing-binary.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -338,9 +320,7 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
-		../../refman-5.1/metadata/programs-using.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
+		../../refman-5.1/metadata/programs-using.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -371,6 +351,7 @@
 		../../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/installing-core.idmap \
 		../../refman-5.1/metadata/mysql-cluster.idmap \
 		../../refman-5.1/metadata/news-5.1-core.idmap \
 		../../refman-5.1/metadata/optimization.idmap \

@@ -378,8 +359,7 @@
 		../../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-utility.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source.all.preface.idmap
+		../../refman-5.1/metadata/sql-syntax-utility.idmap
 mysql-partitioning-excerpt.validpure: $(mysql_partitioning_excerpt_SOURCES)
 mysql-partitioning-excerpt.titles: $(mysql_partitioning_excerpt_SOURCES)
 mysql-partitioning-excerpt.useless: $(mysql_partitioning_excerpt_SOURCES)

@@ -419,6 +399,7 @@
 	../../refman-5.1/../refman-common/images/published/submaster-performance.png
 mysql_replication_excerpt_SOURCES = mysql-replication-excerpt.xml $(mysql_replication_excerpt_INCLUDES)
 mysql_replication_excerpt_IDMAPS = \
+		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/data-types.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/errors-problems-core.idmap \

@@ -437,10 +418,7 @@
 		../../refman-5.1/metadata/sql-syntax-replication.idmap \
 		../../refman-5.1/metadata/sql-syntax-server-administration.idmap \
 		../../refman-5.1/metadata/stored-programs-views.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-replication-excerpt.validpure: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.titles: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.useless: $(mysql_replication_excerpt_SOURCES)

@@ -472,6 +450,7 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/apis-c.idmap \
+		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/errors-problems-core.idmap \
 		../../refman-5.1/metadata/extending-mysql.idmap \

@@ -486,6 +465,7 @@
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
+		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/programs.idmap \
 		../../refman-5.1/metadata/replication-configuration.idmap \

@@ -500,20 +480,7 @@
 		../../refman-5.1/metadata/stored-programs-views.idmap \
 	../../refman-common/metadata/apis-php.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/ha.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/ha.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -552,12 +519,8 @@
 mysql_solaris_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap
+		../../refman-5.1/metadata/programs-server-core.idmap \
+	../../refman-common/metadata/bug-reports.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -594,19 +557,11 @@
 		../../refman-5.1/metadata/optimization.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
+		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.compilation-problems.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -641,14 +596,7 @@
 		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/sql-syntax-server-administration.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -674,6 +622,7 @@
 mysql_windows_excerpt_IMAGES =
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
+		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/language-structure-core.idmap \

@@ -685,12 +634,7 @@
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.backup.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2008-10-03 11:33:49 UTC (rev 11965)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2008-10-03 11:46:47 UTC (rev 11966)
Changed blocks: 18, Lines Added: 24, Lines Deleted: 75; 15048 bytes

@@ -9,12 +9,10 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
+		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/errors-problems.idmap \
 		../../refman-6.0/metadata/extending-mysql.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+		../../refman-6.0/metadata/installing-core.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -40,6 +38,7 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
+		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \

@@ -48,9 +47,7 @@
 		../../refman-6.0/metadata/replication.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 \
-	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
+		../../refman-6.0/metadata/sql-syntax-transactions.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -87,14 +84,14 @@
 		../../refman-6.0/metadata/faqs.idmap \
 		../../refman-6.0/metadata/functions-core.idmap \
 		../../refman-6.0/metadata/information-schema.idmap \
+		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/internationalization.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
 		../../refman-6.0/metadata/replication-notes.idmap \
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../../refman-common/metadata/connector-j.idmap \
 	../../refman-common/metadata/connector-net.idmap \
-	../../refman-common/metadata/connector-odbc.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap
+	../../refman-common/metadata/connector-odbc.idmap
 mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
 mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)

@@ -191,23 +188,12 @@
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/internationalization.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
+		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 	../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.installing-binary.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -232,9 +218,7 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
-		../../refman-6.0/metadata/programs-using.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
+		../../refman-6.0/metadata/programs-using.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -265,6 +249,7 @@
 		../../refman-6.0/metadata/errors-problems.idmap \
 		../../refman-6.0/metadata/functions-core.idmap \
 		../../refman-6.0/metadata/information-schema.idmap \
+		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/optimization.idmap \
 		../../refman-6.0/metadata/partitioning.idmap \
 		../../refman-6.0/metadata/sql-syntax-data-definition.idmap \

@@ -272,8 +257,7 @@
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 		../../refman-6.0/metadata/sql-syntax-utility.idmap \
 	../../refman-5.1/metadata/mysql-cluster.idmap \
-	../../refman-5.1/metadata/news-5.1-core.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source.all.preface.idmap
+	../../refman-5.1/metadata/news-5.1-core.idmap
 mysql-partitioning-excerpt.validpure: $(mysql_partitioning_excerpt_SOURCES)
 mysql-partitioning-excerpt.titles: $(mysql_partitioning_excerpt_SOURCES)
 mysql-partitioning-excerpt.useless: $(mysql_partitioning_excerpt_SOURCES)

@@ -313,6 +297,7 @@
 	../../refman-6.0/../refman-common/images/published/submaster-performance.png
 mysql_replication_excerpt_SOURCES = mysql-replication-excerpt.xml $(mysql_replication_excerpt_INCLUDES)
 mysql_replication_excerpt_IDMAPS = \
+		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/data-types.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/errors-problems.idmap \

@@ -330,10 +315,7 @@
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 		../../refman-6.0/metadata/stored-programs-views.idmap \
 	../../refman-5.1/metadata/mysql-cluster.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-replication-excerpt.validpure: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.titles: $(mysql_replication_excerpt_SOURCES)
 mysql-replication-excerpt.useless: $(mysql_replication_excerpt_SOURCES)

@@ -365,6 +347,7 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/apis-c.idmap \
+		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/errors-problems.idmap \
 		../../refman-6.0/metadata/extending-mysql.idmap \

@@ -376,6 +359,7 @@
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
+		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/programs.idmap \
 		../../refman-6.0/metadata/replication-configuration.idmap \

@@ -393,20 +377,7 @@
 	../../refman-5.1/metadata/mysql-cluster.idmap \
 	../../refman-common/metadata/apis-php.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/ha.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/ha.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -445,12 +416,8 @@
 mysql_solaris_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap
+		../../refman-6.0/metadata/programs-server-core.idmap \
+	../../refman-common/metadata/bug-reports.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -487,19 +454,11 @@
 		../../refman-6.0/metadata/optimization.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
+		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.compilation-problems.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -531,17 +490,11 @@
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
+		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../../refman-5.1/metadata/programs-admin-util-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
-	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
-	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/bug-reports.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -567,6 +520,7 @@
 mysql_windows_excerpt_IMAGES =
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
+		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/language-structure-core.idmap \

@@ -578,12 +532,7 @@
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	../../refman-common/metadata/information-sources.idmap \
-	metadata/mysql-backup-excerpt-aspec.xml.backup.none.chapter.idmap \
-	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
-	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
-	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
+	../../refman-common/metadata/information-sources.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-common/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-common/Makefile.depends	2008-10-03 11:33:49 UTC (rev 11965)
+++ trunk/topic-guides/topics-common/Makefile.depends	2008-10-03 11:46:47 UTC (rev 11966)
Changed blocks: 4, Lines Added: 7, Lines Deleted: 4; 7392 bytes

@@ -447,6 +447,7 @@
 	../../common/phrases.ent \
 	../../dynamic-docs/faq/memcached.xml \
 	../../dynamic-docs/faq/mysql-proxy.xml \
+	../../refman-5.0/faqs.xml \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \
 	../../refman-common/../refman-common/images/published/memcached-flow.png \

@@ -470,7 +471,9 @@
 	../../refman-common/load-balancer.xml \
 	../../refman-common/mysql-proxy-core.xml \
 	../../refman-common/urls.ent \
+	/../refman-common/images/published/active-master-mysql-server.png \
 	all-entities.ent \
+	mysql-ha-scalability-aspec.xml.faqs-mysql-drbd-heartbeat.none.chapter.xml \
 	mysql-ha-scalability-aspec.xml.ha-drbd.none.chapter.xml \
 	mysql-ha-scalability-aspec.xml.ha-heartbeat.none.chapter.xml \
 	mysql-ha-scalability-aspec.xml.ha-memcached.none.chapter.xml \

@@ -491,14 +494,14 @@
 	../../refman-common/images/published/ha-heartbeat-overview.png \
 	../../refman-common/images/published/stdlb.png \
 	../../refman-common/images/published/stdrepl-style1.png \
-	../../refman-common/images/published/stdrepl-style2.png
+	../../refman-common/images/published/stdrepl-style2.png \
+	/../refman-common/images/published/active-master-mysql-server.png
 mysql_ha_scalability_SOURCES = mysql-ha-scalability.xml $(mysql_ha_scalability_INCLUDES)
 mysql_ha_scalability_IDMAPS = \
 	../../refman-4.1/metadata/installing.idmap \
 	../../refman-4.1/metadata/mysql-cluster.idmap \
 	../../refman-4.1/metadata/replication.idmap \
-	../../refman-4.1/metadata/se-innodb-core.idmap \
-	../../refman-5.0/metadata/faqs.idmap
+	../../refman-4.1/metadata/se-innodb-core.idmap
 mysql-ha-scalability.validpure: $(mysql_ha_scalability_SOURCES)
 mysql-ha-scalability.titles: $(mysql_ha_scalability_SOURCES)
 mysql-ha-scalability.useless: $(mysql_ha_scalability_SOURCES)

@@ -524,7 +527,7 @@
 	$(RM) apis-php.xml apis-php-arbitrary.xml
 	$(MAKE) apis-php.xml
 
-mysql-ha-scalability-aspec.xml.ha-drbd.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-heartbeat.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-memcached.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-overview.all.chapter.xml mysql-ha-scalability-aspec.xml.ha-vm.none.chapter.xml mysql-ha-scalability-aspec.xml.load-balancer.none.chapter.xml mysql-ha-scalability-aspec.xml.mysql-proxy.none.chapter.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/images/published/drbd-main.png ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-heartbeat.xml ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/fa!
 q/memcached.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/memcached-flow.png ../../refman-common/../refman-common/images/published/memcached-memalloc.png ../../refman-common/../refman-common/images/published/memcached-overview.png ../../refman-common/ha-memcached-core.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-vm.xml ../../refman-common/images/published/ec2fig1.png ../../refman-common/images/published/ec2fig2.png ../../refman-common/images/published/ec2fig3.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/images/published/stdlb.png ../../refman-common/images/publishe!
 d/stdrepl-style1.png ../../refman-common/images/published/stdr!
 epl-styl
e2.png ../../refman-common/load-balancer.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/faq/mysql-proxy.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/proxy-architecture.png ../../refman-common/mysql-proxy-core.xml ../../refman-common/urls.ent all-entities.ent
+mysql-ha-scalability-aspec.xml.faqs-mysql-drbd-heartbeat.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-drbd.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-heartbeat.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-memcached.none.chapter.xml mysql-ha-scalability-aspec.xml.ha-overview.all.chapter.xml mysql-ha-scalability-aspec.xml.ha-vm.none.chapter.xml mysql-ha-scalability-aspec.xml.load-balancer.none.chapter.xml mysql-ha-scalability-aspec.xml.mysql-proxy.none.chapter.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.0/faqs.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent /../refman-common/images/published/active-master-mysql-server.png all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/images/published/drbd-main.png ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/urls.ent all-entities.ent ../../co!
 mmon/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-heartbeat.xml ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/faq/memcached.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/memcached-flow.png ../../refman-common/../refman-common/images/published/memcached-memalloc.png ../../refman-common/../refman-common/images/published/memcached-overview.png ../../refman-common/ha-memcached-core.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-vm.xml ../../refman-common/images/published/ec2fig1.png ../../refman-c!
 ommon/images/published/ec2fig2.png ../../refman-common/images/!
 publishe
d/ec2fig3.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/images/published/stdlb.png ../../refman-common/images/published/stdrepl-style1.png ../../refman-common/images/published/stdrepl-style2.png ../../refman-common/load-balancer.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../dynamic-docs/faq/mysql-proxy.xml ../../refman-5.1/versions.ent ../../refman-common/../refman-common/images/published/proxy-architecture.png ../../refman-common/mysql-proxy-core.xml ../../refman-common/urls.ent all-entities.ent
 	$(RM) mysql-ha-scalability.xml mysql-ha-scalability-arbitrary.xml
 	$(MAKE) mysql-ha-scalability.xml
 


Thread
svn commit - mysqldoc@docsrva: r11966 - in trunk/topic-guides: topics-5.0 topics-5.1 topics-6.0 topics-commonmartin.brown3 Oct