svn commit - mysqldoc@docsrva: r6776 - in trunk: . administrator cy/query-browser guibook mysqlqb ndbapi query-browser refman-4.1 refman-5.0 refman-5....

[paul]

Author: paul
Date: 2007-06-13 01:55:46 +0200 (Wed, 13 Jun 2007)
New Revision: 6776

Log:
 r21491@frost:  paul | 2007-06-12 18:54:21 -0500
 Fix dependencies.


Modified:
   trunk/administrator/Makefile.depends
   trunk/cy/query-browser/Makefile.depends
   trunk/guibook/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/ndbapi/Makefile.depends
   trunk/query-browser/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.2/Makefile.depends
   trunk/refman-common/Makefile.depends
   trunk/ro/administrator/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26211
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21479
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:26211
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:21491
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17792


Modified: trunk/administrator/Makefile.depends
===================================================================
--- trunk/administrator/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/administrator/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3305 bytes

@@ -85,7 +85,7 @@
 administrator_SOURCES = administrator.xml $(administrator_INCLUDES)
 administrator_IDMAPS = \
 	../refman-5.1/metadata/client-utility-programs.idmap \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems.idmap \
 	../refman-5.1/metadata/installing.idmap \
 	../refman-5.1/metadata/optimization.idmap \

@@ -152,7 +152,7 @@
 chapter_options_administrator_IMAGES =
 chapter_options_administrator_SOURCES = chapter-options-administrator.xml
$(chapter_options_administrator_INCLUDES)
 chapter_options_administrator_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	metadata/backup.idmap \
 	metadata/health.idmap \
 	metadata/user-administration.idmap

@@ -181,7 +181,7 @@
 	../gui-common/metadata/appendix-connection-storage.idmap \
 	../gui-common/metadata/chapter-options-connections.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	metadata/main-window.idmap \
 	metadata/server-logs.idmap \
 	metadata/service-control.idmap \

@@ -217,7 +217,7 @@
 	images/graph-settings.png
 health_SOURCES = health.xml $(health_INCLUDES)
 health_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/server-connections.idmap \

@@ -341,7 +341,7 @@
 server_connections_IMAGES =
 server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES)
 server_connections_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/user-administration.idmap
 server-connections.validpure: $(server_connections_SOURCES)

@@ -378,7 +378,7 @@
 	images/server-logs-general-log.png
 server_logs_SOURCES = server-logs.xml $(server_logs_INCLUDES)
 server_logs_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	metadata/startup-variables.idmap
 server-logs.validpure: $(server_logs_SOURCES)
 server-logs.titles: $(server_logs_SOURCES)

@@ -396,7 +396,7 @@
 service_control_IMAGES =
 service_control_SOURCES = service-control.xml $(service_control_INCLUDES)
 service_control_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/installing.idmap \
 	../refman-5.1/metadata/storage-engines.idmap \
 	metadata/connection-dialog.idmap

@@ -457,7 +457,7 @@
 	images/user-information.png
 user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES)
 user_administration_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	metadata/chapter-options-administrator.idmap \
 	metadata/main-window.idmap
 user-administration.validpure: $(user_administration_SOURCES)


Modified: trunk/cy/query-browser/Makefile.depends
===================================================================
--- trunk/cy/query-browser/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/cy/query-browser/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 644 bytes

@@ -195,7 +195,7 @@
 	images/twosakilas.png
 query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES)
 query_browser_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../../refman-5.1/metadata/se-innodb.idmap \
 	../../refman-5.1/metadata/se-merge.idmap \
 	../../refman-5.1/metadata/se-myisam.idmap \


Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/guibook/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 622 bytes

@@ -212,7 +212,7 @@
 guibook_SOURCES = guibook.xml $(guibook_INCLUDES)
 guibook_IDMAPS = \
 	../refman-5.1/metadata/client-utility-programs.idmap \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems.idmap \
 	../refman-5.1/metadata/installing.idmap \
 	../refman-5.1/metadata/optimization.idmap \


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/mysqlqb/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 5, Lines Added: 7, Lines Deleted: 13; 3726 bytes

@@ -14,10 +14,9 @@
 	../refman-5.0/metadata/charset.idmap \
 	../refman-5.0/metadata/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../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/functions-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/introduction.idmap \

@@ -37,15 +36,13 @@
 	../refman-5.0/metadata/se-merge.idmap \
 	../refman-5.0/metadata/se-myisam.idmap \
 	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/sql-syntax.idmap \
 	../refman-5.0/metadata/storage-engines.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \
 	../refman-5.0/metadata/triggers.idmap \
 	../refman-5.0/metadata/tutorial.idmap \
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	../refman-common/metadata/credits.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)

@@ -67,19 +64,17 @@
 	../refman-5.0/metadata/apis-c.idmap \
 	../refman-5.0/metadata/charset.idmap \
 	../refman-5.0/metadata/data-types.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../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/functions-core.idmap \
 	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/language-structure.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-5.0/metadata/precision-math.idmap \
-	../refman-5.0/metadata/sql-syntax.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \
 	../refman-5.0/metadata/tutorial.idmap \
 	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	metadata/mysqlqb_statements.idmap
 mysqlqb_functions.validpure: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.titles: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.useless: $(mysqlqb_functions_SOURCES)

@@ -103,10 +98,9 @@
 	../refman-5.0/metadata/charset.idmap \
 	../refman-5.0/metadata/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../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/functions-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/introduction.idmap \

@@ -125,13 +119,13 @@
 	../refman-5.0/metadata/se-merge.idmap \
 	../refman-5.0/metadata/se-myisam.idmap \
 	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/sql-syntax.idmap \
 	../refman-5.0/metadata/storage-engines.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \
 	../refman-5.0/metadata/triggers.idmap \
 	../refman-5.0/metadata/tutorial.idmap \
 	../refman-5.0/metadata/views.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/mysqlqb_functions.idmap
 mysqlqb_statements.validpure: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.titles: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.useless: $(mysqlqb_statements_SOURCES)


Modified: trunk/ndbapi/Makefile.depends
===================================================================
--- trunk/ndbapi/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/ndbapi/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 888 bytes

@@ -22,7 +22,7 @@
 	images/NdbError-struct.png
 errors_SOURCES = errors.xml $(errors_INCLUDES)
 errors_IDMAPS = \
-	../refman-5.1/metadata/error-handling.idmap \
+	../refman-5.1/metadata/errors-problems.idmap \
 	metadata/mgm-api.idmap
 errors.validpure: $(errors_SOURCES)
 errors.titles: $(errors_SOURCES)

@@ -305,7 +305,7 @@
 ndbapi_IDMAPS = \
 	../refman-5.1/metadata/apis-c.idmap \
 	../refman-5.1/metadata/data-types.idmap \
-	../refman-5.1/metadata/error-handling.idmap \
+	../refman-5.1/metadata/errors-problems.idmap \
 	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \


Modified: trunk/query-browser/Makefile.depends
===================================================================
--- trunk/query-browser/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/query-browser/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 620 bytes

@@ -195,7 +195,7 @@
 	images/twosakilas.png
 query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES)
 query_browser_IDMAPS = \
-	../refman-5.1/metadata/database-administration.idmap \
+	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/se-innodb.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/refman-4.1/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 25, Lines Added: 27, Lines Deleted: 41; 8420 bytes

@@ -7,13 +7,13 @@
 apis_c_IMAGES =
 apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
 apis_c_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \

@@ -37,13 +37,12 @@
 apis_IMAGES =
 apis_SOURCES = apis.xml $(apis_INCLUDES)
 apis_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \

@@ -69,7 +68,7 @@
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/sql-syntax.idmap

@@ -94,7 +93,7 @@
 	../refman-5.0/metadata/information-schema.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/optimization.idmap \
 	metadata/replication.idmap \

@@ -235,11 +234,7 @@
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/sql-syntax.idmap

@@ -276,7 +271,7 @@
 data_types_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \

@@ -309,7 +304,6 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -346,7 +340,7 @@
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -403,7 +397,7 @@
 errors_problems_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/installing.idmap \
 	metadata/mysql-cluster.idmap \

@@ -434,7 +428,7 @@
 extending_mysql_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/language-structure.idmap \
 	metadata/se-innodb.idmap

@@ -463,7 +457,6 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -514,7 +507,7 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \

@@ -554,7 +547,7 @@
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/introduction.idmap \

@@ -766,13 +759,7 @@
 	../refman-5.0/metadata/stored-procedures.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
-	metadata/error-handling.idmap \
 	metadata/functions-core.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)

@@ -810,7 +797,7 @@
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/news-cluster.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \

@@ -834,7 +821,7 @@
 news_3_23_SOURCES = news-3.23.xml $(news_3_23_INCLUDES)
 news_3_23_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/optimization.idmap \
 	metadata/se-innodb.idmap \

@@ -861,7 +848,7 @@
 	metadata/apis.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -894,7 +881,7 @@
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -954,7 +941,7 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -1003,8 +990,7 @@
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \

@@ -1086,7 +1072,7 @@
 se_innodb_IMAGES =
 se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
 se_innodb_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
 	metadata/sql-syntax.idmap \

@@ -1135,7 +1121,7 @@
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -1171,7 +1157,7 @@
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
 	metadata/mysql-cluster.idmap \

@@ -1201,7 +1187,7 @@
 tutorial_IDMAPS = \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \

@@ -1229,7 +1215,7 @@
 using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/mysql-cluster.idmap
 using-mysql-programs.validpure: $(using_mysql_programs_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/refman-5.0/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 35, Lines Added: 39, Lines Deleted: 57; 11771 bytes

@@ -7,13 +7,13 @@
 apis_c_IMAGES =
 apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
 apis_c_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \

@@ -37,13 +37,12 @@
 apis_IMAGES =
 apis_SOURCES = apis.xml $(apis_INCLUDES)
 apis_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing-cs.idmap \

@@ -69,7 +68,7 @@
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \

@@ -94,7 +93,7 @@
 client_utility_programs_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
 	metadata/optimization.idmap \

@@ -142,7 +141,7 @@
 config_wizard_SOURCES = config-wizard.xml $(config_wizard_INCLUDES)
 config_wizard_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap
+	metadata/dba-core.idmap
 config-wizard.validpure: $(config_wizard_SOURCES)
 config-wizard.titles: $(config_wizard_SOURCES)
 config-wizard.useless: $(config_wizard_SOURCES)

@@ -276,12 +275,7 @@
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/connector-vstudioplugin.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/sql-syntax.idmap \

@@ -319,7 +313,7 @@
 data_types_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \

@@ -354,7 +348,6 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -395,7 +388,7 @@
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -454,7 +447,7 @@
 errors_problems_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/installing-cs.idmap \
 	metadata/mysql-cluster.idmap \

@@ -485,7 +478,7 @@
 extending_mysql_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/language-structure.idmap \
 	metadata/se-innodb.idmap \

@@ -512,15 +505,15 @@
 	../refman-common/images/drbd-availability-comparison.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-mxj.idmap \
+	../refman-common/metadata/connector-net.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/information-schema.idmap \

@@ -555,7 +548,7 @@
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
 	metadata/charset.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/triggers.idmap \

@@ -586,7 +579,6 @@
 	metadata/config-wizard.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -660,7 +652,7 @@
 installing_es_SOURCES = installing-es.xml $(installing_es_INCLUDES)
 installing_es_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/news.idmap \
 	metadata/releasenotes-es.idmap

@@ -746,7 +738,6 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -803,7 +794,7 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
 	metadata/functions-core.idmap \

@@ -848,7 +839,7 @@
 	metadata/apis-c.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/introduction.idmap \

@@ -1117,14 +1108,7 @@
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/connector-vstudioplugin.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
-	metadata/error-handling.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing-outline.idmap
 manual.validpure: $(manual_SOURCES)

@@ -1161,7 +1145,7 @@
 mysql_cluster_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-outline.idmap \

@@ -1189,7 +1173,7 @@
 	metadata/apis-c.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -1240,7 +1224,7 @@
 	metadata/apis-c.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -1279,7 +1263,6 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -1315,7 +1298,7 @@
 precision_math_IMAGES =
 precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
 precision_math_IDMAPS = \
-	metadata/database-administration.idmap
+	metadata/dba-core.idmap
 precision-math.validpure: $(precision_math_SOURCES)
 precision-math.titles: $(precision_math_SOURCES)
 precision-math.useless: $(precision_math_SOURCES)

@@ -1441,8 +1424,7 @@
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \

@@ -1534,7 +1516,7 @@
 se_bdb_IMAGES =
 se_bdb_SOURCES = se-bdb.xml $(se_bdb_INCLUDES)
 se_bdb_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/sql-syntax.idmap
 se-bdb.validpure: $(se_bdb_SOURCES)

@@ -1632,7 +1614,7 @@
 se_innodb_IDMAPS = \
 	metadata/config-wizard.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/news-5.0.idmap \
 	metadata/sql-syntax.idmap \

@@ -1656,7 +1638,7 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/optimization.idmap \
 	metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)

@@ -1700,7 +1682,7 @@
 se_myisam_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing-cs.idmap \
 	metadata/optimization.idmap \

@@ -1749,7 +1731,7 @@
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -1810,7 +1792,7 @@
 	metadata/client-utility-programs.idmap \
 	metadata/config-wizard.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
 	metadata/installing-cs.idmap \

@@ -1841,7 +1823,7 @@
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
 	metadata/apis-c.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs.idmap \
 	metadata/functions-core.idmap \

@@ -1891,7 +1873,7 @@
 tutorial_IDMAPS = \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing-outline.idmap \

@@ -1921,7 +1903,7 @@
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
 	metadata/config-wizard.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-outline.idmap \
 	metadata/mysql-cluster.idmap

@@ -1943,7 +1925,7 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
 	metadata/restrictions.idmap \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/refman-5.1/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 35, Lines Added: 39, Lines Deleted: 57; 12340 bytes

@@ -7,14 +7,14 @@
 apis_c_IMAGES =
 apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
 apis_c_IDMAPS = \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis-libmysqld.idmap \
 	metadata/apis-progutils.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \

@@ -216,7 +216,7 @@
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \

@@ -241,7 +241,7 @@
 client_utility_programs_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/apis-progutils.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing.idmap \

@@ -385,12 +385,7 @@
 	metadata/apis-php.idmap \
 	metadata/apis.idmap \
 	metadata/charset.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/connector-vstudioplugin.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/sql-syntax.idmap \

@@ -428,7 +423,7 @@
 data_types_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \

@@ -479,7 +474,6 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \

@@ -524,7 +518,7 @@
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \

@@ -583,7 +577,7 @@
 errors_problems_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/installing.idmap \
 	metadata/mysql-cluster.idmap \

@@ -641,7 +635,7 @@
 extending_mysql_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \
 	metadata/language-structure.idmap \

@@ -669,15 +663,16 @@
 	../refman-common/images/drbd-availability-comparison.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
+	../falcon/metadata/se-falcon.idmap \
+	../refman-common/metadata/connector-j.idmap \
+	../refman-common/metadata/connector-mxj.idmap \
+	../refman-common/metadata/connector-net.idmap \
+	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-php.idmap \
 	metadata/charset.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/information-schema.idmap \

@@ -686,7 +681,6 @@
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-archive.idmap \
-	metadata/se-falcon.idmap \
 	metadata/se-federated.idmap \
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \

@@ -713,7 +707,7 @@
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
 	metadata/charset.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/faqs.idmap \
 	metadata/mysql-cluster.idmap \

@@ -747,7 +741,6 @@
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -796,7 +789,7 @@
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \

@@ -842,7 +835,7 @@
 	metadata/apis-perl.idmap \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/introduction.idmap \

@@ -1101,22 +1094,15 @@
 	images/rolling-restarts.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
+	../falcon/metadata/se-falcon.idmap \
 	../ndbapi/metadata/errors.idmap \
 	../ndbapi/metadata/mgm-api.idmap \
 	../ndbapi/metadata/ndb-classes.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	metadata/connector-j.idmap \
-	metadata/connector-mxj.idmap \
-	metadata/connector-net.idmap \
-	metadata/connector-odbc.idmap \
-	metadata/connector-vstudioplugin.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
 	metadata/functions-core.idmap \
-	metadata/replication-topology.idmap \
-	metadata/se-falcon.idmap
+	metadata/replication-topology.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1162,7 +1148,7 @@
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing.idmap \

@@ -1193,7 +1179,6 @@
 news_5_1_IDMAPS = \
 	../ndbapi/metadata/mgm-api.idmap \
 	../ndbapi/metadata/ndb-classes.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \

@@ -1256,7 +1241,6 @@
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \

@@ -1293,7 +1277,7 @@
 partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
 partitioning_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \

@@ -1320,7 +1304,7 @@
 precision_math_IMAGES =
 precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
 precision_math_IDMAPS = \
-	metadata/database-administration.idmap
+	metadata/dba-core.idmap
 precision-math.validpure: $(precision_math_SOURCES)
 precision-math.titles: $(precision_math_SOURCES)
 precision-math.useless: $(precision_math_SOURCES)

@@ -1357,8 +1341,7 @@
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml
$(replication_configuration_INCLUDES)
 replication_configuration_IDMAPS = \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/replication-implementation.idmap \

@@ -1382,7 +1365,7 @@
 replication_implementation_IMAGES =
 replication_implementation_SOURCES = replication-implementation.xml
$(replication_implementation_INCLUDES)
 replication_implementation_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
 	metadata/sql-syntax.idmap

@@ -1405,7 +1388,7 @@
 replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
 replication_notes_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \

@@ -1445,7 +1428,7 @@
 replication_solutions_SOURCES = replication-solutions.xml
$(replication_solutions_INCLUDES)
 replication_solutions_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/sql-syntax.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)

@@ -1482,8 +1465,7 @@
 replication_IDMAPS = \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
-	metadata/error-handling.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \

@@ -1654,7 +1636,7 @@
 se_innodb_IMAGES =
 se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
 se_innodb_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
 	metadata/sql-syntax.idmap \

@@ -1678,7 +1660,7 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/optimization.idmap \
 	metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)

@@ -1722,7 +1704,7 @@
 se_myisam_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
 	metadata/optimization.idmap \

@@ -1771,7 +1753,7 @@
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \

@@ -1836,7 +1818,7 @@
 storage_engines_IDMAPS = \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
 	metadata/installing.idmap \

@@ -1867,7 +1849,7 @@
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
 	metadata/apis-c.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs.idmap \
 	metadata/functions-core.idmap \

@@ -1918,7 +1900,7 @@
 tutorial_IDMAPS = \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \

@@ -1947,7 +1929,7 @@
 using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/mysql-cluster.idmap
 using-mysql-programs.validpure: $(using_mysql_programs_SOURCES)

@@ -1968,7 +1950,7 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/database-administration.idmap \
+	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
 	metadata/restrictions.idmap \


Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/refman-5.2/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 2; 1567 bytes

@@ -465,6 +465,7 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
+	../refman-5.0/metadata/replication.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \

@@ -663,7 +664,7 @@
 	../refman-common/images/drbd-availability-comparison.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
-	../refman-5.1/metadata/se-falcon.idmap \
+	../falcon/metadata/se-falcon.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-mxj.idmap \
 	../refman-common/metadata/connector-net.idmap \

@@ -1092,13 +1093,14 @@
 	images/rolling-restarts.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
+	../falcon/metadata/se-falcon.idmap \
 	../ndbapi/metadata/errors.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
 	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/replication.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/news-5.1.idmap \
-	../refman-5.1/metadata/se-falcon.idmap \
 	../refman-common/metadata/gpl-license.idmap \
 	metadata/functions-core.idmap \
 	metadata/replication-topology.idmap


Modified: trunk/refman-common/Makefile.depends
===================================================================
--- trunk/refman-common/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/refman-common/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1321 bytes

@@ -8,7 +8,7 @@
 connector_j_SOURCES = connector-j.xml $(connector_j_INCLUDES)
 connector_j_IDMAPS = \
 	../refman-5.0/metadata/charset.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/sql-syntax.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \

@@ -61,7 +61,7 @@
 connector_net_IDMAPS = \
 	../refman-5.0/metadata/apis.idmap \
 	../refman-5.0/metadata/connectors.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
 	metadata/bug-reports.idmap \
 	metadata/connector-vstudioplugin.idmap \
 	metadata/news-connector-net.idmap

@@ -163,7 +163,7 @@
 connector_odbc_IDMAPS = \
 	../refman-5.0/metadata/apis-c.idmap \
 	../refman-5.0/metadata/charset.idmap \
-	../refman-5.0/metadata/database-administration.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/functions-core.idmap \
 	metadata/information-sources.idmap \


Modified: trunk/ro/administrator/Makefile.depends
===================================================================
--- trunk/ro/administrator/Makefile.depends	2007-06-12 22:30:07 UTC (rev 6775)
+++ trunk/ro/administrator/Makefile.depends	2007-06-12 23:55:46 UTC (rev 6776)
Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3427 bytes

@@ -83,7 +83,7 @@
 administrator_SOURCES = administrator.xml $(administrator_INCLUDES)
 administrator_IDMAPS = \
 	../../refman-5.1/metadata/client-utility-programs.idmap \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../../refman-5.1/metadata/errors-problems.idmap \
 	../../refman-5.1/metadata/installing.idmap \
 	../../refman-5.1/metadata/optimization.idmap \

@@ -149,7 +149,7 @@
 chapter_options_administrator_IMAGES =
 chapter_options_administrator_SOURCES = chapter-options-administrator.xml
$(chapter_options_administrator_INCLUDES)
 chapter_options_administrator_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	metadata/backup.idmap \
 	metadata/health.idmap \
 	metadata/user-administration.idmap

@@ -175,7 +175,7 @@
 	images/connection.png
 connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES)
 connection_dialog_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../gui-common/metadata/appendix-connection-storage.idmap \
 	../gui-common/metadata/chapter-options-connections.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \

@@ -213,7 +213,7 @@
 	images/graph-settings.png
 health_SOURCES = health.xml $(health_INCLUDES)
 health_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../../refman-5.1/metadata/errors-problems.idmap \
 	../../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/server-connections.idmap \

@@ -337,7 +337,7 @@
 server_connections_IMAGES =
 server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES)
 server_connections_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/user-administration.idmap
 server-connections.validpure: $(server_connections_SOURCES)

@@ -374,7 +374,7 @@
 	images/server-logs-general-log.png
 server_logs_SOURCES = server-logs.xml $(server_logs_INCLUDES)
 server_logs_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	metadata/startup-variables.idmap
 server-logs.validpure: $(server_logs_SOURCES)
 server-logs.titles: $(server_logs_SOURCES)

@@ -392,7 +392,7 @@
 service_control_IMAGES =
 service_control_SOURCES = service-control.xml $(service_control_INCLUDES)
 service_control_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	../../refman-5.1/metadata/installing.idmap \
 	../../refman-5.1/metadata/storage-engines.idmap \
 	metadata/connection-dialog.idmap

@@ -453,7 +453,7 @@
 	images/user-information.png
 user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES)
 user_administration_IDMAPS = \
-	../../refman-5.1/metadata/database-administration.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	metadata/chapter-options-administrator.idmap \
 	metadata/main-window.idmap
 user-administration.validpure: $(user_administration_SOURCES)