List:Commits« Previous MessageNext Message »
From:paul Date:May 25 2007 3:06pm
Subject:svn commit - mysqldoc@docsrva: r6574 - in trunk: . administrator falcon guibook migration-toolkit mysqldoc-guide mysqlqb mysqltest ndbapi query-browse...
View as plain text  
Author: paul
Date: 2007-05-25 17:06:24 +0200 (Fri, 25 May 2007)
New Revision: 6574

Log:
 r20626@frost:  paul | 2007-05-25 17:05:53 +0200
 Fix up remaining paths per ro moving.
 Regenerate dependencies.


Modified:
   trunk/Makefile
   trunk/administrator/Makefile.depends
   trunk/falcon/Makefile.depends
   trunk/guibook/Makefile.depends
   trunk/migration-toolkit/Makefile.depends
   trunk/mysqldoc-guide/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/mysqltest/Makefile.depends
   trunk/ndbapi/Makefile.depends
   trunk/query-browser-cy/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-common/Makefile.depends
   trunk/ro/administrator/Makefile
   trunk/ro/administrator/Makefile.depends
   trunk/ro/gui-common/Makefile
   trunk/workbench/Makefile.depends

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


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/Makefile	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 689 bytes

@@ -4,13 +4,14 @@
 
 # Set list of subdirectories
 
-SUBDIRS = administrator administrator-ro \
+SUBDIRS = administrator \
 	dynamic-docs falcon \
-	gui-common gui-common-cy gui-common-ro guibook \
+	gui-common gui-common-cy guibook \
 	internals migration-toolkit mysqldoc-guide \
 	mysqlqb mysqltest ndbapi proto-doc \
 	query-browser query-browser-cy \
 	refman-4.1 refman-5.0 refman-5.1 refman-common \
+	ro/administrator ro/gui-common \
 	sample-data/world sample-data/sakila userguide workbench
 
 all:


Modified: trunk/administrator/Makefile.depends
===================================================================
--- trunk/administrator/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/administrator/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 10, Lines Added: 39, Lines Deleted: 39; 7035 bytes

@@ -84,18 +84,18 @@
 	images/user-information.png
 administrator_SOURCES = administrator.xml $(administrator_INCLUDES)
 administrator_IDMAPS = \
-	../refman-5.1/metadata/installing.idmap \
+	../refman-5.1/metadata/client-utility-programs.idmap \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems.idmap \
-	../refman-5.1/metadata/using-mysql-programs.idmap \
+	../refman-5.1/metadata/installing.idmap \
 	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/storage-engines.idmap \
-	../refman-5.1/metadata/client-utility-programs.idmap \
+	../refman-5.1/metadata/replication-configuration.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap
+	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/using-mysql-programs.idmap \
+	../refman-common/metadata/bug-reports.idmap
 administrator.validpure: $(administrator_SOURCES)
 administrator.titles: $(administrator_SOURCES)
 administrator.useless: $(administrator_SOURCES)

@@ -112,10 +112,10 @@
 backup_IMAGES =
 backup_SOURCES = backup.xml $(backup_INCLUDES)
 backup_IDMAPS = \
-	metadata/main-window.idmap \
 	../refman-5.1/metadata/client-utility-programs.idmap \
+	metadata/chapter-options-administrator.idmap \
 	metadata/connection-dialog.idmap \
-	metadata/chapter-options-administrator.idmap
+	metadata/main-window.idmap
 backup.validpure: $(backup_SOURCES)
 backup.titles: $(backup_SOURCES)
 backup.useless: $(backup_SOURCES)

@@ -132,10 +132,10 @@
 catalogs_IMAGES =
 catalogs_SOURCES = catalogs.xml $(catalogs_INCLUDES)
 catalogs_IDMAPS = \
-	metadata/main-window.idmap \
+	../gui-common/metadata/chapter-table-editor.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap
+	metadata/main-window.idmap
 catalogs.validpure: $(catalogs_SOURCES)
 catalogs.titles: $(catalogs_SOURCES)
 catalogs.useless: $(catalogs_SOURCES)

@@ -153,9 +153,9 @@
 chapter_options_administrator_SOURCES = chapter-options-administrator.xml $(chapter_options_administrator_INCLUDES)
 chapter_options_administrator_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
+	metadata/backup.idmap \
 	metadata/health.idmap \
-	metadata/user-administration.idmap \
-	metadata/backup.idmap
+	metadata/user-administration.idmap
 chapter-options-administrator.validpure: $(chapter_options_administrator_SOURCES)
 chapter-options-administrator.titles: $(chapter_options_administrator_SOURCES)
 chapter-options-administrator.useless: $(chapter_options_administrator_SOURCES)

@@ -178,14 +178,14 @@
 	images/connection.png
 connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES)
 connection_dialog_IDMAPS = \
+	../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/dba-core.idmap \
+	metadata/main-window.idmap \
 	metadata/server-logs.idmap \
-	metadata/startup-variables.idmap \
-	metadata/main-window.idmap \
-	../gui-common/metadata/chapter-options-connections.idmap \
-	../gui-common/metadata/chapter-options-general.idmap \
-	../gui-common/metadata/appendix-connection-storage.idmap \
-	metadata/service-control.idmap
+	metadata/service-control.idmap \
+	metadata/startup-variables.idmap
 connection-dialog.validpure: $(connection_dialog_SOURCES)
 connection-dialog.titles: $(connection_dialog_SOURCES)
 connection-dialog.useless: $(connection_dialog_SOURCES)

@@ -219,9 +219,9 @@
 health_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
 	../refman-5.1/metadata/errors-problems.idmap \
-	metadata/startup-variables.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/server-connections.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap
+	metadata/startup-variables.idmap
 health.validpure: $(health_SOURCES)
 health.titles: $(health_SOURCES)
 health.useless: $(health_SOURCES)

@@ -273,20 +273,20 @@
 	images/marked-area.png
 main_window_SOURCES = main-window.xml $(main_window_INCLUDES)
 main_window_IDMAPS = \
-	metadata/server-logs.idmap \
+	../gui-common/metadata/chapter-options-connections.idmap \
+	metadata/administrator.idmap \
+	metadata/backup.idmap \
+	metadata/catalogs.idmap \
+	metadata/connection-dialog.idmap \
 	metadata/health.idmap \
-	metadata/startup-variables.idmap \
+	metadata/replication-status.idmap \
 	metadata/restore.idmap \
+	metadata/server-connections.idmap \
 	metadata/server-information.idmap \
-	metadata/replication-status.idmap \
-	../gui-common/metadata/chapter-options-connections.idmap \
-	metadata/server-connections.idmap \
-	metadata/connection-dialog.idmap \
-	metadata/catalogs.idmap \
-	metadata/administrator.idmap \
-	metadata/user-administration.idmap \
-	metadata/backup.idmap \
-	metadata/service-control.idmap
+	metadata/server-logs.idmap \
+	metadata/service-control.idmap \
+	metadata/startup-variables.idmap \
+	metadata/user-administration.idmap
 main-window.validpure: $(main_window_SOURCES)
 main-window.titles: $(main_window_SOURCES)
 main-window.useless: $(main_window_SOURCES)

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

@@ -458,8 +458,8 @@
 user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES)
 user_administration_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
-	metadata/main-window.idmap \
-	metadata/chapter-options-administrator.idmap
+	metadata/chapter-options-administrator.idmap \
+	metadata/main-window.idmap
 user-administration.validpure: $(user_administration_SOURCES)
 user-administration.titles: $(user_administration_SOURCES)
 user-administration.useless: $(user_administration_SOURCES)

@@ -476,11 +476,11 @@
 xml_files_IMAGES =
 xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES)
 xml_files_IDMAPS = \
-	metadata/health.idmap \
+	../gui-common/metadata/appendix-connection-storage.idmap \
+	../gui-common/metadata/appendix-translator-notes.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \
-	../gui-common/metadata/appendix-translator-notes.idmap \
-	../gui-common/metadata/appendix-connection-storage.idmap \
-	metadata/administrator.idmap
+	metadata/administrator.idmap \
+	metadata/health.idmap
 xml-files.validpure: $(xml_files_SOURCES)
 xml-files.titles: $(xml_files_SOURCES)
 xml-files.useless: $(xml_files_SOURCES)


Modified: trunk/falcon/Makefile.depends
===================================================================
--- trunk/falcon/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/falcon/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1308 bytes

@@ -26,10 +26,10 @@
 falcon_overview_SOURCES = falcon-overview.xml $(falcon_overview_INCLUDES)
 falcon_overview_IDMAPS = \
 	../query-browser/metadata/query-browser.idmap \
-	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/manual.idmap \
 	../refman-5.1/metadata/se-innodb.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-5.1/metadata/manual.idmap
+	../refman-5.1/metadata/storage-engines.idmap
 falcon-overview.validpure: $(falcon_overview_SOURCES)
 falcon-overview.titles: $(falcon_overview_SOURCES)
 falcon-overview.useless: $(falcon_overview_SOURCES)

@@ -73,10 +73,10 @@
 falcon_IDMAPS = \
 	../query-browser/metadata/query-browser.idmap \
 	../refman-5.1/metadata/installing.idmap \
-	../refman-5.1/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/manual.idmap \
 	../refman-5.1/metadata/se-innodb.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-5.1/metadata/manual.idmap
+	../refman-5.1/metadata/storage-engines.idmap
 falcon.validpure: $(falcon_SOURCES)
 falcon.titles: $(falcon_SOURCES)
 falcon.useless: $(falcon_SOURCES)


Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/guibook/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 9; 1568 bytes

@@ -211,20 +211,20 @@
 	../workbench/images/workbench-windows.png
 guibook_SOURCES = guibook.xml $(guibook_INCLUDES)
 guibook_IDMAPS = \
-	../refman-5.1/metadata/installing.idmap \
+	../refman-5.1/metadata/client-utility-programs.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 \
+	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/se-innodb.idmap \
-	../userguide/metadata/basic-administration.idmap \
-	../userguide/metadata/storage-engines.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
 	../refman-5.1/metadata/using-mysql-programs.idmap \
-	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/client-utility-programs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-5.1/metadata/se-merge.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap
+	../userguide/metadata/basic-administration.idmap \
+	../userguide/metadata/storage-engines.idmap
 guibook.validpure: $(guibook_SOURCES)
 guibook.titles: $(guibook_SOURCES)
 guibook.useless: $(guibook_SOURCES)


Modified: trunk/migration-toolkit/Makefile.depends
===================================================================
--- trunk/migration-toolkit/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/migration-toolkit/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 658 bytes

@@ -119,9 +119,9 @@
 	images/welcome-screen.png
 indepth_SOURCES = indepth.xml $(indepth_INCLUDES)
 indepth_IDMAPS = \
+	metadata/accessprep.idmap \
 	metadata/introduction.idmap \
-	metadata/scripted-migration.idmap \
-	metadata/accessprep.idmap
+	metadata/scripted-migration.idmap
 indepth.validpure: $(indepth_SOURCES)
 indepth.titles: $(indepth_SOURCES)
 indepth.useless: $(indepth_SOURCES)


Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/mysqldoc-guide/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 663 bytes

@@ -55,8 +55,8 @@
 mysqldoc_guide_IMAGES =
 mysqldoc_guide_SOURCES = mysqldoc-guide.xml $(mysqldoc_guide_INCLUDES)
 mysqldoc_guide_IDMAPS = \
-	metadata/writing.de.idmap \
-	metadata/tools.de.idmap
+	metadata/tools.de.idmap \
+	metadata/writing.de.idmap
 mysqldoc-guide.validpure: $(mysqldoc_guide_SOURCES)
 mysqldoc-guide.titles: $(mysqldoc_guide_SOURCES)
 mysqldoc-guide.useless: $(mysqldoc_guide_SOURCES)


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/mysqlqb/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 3, Lines Added: 62, Lines Deleted: 56; 7474 bytes

@@ -9,40 +9,43 @@
 mysqlqb_IMAGES =
 mysqlqb_SOURCES = mysqlqb.xml $(mysqlqb_INCLUDES)
 mysqlqb_IDMAPS = \
-	../refman-5.0/metadata/precision-math.idmap \
+	../refman-5.0/metadata/apis-c.idmap \
+	../refman-5.0/metadata/apis.idmap \
 	../refman-5.0/metadata/charset.idmap \
-	../refman-5.0/metadata/restrictions.idmap \
+	../refman-5.0/metadata/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
-	../refman-5.0/metadata/se-example.idmap \
-	../refman-5.0/metadata/storage-engines.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 \
+	../refman-5.0/metadata/language-structure.idmap \
+	../refman-5.0/metadata/mysql-cluster.idmap \
+	../refman-5.0/metadata/optimization.idmap \
+	../refman-5.0/metadata/precision-math.idmap \
 	../refman-5.0/metadata/replication.idmap \
-	../refman-5.0/metadata/mysql-cluster.idmap \
+	../refman-5.0/metadata/restrictions.idmap \
+	../refman-5.0/metadata/se-archive.idmap \
 	../refman-5.0/metadata/se-bdb.idmap \
-	../refman-5.0/metadata/optimization.idmap \
-	../refman-5.0/metadata/apis-c.idmap \
-	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/introduction.idmap \
+	../refman-5.0/metadata/se-csv.idmap \
+	../refman-5.0/metadata/se-example.idmap \
+	../refman-5.0/metadata/se-federated.idmap \
 	../refman-5.0/metadata/se-innodb.idmap \
-	../refman-5.0/metadata/tutorial.idmap \
-	../refman-5.0/metadata/se-federated.idmap \
 	../refman-5.0/metadata/se-memory.idmap \
-	../refman-5.0/metadata/information-schema.idmap \
-	../refman-5.0/metadata/triggers.idmap \
-	../refman-5.0/metadata/apis.idmap \
-	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/se-merge.idmap \
-	../refman-5.0/metadata/dba-core.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-5.0/metadata/se-myisam.idmap \
-	../refman-5.0/metadata/views.idmap \
-	../refman-5.0/metadata/se-csv.idmap \
-	../refman-5.0/metadata/language-structure.idmap \
-	../refman-5.0/metadata/client-utility-programs.idmap \
-	../refman-5.0/metadata/se-archive.idmap \
-	../refman-5.0/metadata/installing-cs.idmap
+	../refman-common/metadata/regexp.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)

@@ -61,20 +64,22 @@
 mysqlqb_functions_IMAGES =
 mysqlqb_functions_SOURCES = mysqlqb_functions.xml $(mysqlqb_functions_INCLUDES)
 mysqlqb_functions_IDMAPS = \
-	../refman-5.0/metadata/precision-math.idmap \
+	../refman-5.0/metadata/apis-c.idmap \
 	../refman-5.0/metadata/charset.idmap \
 	../refman-5.0/metadata/data-types.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 \
-	metadata/mysqlqb_statements.idmap \
-	../refman-5.0/metadata/apis-c.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-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/extending-mysql.idmap \
-	../refman-5.0/metadata/dba-core.idmap \
 	../refman-common/metadata/credits.idmap \
-	../refman-5.0/metadata/stored-procedures.idmap \
-	../refman-5.0/metadata/language-structure.idmap \
-	../refman-5.0/metadata/installing-cs.idmap
+	../refman-common/metadata/regexp.idmap
 mysqlqb_functions.validpure: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.titles: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.useless: $(mysqlqb_functions_SOURCES)

@@ -93,39 +98,40 @@
 mysqlqb_statements_IMAGES =
 mysqlqb_statements_SOURCES = mysqlqb_statements.xml $(mysqlqb_statements_INCLUDES)
 mysqlqb_statements_IDMAPS = \
+	../refman-5.0/metadata/apis-c.idmap \
+	../refman-5.0/metadata/apis.idmap \
 	../refman-5.0/metadata/charset.idmap \
-	../refman-5.0/metadata/restrictions.idmap \
+	../refman-5.0/metadata/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
-	metadata/mysqlqb_functions.idmap \
-	../refman-5.0/metadata/se-example.idmap \
-	../refman-5.0/metadata/storage-engines.idmap \
-	../refman-5.0/metadata/replication.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 \
+	../refman-5.0/metadata/language-structure.idmap \
 	../refman-5.0/metadata/mysql-cluster.idmap \
 	../refman-5.0/metadata/optimization.idmap \
+	../refman-5.0/metadata/replication.idmap \
+	../refman-5.0/metadata/restrictions.idmap \
+	../refman-5.0/metadata/se-archive.idmap \
 	../refman-5.0/metadata/se-bdb.idmap \
-	../refman-5.0/metadata/apis-c.idmap \
-	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/introduction.idmap \
+	../refman-5.0/metadata/se-csv.idmap \
+	../refman-5.0/metadata/se-example.idmap \
+	../refman-5.0/metadata/se-federated.idmap \
 	../refman-5.0/metadata/se-innodb.idmap \
-	../refman-5.0/metadata/tutorial.idmap \
-	../refman-5.0/metadata/se-federated.idmap \
 	../refman-5.0/metadata/se-memory.idmap \
-	../refman-5.0/metadata/information-schema.idmap \
-	../refman-5.0/metadata/triggers.idmap \
-	../refman-5.0/metadata/apis.idmap \
-	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/se-merge.idmap \
-	../refman-5.0/metadata/dba-core.idmap \
-	../refman-common/metadata/bug-reports.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/se-myisam.idmap \
+	../refman-5.0/metadata/triggers.idmap \
+	../refman-5.0/metadata/tutorial.idmap \
 	../refman-5.0/metadata/views.idmap \
-	../refman-5.0/metadata/se-csv.idmap \
-	../refman-5.0/metadata/language-structure.idmap \
-	../refman-5.0/metadata/client-utility-programs.idmap \
-	../refman-5.0/metadata/se-archive.idmap \
-	../refman-5.0/metadata/installing-cs.idmap
+	../refman-common/metadata/bug-reports.idmap
 mysqlqb_statements.validpure: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.titles: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.useless: $(mysqlqb_statements_SOURCES)


Modified: trunk/mysqltest/Makefile.depends
===================================================================
--- trunk/mysqltest/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/mysqltest/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 630 bytes

@@ -116,8 +116,8 @@
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)
 programs_IDMAPS = \
-	metadata/command-reference.idmap \
-	../refman-5.1/metadata/installing.idmap
+	../refman-5.1/metadata/installing.idmap \
+	metadata/command-reference.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)


Modified: trunk/ndbapi/Makefile.depends
===================================================================
--- trunk/ndbapi/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/ndbapi/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 12; 2116 bytes

@@ -159,12 +159,12 @@
 	images/NdbTransaction-class.png
 ndb_classes_SOURCES = ndb-classes.xml $(ndb_classes_INCLUDES)
 ndb_classes_IDMAPS = \
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/data-types.idmap \
+	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
+	../refman-5.1/metadata/sql-syntax.idmap \
 	metadata/errors.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/data-types.idmap \
-	../refman-5.1/metadata/apis-c.idmap \
 	metadata/examples.idmap \
 	metadata/overview.idmap
 ndb-classes.validpure: $(ndb_classes_SOURCES)

@@ -243,12 +243,12 @@
 	images/NdbTransaction-class.png
 ndbapi_SOURCES = ndbapi.xml $(ndbapi_INCLUDES)
 ndbapi_IDMAPS = \
+	../refman-5.1/metadata/apis-c.idmap \
+	../refman-5.1/metadata/data-types.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/mysql-cluster.idmap \
-	../refman-5.1/metadata/errors-problems.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/apis-c.idmap \
-	../refman-5.1/metadata/data-types.idmap
+	../refman-5.1/metadata/sql-syntax.idmap
 ndbapi.validpure: $(ndbapi_SOURCES)
 ndbapi.titles: $(ndbapi_SOURCES)
 ndbapi.useless: $(ndbapi_SOURCES)

@@ -267,12 +267,12 @@
 overview_IMAGES =
 overview_SOURCES = overview.xml $(overview_INCLUDES)
 overview_IDMAPS = \
+	../refman-5.1/metadata/mysql-cluster.idmap \
 	../refman-5.1/metadata/partitioning.idmap \
 	metadata/errors.idmap \
-	../refman-5.1/metadata/mysql-cluster.idmap \
 	metadata/examples.idmap \
-	metadata/ndb-classes.idmap \
-	metadata/mgm-api.idmap
+	metadata/mgm-api.idmap \
+	metadata/ndb-classes.idmap
 overview.validpure: $(overview_SOURCES)
 overview.titles: $(overview_SOURCES)
 overview.useless: $(overview_SOURCES)


Modified: trunk/query-browser/Makefile.depends
===================================================================
--- trunk/query-browser/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/query-browser/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 5, Lines Added: 14, Lines Deleted: 14; 2829 bytes

@@ -26,9 +26,9 @@
 	images/connection.png
 connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES)
 connection_dialog_IDMAPS = \
+	../gui-common/metadata/appendix-connection-storage.idmap \
+	../gui-common/metadata/appendix-troubleshooting.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \
-	../gui-common/metadata/appendix-troubleshooting.idmap \
-	../gui-common/metadata/appendix-connection-storage.idmap \
 	metadata/options.idmap
 connection-dialog.validpure: $(connection_dialog_SOURCES)
 connection-dialog.titles: $(connection_dialog_SOURCES)

@@ -196,11 +196,11 @@
 query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES)
 query_browser_IDMAPS = \
 	../refman-5.1/metadata/dba-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
+	../refman-5.1/metadata/se-innodb.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-5.1/metadata/se-merge.idmap \
-	../refman-5.1/metadata/se-innodb.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap
+	../refman-5.1/metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap
 query-browser.validpure: $(query_browser_SOURCES)
 query-browser.titles: $(query_browser_SOURCES)
 query-browser.useless: $(query_browser_SOURCES)

@@ -231,11 +231,11 @@
 	images/twosakilas.png
 tour_SOURCES = tour.xml $(tour_INCLUDES)
 tour_IDMAPS = \
+	../gui-common/metadata/chapter-table-editor.idmap \
+	../refman-5.1/metadata/se-innodb.idmap \
 	metadata/chapter-options-query-browser.idmap \
-	../refman-5.1/metadata/se-innodb.idmap \
-	metadata/xml-files.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap \
-	metadata/using.idmap
+	metadata/using.idmap \
+	metadata/xml-files.idmap
 tour.validpure: $(tour_SOURCES)
 tour.titles: $(tour_SOURCES)
 tour.useless: $(tour_SOURCES)

@@ -258,8 +258,8 @@
 	images/tabletool.png
 using_SOURCES = using.xml $(using_INCLUDES)
 using_IDMAPS = \
-	metadata/tour.idmap \
-	metadata/chapter-options-query-browser.idmap
+	metadata/chapter-options-query-browser.idmap \
+	metadata/tour.idmap
 using.validpure: $(using_SOURCES)
 using.titles: $(using_SOURCES)
 using.useless: $(using_SOURCES)

@@ -276,9 +276,9 @@
 xml_files_IMAGES =
 xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES)
 xml_files_IDMAPS = \
-	metadata/tour.idmap \
+	../gui-common/metadata/appendix-common-files.idmap \
 	../gui-common/metadata/chapter-table-editor.idmap \
-	../gui-common/metadata/appendix-common-files.idmap
+	metadata/tour.idmap
 xml-files.validpure: $(xml_files_SOURCES)
 xml-files.titles: $(xml_files_SOURCES)
 xml-files.useless: $(xml_files_SOURCES)


Modified: trunk/query-browser-cy/Makefile.depends
===================================================================
--- trunk/query-browser-cy/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/query-browser-cy/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 5, Lines Added: 19, Lines Deleted: 19; 3468 bytes

@@ -26,9 +26,9 @@
 	images/connection.png
 connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES)
 connection_dialog_IDMAPS = \
+	../gui-common/metadata/appendix-connection-storage.idmap \
+	../gui-common/metadata/appendix-troubleshooting.idmap \
 	../gui-common/metadata/chapter-options-general.idmap \
-	../gui-common/metadata/appendix-troubleshooting.idmap \
-	../gui-common/metadata/appendix-connection-storage.idmap \
 	metadata/options.idmap
 connection-dialog.validpure: $(connection_dialog_SOURCES)
 connection-dialog.titles: $(connection_dialog_SOURCES)

@@ -199,18 +199,18 @@
 	images/twosakilas.png
 query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES)
 query_browser_IDMAPS = \
+	../gui-common/metadata/appendix-common-files.idmap \
+	../gui-common/metadata/appendix-connection-storage.idmap \
+	../gui-common/metadata/appendix-troubleshooting.idmap \
+	../gui-common/metadata/chapter-table-editor.idmap \
+	../gui-common/metadata/chapter-upgrade-all.idmap \
+	../gui-common/metadata/installation-all.idmap \
 	../refman-5.1/metadata/dba-core.idmap \
-	../gui-common/metadata/chapter-upgrade-all.idmap \
-	../gui-common/metadata/appendix-connection-storage.idmap \
-	../refman-common/metadata/bug-reports.idmap \
+	../refman-5.1/metadata/se-innodb.idmap \
+	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-5.1/metadata/se-merge.idmap \
-	../refman-5.1/metadata/se-innodb.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap \
-	../gui-common/metadata/appendix-troubleshooting.idmap \
-	../gui-common/metadata/appendix-common-files.idmap \
-	../gui-common/metadata/installation-all.idmap
+	../refman-common/metadata/bug-reports.idmap
 query-browser.validpure: $(query_browser_SOURCES)
 query-browser.titles: $(query_browser_SOURCES)
 query-browser.useless: $(query_browser_SOURCES)

@@ -241,11 +241,11 @@
 	images/twosakilas.png
 tour_SOURCES = tour.xml $(tour_INCLUDES)
 tour_IDMAPS = \
+	../gui-common/metadata/chapter-table-editor.idmap \
+	../refman-5.1/metadata/se-innodb.idmap \
 	metadata/chapter-options-query-browser.idmap \
-	../refman-5.1/metadata/se-innodb.idmap \
-	metadata/xml-files.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap \
-	metadata/using.idmap
+	metadata/using.idmap \
+	metadata/xml-files.idmap
 tour.validpure: $(tour_SOURCES)
 tour.titles: $(tour_SOURCES)
 tour.useless: $(tour_SOURCES)

@@ -268,8 +268,8 @@
 	images/tabletool.png
 using_SOURCES = using.xml $(using_INCLUDES)
 using_IDMAPS = \
-	metadata/tour.idmap \
-	metadata/chapter-options-query-browser.idmap
+	metadata/chapter-options-query-browser.idmap \
+	metadata/tour.idmap
 using.validpure: $(using_SOURCES)
 using.titles: $(using_SOURCES)
 using.useless: $(using_SOURCES)

@@ -286,9 +286,9 @@
 xml_files_IMAGES =
 xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES)
 xml_files_IDMAPS = \
-	metadata/tour.idmap \
+	../gui-common/metadata/appendix-common-files.idmap \
 	../gui-common/metadata/chapter-table-editor.idmap \
-	../gui-common/metadata/appendix-common-files.idmap
+	metadata/tour.idmap
 xml-files.validpure: $(xml_files_SOURCES)
 xml-files.titles: $(xml_files_SOURCES)
 xml-files.useless: $(xml_files_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/refman-4.1/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 27, Lines Added: 208, Lines Deleted: 207; 24242 bytes

@@ -7,17 +7,17 @@
 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/functions-core.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
-	metadata/connectors.idmap \
-	metadata/apis.idmap
+	metadata/optimization.idmap \
+	metadata/using-mysql-programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -37,18 +37,18 @@
 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/connectors.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \
+	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/errors-problems.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/language-structure.idmap \
-	metadata/connectors.idmap
+	metadata/using-mysql-programs.idmap
 apis.validpure: $(apis_SOURCES)
 apis.titles: $(apis_SOURCES)
 apis.useless: $(apis_SOURCES)

@@ -67,11 +67,11 @@
 charset_IMAGES =
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/dba-core.idmap \
-	metadata/data-types.idmap
+	metadata/mysql-cluster-limitations.idmap \
+	metadata/sql-syntax.idmap
 charset.validpure: $(charset_SOURCES)
 charset.titles: $(charset_SOURCES)
 charset.useless: $(charset_SOURCES)

@@ -90,16 +90,16 @@
 client_utility_programs_IMAGES =
 client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES)
 client_utility_programs_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/information-schema.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
 	metadata/replication.idmap \
-	metadata/apis-c.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/apis.idmap \
-	../refman-5.0/metadata/information-schema.idmap
+	metadata/using-mysql-programs.idmap
 client-utility-programs.validpure: $(client_utility_programs_SOURCES)
 client-utility-programs.titles: $(client_utility_programs_SOURCES)
 client-utility-programs.useless: $(client_utility_programs_SOURCES)

@@ -222,20 +222,20 @@
 	../refman-common/images/mysql-vstudioplugin-4.png
 connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
 connectors_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/stored-procedures.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	../refman-common/metadata/news-connector-j.idmap \
+	../refman-common/metadata/news-connector-mxj.idmap \
 	../refman-common/metadata/news-connector-net.idmap \
-	../refman-common/metadata/news-connector-mxj.idmap \
+	../refman-common/metadata/news-myodbc.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/dba-core.idmap \
-	../refman-common/metadata/news-connector-j.idmap \
 	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
-	metadata/charset.idmap \
-	../refman-5.0/metadata/stored-procedures.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/functions-core.idmap \
-	../refman-common/metadata/news-myodbc.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis.idmap
+	metadata/sql-syntax.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -267,15 +267,15 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
+	metadata/charset.idmap \
+	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/charset.idmap \
-	metadata/client-utility-programs.idmap \
 	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -294,28 +294,28 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
 	metadata/errors-problems.idmap \
-	metadata/charset.idmap \
-	metadata/apis-c.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/installing.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap \
-	metadata/apis.idmap
+	metadata/using-mysql-programs.idmap
 dynxml-generated-dba.validpure: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.titles: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.useless: $(dynxml_generated_dba_SOURCES)

@@ -334,19 +334,19 @@
 dynxml_generated_functions_IMAGES =
 dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES)
 dynxml_generated_functions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
+	../refman-common/metadata/credits.idmap \
+	metadata/apis-c.idmap \
+	metadata/charset.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
-	metadata/charset.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/credits.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap
+	metadata/language-structure.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/tutorial.idmap
 dynxml-generated-functions.validpure: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.titles: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.useless: $(dynxml_generated_functions_SOURCES)

@@ -393,19 +393,19 @@
 errors_problems_IMAGES =
 errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
 errors_problems_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/installing.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
 	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap
+	metadata/using-mysql-programs.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -424,10 +424,10 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	metadata/dba-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/installing.idmap \
-	../refman-common/metadata/information-sources.idmap \
 	metadata/language-structure.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)

@@ -447,28 +447,28 @@
 installing_IMAGES =
 installing_SOURCES = installing.xml $(installing_INCLUDES)
 installing_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/apis-c.idmap \
+	metadata/charset.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/news.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/news-4.0.idmap \
-	metadata/errors-problems.idmap \
 	metadata/news-4.1.idmap \
-	metadata/charset.idmap \
-	metadata/apis-c.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/client-utility-programs.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/extending-mysql.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap
+	metadata/using-mysql-programs.idmap
 installing.validpure: $(installing_SOURCES)
 installing.titles: $(installing_SOURCES)
 installing.useless: $(installing_SOURCES)

@@ -495,31 +495,31 @@
 introduction_IMAGES =
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-common/metadata/credits.idmap \
+	../refman-common/metadata/gpl-license.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/news.idmap \
+	metadata/errors-problems.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/news-4.0.idmap \
-	metadata/errors-problems.idmap \
 	metadata/news-4.1.idmap \
-	metadata/charset.idmap \
-	metadata/apis-c.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/gpl-license.idmap \
-	../refman-common/metadata/credits.idmap \
-	metadata/connectors.idmap \
-	metadata/client-utility-programs.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap \
-	metadata/apis.idmap
+	metadata/tutorial.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -541,14 +541,14 @@
 language_structure_IMAGES =
 language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES)
 language_structure_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/dba-core.idmap \
-	metadata/introduction.idmap \
 	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
-	metadata/charset.idmap \
 	metadata/functions-core.idmap \
-	metadata/apis.idmap
+	metadata/introduction.idmap \
+	metadata/sql-syntax.idmap
 language-structure.validpure: $(language_structure_SOURCES)
 language-structure.titles: $(language_structure_SOURCES)
 language-structure.useless: $(language_structure_SOURCES)

@@ -634,7 +634,6 @@
 	../refman-common/images/mysql-vstudioplugin-3.png \
 	../refman-common/images/mysql-vstudioplugin-4.png \
 	../refman-common/information-sources.xml \
-	../refman-common/licenses.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/maxdb.en.xml \
 	../refman-common/news-cluster.xml \

@@ -750,12 +749,13 @@
 	images/rolling-restarts.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
+	../refman-5.0/metadata/information-schema.idmap \
+	../refman-5.0/metadata/stored-procedures.idmap \
+	../refman-5.1/metadata/introduction.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	../refman-5.0/metadata/information-schema.idmap \
 	metadata/dba-core.idmap \
-	../refman-5.0/metadata/stored-procedures.idmap \
-	metadata/functions-core.idmap
+	metadata/functions-core.idmap \
+	metadata/mysql-cluster-limitations.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -788,14 +788,15 @@
 	images/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/spatial-extensions.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/news-cluster.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/installing.idmap \
-	../refman-common/metadata/news-cluster.idmap \
-	metadata/data-types.idmap
+	metadata/mysql-cluster-limitations.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/using-mysql-programs.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -815,11 +816,11 @@
 news_3_23_SOURCES = news-3.23.xml $(news_3_23_INCLUDES)
 news_3_23_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/storage-engines.idmap \
+	metadata/dba-core.idmap \
+	metadata/installing.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
 	metadata/se-innodb.idmap \
-	metadata/installing.idmap
+	metadata/storage-engines.idmap
 news-3.23.validpure: $(news_3_23_SOURCES)
 news-3.23.titles: $(news_3_23_SOURCES)
 news-3.23.useless: $(news_3_23_SOURCES)

@@ -838,22 +839,22 @@
 news_4_0_IMAGES =
 news_4_0_SOURCES = news-4.0.xml $(news_4_0_INCLUDES)
 news_4_0_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
+	../refman-common/metadata/news-innodb.idmap \
+	metadata/apis.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/client-utility-programs.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
-	metadata/dba-core.idmap \
-	metadata/tutorial.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap \
-	metadata/data-types.idmap \
-	metadata/apis.idmap \
-	../refman-common/metadata/news-innodb.idmap
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/tutorial.idmap
 news-4.0.validpure: $(news_4_0_SOURCES)
 news-4.0.titles: $(news_4_0_SOURCES)
 news-4.0.useless: $(news_4_0_SOURCES)

@@ -872,22 +873,22 @@
 news_4_1_IMAGES =
 news_4_1_SOURCES = news-4.1.xml $(news_4_1_INCLUDES)
 news_4_1_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/errors-problems.idmap \
 	metadata/apis-c.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
-	metadata/spatial-extensions.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/charset.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/using-mysql-programs.idmap
 news-4.1.validpure: $(news_4_1_SOURCES)
 news-4.1.titles: $(news_4_1_SOURCES)
 news-4.1.useless: $(news_4_1_SOURCES)

@@ -935,18 +936,18 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/storage-engines.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
-	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/installing.idmap
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/using-mysql-programs.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -983,14 +984,14 @@
 replication_IMAGES =
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/storage-engines.idmap \
-	metadata/dba-core.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/functions-core.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/se-innodb.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -1066,11 +1067,11 @@
 se_innodb_IMAGES =
 se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
 se_innodb_IDMAPS = \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/installing.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/installing.idmap
+	metadata/using-mysql-programs.idmap
 se-innodb.validpure: $(se_innodb_SOURCES)
 se-innodb.titles: $(se_innodb_SOURCES)
 se-innodb.useless: $(se_innodb_SOURCES)

@@ -1089,8 +1090,8 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/apis-c.idmap
+	metadata/apis-c.idmap \
+	metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -1109,26 +1110,26 @@
 sql_syntax_IMAGES =
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/bug-reports.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
+	metadata/functions-core.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
-	metadata/spatial-extensions.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
+	metadata/replication.idmap \
 	metadata/restrictions.idmap \
-	metadata/charset.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/data-types.idmap \
-	metadata/apis.idmap
+	metadata/spatial-extensions.idmap \
+	metadata/storage-engines.idmap \
+	metadata/tutorial.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -1150,17 +1151,17 @@
 	images/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/installing.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/news-4.1.idmap \
-	metadata/client-utility-programs.idmap \
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
 	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap
+	metadata/sql-syntax.idmap \
+	metadata/using-mysql-programs.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -1179,17 +1180,17 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/language-structure.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/se-innodb.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \
-	metadata/data-types.idmap
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)

@@ -1210,8 +1211,8 @@
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/installing.idmap
+	metadata/installing.idmap \
+	metadata/mysql-cluster.idmap
 using-mysql-programs.validpure: $(using_mysql_programs_SOURCES)
 using-mysql-programs.titles: $(using_mysql_programs_SOURCES)
 using-mysql-programs.useless: $(using_mysql_programs_SOURCES)


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/refman-5.0/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 43, Lines Added: 326, Lines Deleted: 327; 37769 bytes

@@ -7,17 +7,17 @@
 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/functions-core.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/errors-problems.idmap \
+	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
-	metadata/connectors.idmap \
-	metadata/apis.idmap
+	metadata/optimization.idmap \
+	metadata/using-mysql-programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -37,19 +37,18 @@
 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/functions-core.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
-	../refman-common/metadata/information-sources.idmap \
 	metadata/errors-problems.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/functions-core.idmap \
 	metadata/installing-cs.idmap \
 	metadata/language-structure.idmap \
-	metadata/connectors.idmap
+	metadata/optimization.idmap \
+	metadata/using-mysql-programs.idmap
 apis.validpure: $(apis_SOURCES)
 apis.titles: $(apis_SOURCES)
 apis.useless: $(apis_SOURCES)

@@ -68,12 +67,12 @@
 charset_IMAGES =
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/functions-core.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
-	metadata/data-types.idmap \
-	metadata/information-schema.idmap
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/sql-syntax.idmap
 charset.validpure: $(charset_SOURCES)
 charset.titles: $(charset_SOURCES)
 charset.useless: $(charset_SOURCES)

@@ -92,17 +91,17 @@
 client_utility_programs_IMAGES =
 client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES)
 client_utility_programs_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
 	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-cs.idmap \
+	metadata/optimization.idmap \
 	metadata/replication.idmap \
-	metadata/apis-c.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/installing-cs.idmap \
-	metadata/information-schema.idmap \
-	metadata/apis.idmap
+	metadata/using-mysql-programs.idmap
 client-utility-programs.validpure: $(client_utility_programs_SOURCES)
 client-utility-programs.titles: $(client_utility_programs_SOURCES)
 client-utility-programs.useless: $(client_utility_programs_SOURCES)

@@ -141,8 +140,8 @@
 	images/mysql-cfg-fig9.png
 config_wizard_SOURCES = config-wizard.xml $(config_wizard_INCLUDES)
 config_wizard_IDMAPS = \
-	metadata/dba-core.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap
 config-wizard.validpure: $(config_wizard_SOURCES)
 config-wizard.titles: $(config_wizard_SOURCES)
 config-wizard.useless: $(config_wizard_SOURCES)

@@ -265,20 +264,20 @@
 	../refman-common/images/mysql-vstudioplugin-4.png
 connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
 connectors_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	../refman-common/metadata/news-connector-net.idmap \
-	../refman-common/metadata/news-connector-mxj.idmap \
-	metadata/dba-core.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/news-connector-j.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/news-connector-mxj.idmap \
+	../refman-common/metadata/news-connector-net.idmap \
+	../refman-common/metadata/news-myodbc.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis.idmap \
 	metadata/charset.idmap \
-	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
-	../refman-common/metadata/news-myodbc.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -310,17 +309,17 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/precision-math.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/language-structure.idmap
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -339,32 +338,32 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/faqs.idmap \
-	metadata/errors-problems.idmap \
-	metadata/charset.idmap \
-	metadata/apis-c.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/installing-cs.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/installing-cs.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
 	metadata/se-bdb.idmap \
-	metadata/extending-mysql.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap \
-	metadata/apis.idmap
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 dynxml-generated-dba.validpure: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.titles: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.useless: $(dynxml_generated_dba_SOURCES)

@@ -383,21 +382,21 @@
 dynxml_generated_functions_IMAGES =
 dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES)
 dynxml_generated_functions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/precision-math.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/credits.idmap \
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
-	metadata/tutorial.idmap \
-	metadata/installing-cs.idmap \
-	../refman-common/metadata/credits.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/installing-cs.idmap \
+	metadata/language-structure.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap
+	metadata/tutorial.idmap
 dynxml-generated-functions.validpure: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.titles: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.useless: $(dynxml_generated_functions_SOURCES)

@@ -444,19 +443,19 @@
 errors_problems_IMAGES =
 errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
 errors_problems_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/installing-cs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-innodb.idmap \
+	metadata/dba-core.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/installing-cs.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/extending-mysql.idmap
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-merge.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/tutorial.idmap \
+	metadata/using-mysql-programs.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -475,12 +474,12 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-cs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
-	metadata/stored-procedures.idmap \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/language-structure.idmap
+	metadata/dba-core.idmap \
+	metadata/installing-cs.idmap \
+	metadata/language-structure.idmap \
+	metadata/stored-procedures.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -503,30 +502,31 @@
 	../refman-common/images/drbd-availability-comparison.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-mxj.idmap \
-	metadata/views.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/connector-net.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
-	metadata/charset.idmap \
 	metadata/apis-c.idmap \
-	metadata/installing-cs.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/information-schema.idmap \
+	metadata/installing-cs.idmap \
+	metadata/mysql-cluster-limitations.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
-	../refman-common/metadata/connector-net.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
 	metadata/news-5.0.idmap \
-	../refman-common/metadata/connector-j.idmap \
+	metadata/replication.idmap \
 	metadata/se-archive.idmap \
-	metadata/data-types.idmap \
+	metadata/se-federated.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/apis.idmap
+	metadata/views.idmap
 faqs.validpure: $(faqs_SOURCES)
 faqs.titles: $(faqs_SOURCES)
 faqs.useless: $(faqs_SOURCES)

@@ -545,10 +545,10 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/charset.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
-	metadata/charset.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/triggers.idmap
 information-schema.validpure: $(information_schema_SOURCES)
 information-schema.titles: $(information_schema_SOURCES)

@@ -568,33 +568,33 @@
 installing_cs_IMAGES =
 installing_cs_SOURCES = installing-cs.xml $(installing_cs_INCLUDES)
 installing_cs_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/views.idmap \
-	metadata/precision-math.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/news.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/config-wizard.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/se-bdb.idmap \
-	metadata/extending-mysql.idmap \
 	metadata/news-5.0.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/config-wizard.idmap \
-	metadata/language-structure.idmap
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/replication.idmap \
+	metadata/se-bdb.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap \
+	metadata/views.idmap
 installing-cs.validpure: $(installing_cs_SOURCES)
 installing-cs.titles: $(installing_cs_SOURCES)
 installing-cs.useless: $(installing_cs_SOURCES)

@@ -648,11 +648,11 @@
 	images/mysql-esi-win32-uninst.png
 installing_es_SOURCES = installing-es.xml $(installing_es_INCLUDES)
 installing_es_IDMAPS = \
+	../refman-common/metadata/bug-reports.idmap \
 	metadata/dba-core.idmap \
-	metadata/news.idmap \
-	metadata/releasenotes-es.idmap \
 	metadata/installing-cs.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	metadata/news.idmap \
+	metadata/releasenotes-es.idmap
 installing-es.validpure: $(installing_es_SOURCES)
 installing-es.titles: $(installing_es_SOURCES)
 installing-es.useless: $(installing_es_SOURCES)

@@ -728,34 +728,34 @@
 	images/mysql-esi-win32-uninst.png
 installing_SOURCES = installing.xml $(installing_INCLUDES)
 installing_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/views.idmap \
-	metadata/precision-math.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/replication.idmap \
-	metadata/news.idmap \
-	metadata/introduction.idmap \
-	metadata/releasenotes-es.idmap \
-	metadata/faqs.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/se-bdb.idmap \
-	metadata/extending-mysql.idmap \
 	metadata/news-5.0.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/releasenotes-es.idmap \
+	metadata/replication.idmap \
+	metadata/se-bdb.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap \
+	metadata/views.idmap
 installing.validpure: $(installing_SOURCES)
 installing.titles: $(installing_SOURCES)
 installing.useless: $(installing_SOURCES)

@@ -782,37 +782,37 @@
 introduction_IMAGES =
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
-	metadata/sql-syntax.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	metadata/replication.idmap \
-	metadata/news.idmap \
-	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
+	../refman-5.1/metadata/introduction.idmap \
+	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	metadata/connectors.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/storage-engines.idmap \
-	../refman-5.1/metadata/introduction.idmap \
-	metadata/language-structure.idmap \
-	metadata/views.idmap \
-	metadata/se-federated.idmap \
-	metadata/precision-math.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/credits.idmap \
+	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
-	metadata/functions-core.idmap \
-	metadata/se-innodb.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/installing-outline.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/replication.idmap \
 	metadata/se-archive.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap \
-	metadata/installing-outline.idmap \
-	metadata/apis.idmap
+	metadata/tutorial.idmap \
+	metadata/views.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -833,14 +833,14 @@
 language_structure_IMAGES =
 language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES)
 language_structure_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
 	metadata/apis-c.idmap \
-	metadata/dba-core.idmap \
+	metadata/apis.idmap \
 	metadata/charset.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/apis.idmap
+	metadata/introduction.idmap \
+	metadata/sql-syntax.idmap
 language-structure.validpure: $(language_structure_SOURCES)
 language-structure.titles: $(language_structure_SOURCES)
 language-structure.useless: $(language_structure_SOURCES)

@@ -928,7 +928,6 @@
 	../refman-common/images/mysql-vstudioplugin-3.png \
 	../refman-common/images/mysql-vstudioplugin-4.png \
 	../refman-common/information-sources.xml \
-	../refman-common/licenses.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/maxdb.en.xml \
 	../refman-common/news-cluster.xml \

@@ -1101,12 +1100,12 @@
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../refman-4.1/metadata/introduction.idmap \
-	../refman-common/metadata/gpl-license.idmap \
 	../refman-5.1/metadata/introduction.idmap \
+	../refman-common/metadata/gpl-license.idmap \
 	metadata/dba-core.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/installing-outline.idmap
+	metadata/installing-outline.idmap \
+	metadata/mysql-cluster-limitations.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1139,14 +1138,15 @@
 	images/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
+	../refman-common/metadata/bug-reports.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/installing-cs.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/installing-outline.idmap
+	metadata/installing-outline.idmap \
+	metadata/mysql-cluster-limitations.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/using-mysql-programs.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -1165,30 +1165,30 @@
 news_5_0_IMAGES =
 news_5_0_SOURCES = news-5.0.xml $(news_5_0_INCLUDES)
 news_5_0_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/se-memory.idmap \
-	metadata/replication.idmap \
-	metadata/releasenotes-es.idmap \
-	metadata/errors-problems.idmap \
-	metadata/releasenotes-cs.idmap \
 	metadata/apis-c.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/se-federated.idmap \
-	metadata/views.idmap \
-	metadata/precision-math.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
-	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/releasenotes-cs.idmap \
+	metadata/releasenotes-es.idmap \
+	metadata/replication.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-memory.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap
+	metadata/using-mysql-programs.idmap \
+	metadata/views.idmap
 news-5.0.validpure: $(news_5_0_SOURCES)
 news-5.0.titles: $(news_5_0_SOURCES)
 news-5.0.useless: $(news_5_0_SOURCES)

@@ -1216,30 +1216,30 @@
 news_IMAGES =
 news_SOURCES = news.xml $(news_INCLUDES)
 news_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/se-memory.idmap \
-	metadata/replication.idmap \
-	metadata/releasenotes-es.idmap \
-	metadata/errors-problems.idmap \
-	metadata/releasenotes-cs.idmap \
 	metadata/apis-c.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/se-federated.idmap \
-	metadata/views.idmap \
-	metadata/precision-math.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
-	metadata/functions-core.idmap \
 	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/releasenotes-cs.idmap \
+	metadata/releasenotes-es.idmap \
+	metadata/replication.idmap \
+	metadata/restrictions.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-memory.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap
+	metadata/using-mysql-programs.idmap \
+	metadata/views.idmap
 news.validpure: $(news_SOURCES)
 news.titles: $(news_SOURCES)
 news.useless: $(news_SOURCES)

@@ -1258,23 +1258,23 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/se-memory.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/storage-engines.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/language-structure.idmap \
-	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/functions-core.idmap \
 	metadata/installing-cs.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
+	metadata/replication.idmap \
+	metadata/se-archive.idmap \
+	metadata/se-bdb.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
+	metadata/se-memory.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
 	metadata/stored-procedures.idmap \
-	metadata/se-bdb.idmap \
-	metadata/se-archive.idmap
+	metadata/using-mysql-programs.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -1330,10 +1330,10 @@
 releasenotes_cs_5_0_IMAGES =
 releasenotes_cs_5_0_SOURCES = releasenotes-cs-5.0.xml $(releasenotes_cs_5_0_INCLUDES)
 releasenotes_cs_5_0_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/news.idmap \
 	metadata/information-schema.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/mysql-cluster.idmap \
+	metadata/news.idmap \
+	metadata/sql-syntax.idmap
 releasenotes-cs-5.0.validpure: $(releasenotes_cs_5_0_SOURCES)
 releasenotes-cs-5.0.titles: $(releasenotes_cs_5_0_SOURCES)
 releasenotes-cs-5.0.useless: $(releasenotes_cs_5_0_SOURCES)

@@ -1353,11 +1353,11 @@
 releasenotes_cs_IMAGES =
 releasenotes_cs_SOURCES = releasenotes-cs.xml $(releasenotes_cs_INCLUDES)
 releasenotes_cs_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/information-schema.idmap \
 	metadata/installing-version.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/news.idmap \
-	metadata/information-schema.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/sql-syntax.idmap
 releasenotes-cs.validpure: $(releasenotes_cs_SOURCES)
 releasenotes-cs.titles: $(releasenotes_cs_SOURCES)
 releasenotes-cs.useless: $(releasenotes_cs_SOURCES)

@@ -1376,8 +1376,8 @@
 releasenotes_es_5_0_IMAGES =
 releasenotes_es_5_0_SOURCES = releasenotes-es-5.0.xml $(releasenotes_es_5_0_INCLUDES)
 releasenotes_es_5_0_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/mysql-cluster.idmap \
+	metadata/sql-syntax.idmap
 releasenotes-es-5.0.validpure: $(releasenotes_es_5_0_SOURCES)
 releasenotes-es-5.0.titles: $(releasenotes_es_5_0_SOURCES)
 releasenotes-es-5.0.useless: $(releasenotes_es_5_0_SOURCES)

@@ -1397,9 +1397,9 @@
 releasenotes_es_IMAGES =
 releasenotes_es_SOURCES = releasenotes-es.xml $(releasenotes_es_INCLUDES)
 releasenotes_es_IDMAPS = \
-	metadata/sql-syntax.idmap \
 	metadata/installing-version.idmap \
-	metadata/mysql-cluster.idmap
+	metadata/mysql-cluster.idmap \
+	metadata/sql-syntax.idmap
 releasenotes-es.validpure: $(releasenotes_es_SOURCES)
 releasenotes-es.titles: $(releasenotes_es_SOURCES)
 releasenotes-es.useless: $(releasenotes_es_SOURCES)

@@ -1418,16 +1418,15 @@
 replication_IMAGES =
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/se-memory.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
 	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/se-innodb.idmap \
+	metadata/se-memory.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
-	metadata/mysql-cluster.idmap \
 	metadata/triggers.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)

@@ -1492,8 +1491,8 @@
 se_archive_IMAGES =
 se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
 se_archive_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/spatial-extensions.idmap
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap
 se-archive.validpure: $(se_archive_SOURCES)
 se-archive.titles: $(se_archive_SOURCES)
 se-archive.useless: $(se_archive_SOURCES)

@@ -1512,9 +1511,9 @@
 se_bdb_IMAGES =
 se_bdb_SOURCES = se-bdb.xml $(se_bdb_INCLUDES)
 se_bdb_IDMAPS = \
-	metadata/sql-syntax.idmap \
 	metadata/dba-core.idmap \
-	metadata/installing-cs.idmap
+	metadata/installing-cs.idmap \
+	metadata/sql-syntax.idmap
 se-bdb.validpure: $(se_bdb_SOURCES)
 se-bdb.titles: $(se_bdb_SOURCES)
 se-bdb.useless: $(se_bdb_SOURCES)

@@ -1608,14 +1607,14 @@
 se_innodb_IMAGES =
 se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
 se_innodb_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
+	metadata/config-wizard.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/errors-problems.idmap \
 	metadata/news-5.0.idmap \
-	metadata/data-types.idmap \
-	metadata/config-wizard.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 se-innodb.validpure: $(se_innodb_SOURCES)
 se-innodb.titles: $(se_innodb_SOURCES)
 se-innodb.useless: $(se_innodb_SOURCES)

@@ -1634,9 +1633,9 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/dba-core.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)
 se-memory.titles: $(se_memory_SOURCES)
 se-memory.useless: $(se_memory_SOURCES)

@@ -1656,8 +1655,8 @@
 se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
 se_merge_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/optimization.idmap \
-	metadata/installing-cs.idmap
+	metadata/installing-cs.idmap \
+	metadata/optimization.idmap
 se-merge.validpure: $(se_merge_SOURCES)
 se-merge.titles: $(se_merge_SOURCES)
 se-merge.useless: $(se_merge_SOURCES)

@@ -1676,13 +1675,13 @@
 se_myisam_IMAGES =
 se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES)
 se_myisam_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/optimization.idmap \
 	metadata/dba-core.idmap \
-	metadata/charset.idmap \
-	metadata/installing-cs.idmap
+	metadata/errors-problems.idmap \
+	metadata/installing-cs.idmap \
+	metadata/optimization.idmap \
+	metadata/sql-syntax.idmap
 se-myisam.validpure: $(se_myisam_SOURCES)
 se-myisam.titles: $(se_myisam_SOURCES)
 se-myisam.useless: $(se_myisam_SOURCES)

@@ -1701,8 +1700,8 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/apis-c.idmap
+	metadata/apis-c.idmap \
+	metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -1721,39 +1720,39 @@
 sql_syntax_IMAGES =
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/se-memory.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/bug-reports.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-merge.idmap \
-	metadata/storage-engines.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/installing-cs.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
-	metadata/se-csv.idmap \
-	metadata/views.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
+	metadata/replication.idmap \
 	metadata/restrictions.idmap \
-	metadata/charset.idmap \
-	metadata/tutorial.idmap \
-	metadata/installing-cs.idmap \
-	metadata/information-schema.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/se-archive.idmap \
 	metadata/se-bdb.idmap \
+	metadata/se-csv.idmap \
 	metadata/se-example.idmap \
-	metadata/se-archive.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-memory.idmap \
+	metadata/se-merge.idmap \
+	metadata/se-myisam.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap \
-	metadata/apis.idmap
+	metadata/tutorial.idmap \
+	metadata/views.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -1784,22 +1783,22 @@
 	images/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/errors-problems.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
+	metadata/config-wizard.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
-	metadata/charset.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/installing-cs.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
 	metadata/news-5.0.idmap \
-	metadata/data-types.idmap \
-	metadata/config-wizard.idmap
+	metadata/optimization.idmap \
+	metadata/replication.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -1818,14 +1817,14 @@
 stored_procedures_IMAGES =
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
-	metadata/replication.idmap \
 	metadata/apis-c.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/language-structure.idmap \
 	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/faqs.idmap \
-	metadata/functions-core.idmap
+	metadata/functions-core.idmap \
+	metadata/language-structure.idmap \
+	metadata/replication.idmap \
+	metadata/restrictions.idmap
 stored-procedures.validpure: $(stored_procedures_SOURCES)
 stored-procedures.titles: $(stored_procedures_SOURCES)
 stored-procedures.useless: $(stored_procedures_SOURCES)

@@ -1844,10 +1843,10 @@
 triggers_IMAGES =
 triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
 triggers_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/restrictions.idmap \
 	metadata/faqs.idmap \
 	metadata/installing-cs.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap
 triggers.validpure: $(triggers_SOURCES)
 triggers.titles: $(triggers_SOURCES)

@@ -1867,18 +1866,18 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/functions-core.idmap \
+	metadata/installing-outline.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
+	metadata/replication.idmap \
 	metadata/se-innodb.idmap \
-	metadata/functions-core.idmap \
-	metadata/data-types.idmap \
-	metadata/installing-outline.idmap
+	metadata/sql-syntax.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)

@@ -1898,11 +1897,11 @@
 using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
+	metadata/config-wizard.idmap \
 	metadata/dba-core.idmap \
 	metadata/installing-cs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/config-wizard.idmap \
-	metadata/installing-outline.idmap
+	metadata/installing-outline.idmap \
+	metadata/mysql-cluster.idmap
 using-mysql-programs.validpure: $(using_mysql_programs_SOURCES)
 using-mysql-programs.titles: $(using_mysql_programs_SOURCES)
 using-mysql-programs.useless: $(using_mysql_programs_SOURCES)

@@ -1921,11 +1920,11 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/sql-syntax.idmap \
 	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
 	metadata/faqs.idmap \
-	metadata/information-schema.idmap
+	metadata/information-schema.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax.idmap
 views.validpure: $(views_SOURCES)
 views.titles: $(views_SOURCES)
 views.useless: $(views_SOURCES)


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/refman-5.1/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 41, Lines Added: 301, Lines Deleted: 304; 36332 bytes

@@ -7,18 +7,18 @@
 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/functions-core.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	metadata/apis-progutils.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/connector-j.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/errors-problems.idmap \
+	metadata/functions-core.idmap \
 	metadata/language-structure.idmap \
-	metadata/connectors.idmap \
-	metadata/apis-libmysqld.idmap
+	metadata/optimization.idmap \
+	metadata/using-mysql-programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -73,8 +73,8 @@
 apis_libmysqld_IMAGES =
 apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES)
 apis_libmysqld_IDMAPS = \
-	metadata/installing.idmap \
 	metadata/apis-c.idmap \
+	metadata/installing.idmap \
 	metadata/using-mysql-programs.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)

@@ -94,8 +94,8 @@
 apis_perl_IMAGES =
 apis_perl_SOURCES = apis-perl.xml $(apis_perl_INCLUDES)
 apis_perl_IDMAPS = \
-	metadata/installing.idmap \
-	../refman-common/metadata/information-sources.idmap
+	../refman-common/metadata/information-sources.idmap \
+	metadata/installing.idmap
 apis-perl.validpure: $(apis_perl_SOURCES)
 apis-perl.titles: $(apis_perl_SOURCES)
 apis-perl.useless: $(apis_perl_SOURCES)

@@ -215,12 +215,12 @@
 charset_IMAGES =
 charset_SOURCES = charset.xml $(charset_INCLUDES)
 charset_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/functions-core.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \
-	metadata/data-types.idmap \
-	metadata/information-schema.idmap
+	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/sql-syntax.idmap
 charset.validpure: $(charset_SOURCES)
 charset.titles: $(charset_SOURCES)
 charset.useless: $(charset_SOURCES)

@@ -239,18 +239,18 @@
 client_utility_programs_IMAGES =
 client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES)
 client_utility_programs_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis-progutils.idmap \
+	metadata/dba-core.idmap \
+	metadata/events.idmap \
+	metadata/information-schema.idmap \
 	metadata/installing.idmap \
 	metadata/optimization.idmap \
-	metadata/events.idmap \
-	metadata/dba-core.idmap \
+	metadata/replication-implementation.idmap \
 	metadata/restrictions.idmap \
-	metadata/apis-progutils.idmap \
-	metadata/apis-c.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/information-schema.idmap
+	metadata/using-mysql-programs.idmap
 client-utility-programs.validpure: $(client_utility_programs_SOURCES)
 client-utility-programs.titles: $(client_utility_programs_SOURCES)
 client-utility-programs.useless: $(client_utility_programs_SOURCES)

@@ -373,21 +373,21 @@
 	../refman-common/images/mysql-vstudioplugin-4.png
 connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
 connectors_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/apis-php.idmap \
-	../refman-common/metadata/news-connector-net.idmap \
-	../refman-common/metadata/news-connector-mxj.idmap \
-	metadata/dba-core.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/news-connector-j.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/news-connector-mxj.idmap \
+	../refman-common/metadata/news-connector-net.idmap \
+	../refman-common/metadata/news-myodbc.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis-php.idmap \
+	metadata/apis.idmap \
 	metadata/charset.idmap \
-	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
-	../refman-common/metadata/news-myodbc.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)
 connectors.useless: $(connectors_SOURCES)

@@ -419,17 +419,17 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/precision-math.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
 	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/language-structure.idmap
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap
 data-types.validpure: $(data_types_SOURCES)
 data-types.titles: $(data_types_SOURCES)
 data-types.useless: $(data_types_SOURCES)

@@ -463,36 +463,36 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
-	metadata/replication-topology.idmap \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis-perl.idmap \
 	metadata/apis-php.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-notes.idmap \
-	metadata/replication.idmap \
-	metadata/introduction.idmap \
-	metadata/faqs.idmap \
-	metadata/errors-problems.idmap \
 	metadata/charset.idmap \
-	metadata/apis-c.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
+	metadata/errors-problems.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
+	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/mysql-cluster.idmap \
 	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
-	metadata/events.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
 	metadata/replication-configuration.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/apis-perl.idmap \
-	metadata/data-types.idmap \
 	metadata/replication-implementation.idmap \
-	metadata/language-structure.idmap
+	metadata/replication-notes.idmap \
+	metadata/replication-topology.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 dynxml-generated-dba.validpure: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.titles: $(dynxml_generated_dba_SOURCES)
 dynxml-generated-dba.useless: $(dynxml_generated_dba_SOURCES)

@@ -511,22 +511,22 @@
 dynxml_generated_functions_IMAGES =
 dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES)
 dynxml_generated_functions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/precision-math.idmap \
-	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/credits.idmap \
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/credits.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
 	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/data-types.idmap \
-	metadata/language-structure.idmap
+	metadata/language-structure.idmap \
+	metadata/optimization.idmap \
+	metadata/precision-math.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/tutorial.idmap
 dynxml-generated-functions.validpure: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.titles: $(dynxml_generated_functions_SOURCES)
 dynxml-generated-functions.useless: $(dynxml_generated_functions_SOURCES)

@@ -573,19 +573,19 @@
 errors_problems_IMAGES =
 errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
 errors_problems_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-merge.idmap \
-	metadata/se-innodb.idmap \
-	metadata/mysql-cluster.idmap \
+	metadata/dba-core.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/installing.idmap \
-	metadata/extending-mysql.idmap
+	metadata/mysql-cluster.idmap \
+	metadata/optimization.idmap \
+	metadata/replication-notes.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-merge.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/tutorial.idmap \
+	metadata/using-mysql-programs.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -604,15 +604,15 @@
 events_IMAGES =
 events_SOURCES = events.xml $(events_INCLUDES)
 events_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/replication-notes.idmap \
-	metadata/restrictions.idmap \
-	metadata/information-schema.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/functions-core.idmap \
+	metadata/information-schema.idmap \
+	metadata/language-structure.idmap \
+	metadata/replication-notes.idmap \
+	metadata/restrictions.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
-	metadata/triggers.idmap \
-	metadata/language-structure.idmap
+	metadata/triggers.idmap
 events.validpure: $(events_SOURCES)
 events.titles: $(events_SOURCES)
 events.useless: $(events_SOURCES)

@@ -631,13 +631,13 @@
 extending_mysql_IMAGES =
 extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
 extending_mysql_IDMAPS = \
-	metadata/dba-core.idmap \
 	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
+	metadata/dba-core.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
 	metadata/installing.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/language-structure.idmap
+	metadata/language-structure.idmap \
+	metadata/stored-procedures.idmap
 extending-mysql.validpure: $(extending_mysql_SOURCES)
 extending-mysql.titles: $(extending_mysql_SOURCES)
 extending-mysql.useless: $(extending_mysql_SOURCES)

@@ -660,31 +660,31 @@
 	../refman-common/images/drbd-availability-comparison.png
 faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
 faqs_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/apis-php.idmap \
-	../refman-common/metadata/connector-mxj.idmap \
-	metadata/views.idmap \
-	metadata/se-federated.idmap \
-	metadata/spatial-extensions.idmap \
-	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap \
-	metadata/errors-problems.idmap \
 	../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/charset.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis-php.idmap \
+	metadata/charset.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/information-schema.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
-	../refman-common/metadata/connector-net.idmap \
 	metadata/installing.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/storage-engines.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/replication-configuration.idmap \
-	../refman-common/metadata/connector-j.idmap \
+	metadata/replication-notes.idmap \
 	metadata/se-archive.idmap \
-	metadata/data-types.idmap \
-	metadata/triggers.idmap
+	metadata/se-federated.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/triggers.idmap \
+	metadata/views.idmap
 faqs.validpure: $(faqs_SOURCES)
 faqs.titles: $(faqs_SOURCES)
 faqs.useless: $(faqs_SOURCES)

@@ -703,15 +703,15 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/charset.idmap \
 	metadata/dba-core.idmap \
-	metadata/replication-notes.idmap \
-	metadata/partitioning.idmap \
+	metadata/events.idmap \
 	metadata/faqs.idmap \
-	metadata/charset.idmap \
-	metadata/news-5.1.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/events.idmap \
+	metadata/news-5.1.idmap \
+	metadata/partitioning.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax.idmap \
 	metadata/triggers.idmap
 information-schema.validpure: $(information_schema_SOURCES)
 information-schema.titles: $(information_schema_SOURCES)

@@ -731,26 +731,26 @@
 installing_IMAGES =
 installing_SOURCES = installing.xml $(installing_INCLUDES)
 installing_IDMAPS = \
-	metadata/se-myisam.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/optimization.idmap \
-	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap \
-	metadata/news.idmap \
-	metadata/faqs.idmap \
-	metadata/errors-problems.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \
 	metadata/charset.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/news-5.1.idmap \
-	metadata/connectors.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
-	metadata/mysql-cluster.idmap \
+	metadata/connectors.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
-	../refman-common/metadata/information-sources.idmap \
-	metadata/language-structure.idmap
+	metadata/faqs.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/news-5.1.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/replication-notes.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-myisam.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/using-mysql-programs.idmap
 installing.validpure: $(installing_SOURCES)
 installing.titles: $(installing_SOURCES)
 installing.useless: $(installing_SOURCES)

@@ -777,36 +777,36 @@
 introduction_IMAGES =
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
-	metadata/sql-syntax.idmap \
 	../refman-4.1/metadata/introduction.idmap \
-	metadata/replication.idmap \
-	metadata/partitioning.idmap \
-	metadata/news.idmap \
-	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
+	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/gpl-license.idmap \
-	metadata/connectors.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/storage-engines.idmap \
-	metadata/extending-mysql.idmap \
-	metadata/events.idmap \
-	metadata/language-structure.idmap \
-	metadata/views.idmap \
-	metadata/optimization.idmap \
+	metadata/connectors.idmap \
+	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
+	metadata/events.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/faqs.idmap \
-	metadata/tutorial.idmap \
-	../refman-common/metadata/credits.idmap \
-	metadata/information-schema.idmap \
 	metadata/functions-core.idmap \
-	metadata/se-innodb.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/information-schema.idmap \
 	metadata/installing.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/news.idmap \
+	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
 	metadata/replication-configuration.idmap \
+	metadata/replication.idmap \
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap \
-	metadata/apis.idmap
+	metadata/tutorial.idmap \
+	metadata/views.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -827,15 +827,15 @@
 language_structure_IMAGES =
 language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES)
 language_structure_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/introduction.idmap \
-	metadata/errors-problems.idmap \
 	metadata/apis-c.idmap \
+	metadata/apis-perl.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
-	metadata/charset.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/apis-perl.idmap
+	metadata/introduction.idmap \
+	metadata/sql-syntax.idmap
 language-structure.validpure: $(language_structure_SOURCES)
 language-structure.titles: $(language_structure_SOURCES)
 language-structure.useless: $(language_structure_SOURCES)

@@ -925,7 +925,6 @@
 	../refman-common/images/mysql-vstudioplugin-4.png \
 	../refman-common/images/se-federated-structure.png \
 	../refman-common/information-sources.xml \
-	../refman-common/licenses.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/maxdb.en.xml \
 	../refman-common/news-connector-j.xml \

@@ -1089,15 +1088,14 @@
 	images/rolling-restarts.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
-	../refman-4.1/metadata/introduction.idmap \
-	../ndbapi/metadata/ndb-classes.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	metadata/functions-core.idmap \
+	../falcon/metadata/se-falcon.idmap \
 	../ndbapi/metadata/mgm-api.idmap \
-	../refman-common/metadata/gpl-license.idmap \
+	../ndbapi/metadata/ndb-classes.idmap \
+	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
-	metadata/replication-topology.idmap \
-	../falcon/metadata/se-falcon.idmap
+	../refman-common/metadata/gpl-license.idmap \
+	metadata/functions-core.idmap \
+	metadata/replication-topology.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1138,21 +1136,21 @@
 	images/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
+	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-common/metadata/bug-reports.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/using-mysql-programs.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
-	../refman-common/metadata/bug-reports.idmap \
 	metadata/installing.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/replication.idmap \
+	metadata/news-5.1.idmap \
 	metadata/partitioning.idmap \
-	../refman-4.1/metadata/mysql-cluster.idmap \
-	metadata/dba-core.idmap \
+	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
-	metadata/faqs.idmap \
-	metadata/news-5.1.idmap \
-	metadata/data-types.idmap
+	metadata/replication.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/using-mysql-programs.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -1171,24 +1169,25 @@
 news_5_1_IMAGES =
 news_5_1_SOURCES = news-5.1.xml $(news_5_1_INCLUDES)
 news_5_1_IDMAPS = \
-	metadata/introduction.idmap \
+	../ndbapi/metadata/mgm-api.idmap \
 	../ndbapi/metadata/ndb-classes.idmap \
-	metadata/extending-mysql.idmap \
+	metadata/dba-core.idmap \
 	metadata/events.idmap \
-	metadata/information-schema.idmap \
-	metadata/se-innodb.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/information-schema.idmap \
 	metadata/installing.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/partitioning.idmap \
 	metadata/replication-configuration.idmap \
+	metadata/replication-notes.idmap \
 	metadata/se-archive.idmap \
-	../ndbapi/metadata/mgm-api.idmap \
+	metadata/se-innodb.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/partitioning.idmap \
-	metadata/language-structure.idmap \
-	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 news-5.1.validpure: $(news_5_1_SOURCES)
 news-5.1.titles: $(news_5_1_SOURCES)
 news-5.1.useless: $(news_5_1_SOURCES)

@@ -1233,24 +1232,24 @@
 optimization_IMAGES =
 optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
 optimization_IDMAPS = \
-	metadata/introduction.idmap \
 	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/se-innodb.idmap \
 	metadata/functions-core.idmap \
-	metadata/stored-procedures.idmap \
 	metadata/installing.idmap \
+	metadata/introduction.idmap \
+	metadata/language-structure.idmap \
+	metadata/partitioning.idmap \
+	metadata/replication.idmap \
 	metadata/se-archive.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-memory.idmap \
 	metadata/se-myisam.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/se-memory.idmap \
-	metadata/replication.idmap \
-	metadata/partitioning.idmap \
-	metadata/errors-problems.idmap \
 	metadata/storage-engines.idmap \
-	metadata/language-structure.idmap \
-	metadata/dba-core.idmap
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -1270,15 +1269,15 @@
 partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
 partitioning_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/information-schema.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
+	metadata/information-schema.idmap \
 	metadata/installing.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/news-5.1.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/news-5.1.idmap
+	metadata/sql-syntax.idmap
 partitioning.validpure: $(partitioning_SOURCES)
 partitioning.titles: $(partitioning_SOURCES)
 partitioning.useless: $(partitioning_SOURCES)

@@ -1334,13 +1333,12 @@
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)
 replication_configuration_IDMAPS = \
-	metadata/replication-implementation.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/mysql-cluster.idmap \
+	metadata/replication-implementation.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap
+	metadata/stored-procedures.idmap
 replication-configuration.validpure: $(replication_configuration_SOURCES)
 replication-configuration.titles: $(replication_configuration_SOURCES)
 replication-configuration.useless: $(replication_configuration_SOURCES)

@@ -1359,10 +1357,10 @@
 replication_implementation_IMAGES =
 replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
 replication_implementation_IDMAPS = \
+	metadata/dba-core.idmap \
 	metadata/replication-configuration.idmap \
-	metadata/sql-syntax.idmap \
 	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap
 replication-implementation.validpure: $(replication_implementation_SOURCES)
 replication-implementation.titles: $(replication_implementation_SOURCES)
 replication-implementation.useless: $(replication_implementation_SOURCES)

@@ -1381,18 +1379,18 @@
 replication_notes_IMAGES =
 replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES)
 replication_notes_IDMAPS = \
-	metadata/replication-solutions.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/information-schema.idmap \
 	../refman-common/metadata/bug-reports.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/se-innodb.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/information-schema.idmap \
 	metadata/replication-configuration.idmap \
-	metadata/sql-syntax.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/replication-solutions.idmap \
+	metadata/se-innodb.idmap \
 	metadata/se-memory.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 replication-notes.validpure: $(replication_notes_SOURCES)
 replication-notes.titles: $(replication_notes_SOURCES)
 replication-notes.useless: $(replication_notes_SOURCES)

@@ -1422,9 +1420,9 @@
 replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES)
 replication_solutions_IDMAPS = \
 	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
 	metadata/replication-configuration.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap
 replication-solutions.validpure: $(replication_solutions_SOURCES)
 replication-solutions.titles: $(replication_solutions_SOURCES)
 replication-solutions.useless: $(replication_solutions_SOURCES)

@@ -1457,18 +1455,17 @@
 	../refman-common/replication-graphics/submaster-performance.png
 replication_SOURCES = replication.xml $(replication_INCLUDES)
 replication_IDMAPS = \
-	metadata/client-utility-programs.idmap \
-	../refman-4.1/metadata/errors-problems.idmap \
-	metadata/information-schema.idmap \
 	../refman-common/metadata/bug-reports.idmap \
+	metadata/client-utility-programs.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/se-innodb.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/information-schema.idmap \
 	metadata/mysql-cluster.idmap \
-	metadata/sql-syntax.idmap \
+	metadata/se-innodb.idmap \
 	metadata/se-memory.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 replication.validpure: $(replication_SOURCES)
 replication.titles: $(replication_SOURCES)
 replication.useless: $(replication_SOURCES)

@@ -1513,8 +1510,8 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/stored-procedures.idmap \
-	metadata/sql-syntax.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 restrictions.validpure: $(restrictions_SOURCES)
 restrictions.titles: $(restrictions_SOURCES)
 restrictions.useless: $(restrictions_SOURCES)

@@ -1533,8 +1530,8 @@
 se_archive_IMAGES =
 se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
 se_archive_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/spatial-extensions.idmap
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap
 se-archive.validpure: $(se_archive_SOURCES)
 se-archive.titles: $(se_archive_SOURCES)
 se-archive.useless: $(se_archive_SOURCES)

@@ -1631,12 +1628,12 @@
 se_innodb_IMAGES =
 se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
 se_innodb_IDMAPS = \
-	metadata/using-mysql-programs.idmap \
-	metadata/stored-procedures.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
-	metadata/dba-core.idmap
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 se-innodb.validpure: $(se_innodb_SOURCES)
 se-innodb.titles: $(se_innodb_SOURCES)
 se-innodb.useless: $(se_innodb_SOURCES)

@@ -1655,9 +1652,9 @@
 se_memory_IMAGES =
 se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
 se_memory_IDMAPS = \
-	metadata/sql-syntax.idmap \
+	metadata/dba-core.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap
+	metadata/sql-syntax.idmap
 se-memory.validpure: $(se_memory_SOURCES)
 se-memory.titles: $(se_memory_SOURCES)
 se-memory.useless: $(se_memory_SOURCES)

@@ -1697,13 +1694,13 @@
 se_myisam_IMAGES =
 se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES)
 se_myisam_IDMAPS = \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/installing.idmap \
-	metadata/sql-syntax.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/installing.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/charset.idmap
+	metadata/sql-syntax.idmap
 se-myisam.validpure: $(se_myisam_SOURCES)
 se-myisam.titles: $(se_myisam_SOURCES)
 se-myisam.useless: $(se_myisam_SOURCES)

@@ -1722,8 +1719,8 @@
 spatial_extensions_IMAGES =
 spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
 spatial_extensions_IDMAPS = \
-	metadata/sql-syntax.idmap \
-	metadata/apis-c.idmap
+	metadata/apis-c.idmap \
+	metadata/sql-syntax.idmap
 spatial-extensions.validpure: $(spatial_extensions_SOURCES)
 spatial-extensions.titles: $(spatial_extensions_SOURCES)
 spatial-extensions.useless: $(spatial_extensions_SOURCES)

@@ -1742,41 +1739,41 @@
 sql_syntax_IMAGES =
 sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
 sql_syntax_IDMAPS = \
-	metadata/introduction.idmap \
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/apis-c.idmap \
+	metadata/apis.idmap \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/extending-mysql.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/events.idmap \
-	metadata/replication-implementation.idmap \
-	metadata/views.idmap \
-	metadata/se-federated.idmap \
-	metadata/tutorial.idmap \
-	metadata/information-schema.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	metadata/se-innodb.idmap \
+	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/se-archive.idmap \
-	metadata/se-myisam.idmap \
-	metadata/se-memory.idmap \
-	metadata/partitioning.idmap \
-	metadata/errors-problems.idmap \
-	metadata/apis-c.idmap \
-	metadata/se-merge.idmap \
-	metadata/storage-engines.idmap \
+	metadata/information-schema.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
-	metadata/se-csv.idmap \
-	metadata/spatial-extensions.idmap \
+	metadata/mysql-cluster.idmap \
+	metadata/news-5.1.idmap \
 	metadata/optimization.idmap \
+	metadata/partitioning.idmap \
+	metadata/replication-implementation.idmap \
 	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap \
 	metadata/restrictions.idmap \
-	metadata/charset.idmap \
-	metadata/news-5.1.idmap \
+	metadata/se-archive.idmap \
+	metadata/se-csv.idmap \
 	metadata/se-example.idmap \
+	metadata/se-federated.idmap \
+	metadata/se-innodb.idmap \
+	metadata/se-memory.idmap \
+	metadata/se-merge.idmap \
+	metadata/se-myisam.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/storage-engines.idmap \
+	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/data-types.idmap \
-	metadata/apis.idmap
+	metadata/tutorial.idmap \
+	metadata/views.idmap
 sql-syntax.validpure: $(sql_syntax_SOURCES)
 sql-syntax.titles: $(sql_syntax_SOURCES)
 sql-syntax.useless: $(sql_syntax_SOURCES)

@@ -1810,20 +1807,20 @@
 	images/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
+	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/using-mysql-programs.idmap \
-	metadata/mysql-cluster.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/installing.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/sql-syntax.idmap \
+	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/faqs.idmap \
+	metadata/installing.idmap \
 	metadata/language-structure.idmap \
-	metadata/spatial-extensions.idmap \
+	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
-	metadata/dba-core.idmap \
-	metadata/faqs.idmap \
-	metadata/charset.idmap
+	metadata/replication-configuration.idmap \
+	metadata/spatial-extensions.idmap \
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap \
+	metadata/using-mysql-programs.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -1842,15 +1839,15 @@
 stored_procedures_IMAGES =
 stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
 stored_procedures_IDMAPS = \
+	metadata/apis-c.idmap \
+	metadata/dba-core.idmap \
 	metadata/extending-mysql.idmap \
-	metadata/replication-implementation.idmap \
+	metadata/faqs.idmap \
 	metadata/functions-core.idmap \
-	metadata/replication-configuration.idmap \
-	metadata/apis-c.idmap \
 	metadata/language-structure.idmap \
-	metadata/dba-core.idmap \
-	metadata/restrictions.idmap \
-	metadata/faqs.idmap
+	metadata/replication-configuration.idmap \
+	metadata/replication-implementation.idmap \
+	metadata/restrictions.idmap
 stored-procedures.validpure: $(stored_procedures_SOURCES)
 stored-procedures.titles: $(stored_procedures_SOURCES)
 stored-procedures.useless: $(stored_procedures_SOURCES)

@@ -1869,11 +1866,11 @@
 triggers_IMAGES =
 triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
 triggers_IDMAPS = \
-	metadata/stored-procedures.idmap \
+	metadata/faqs.idmap \
 	metadata/installing.idmap \
-	metadata/sql-syntax.idmap \
 	metadata/restrictions.idmap \
-	metadata/faqs.idmap
+	metadata/sql-syntax.idmap \
+	metadata/stored-procedures.idmap
 triggers.validpure: $(triggers_SOURCES)
 triggers.titles: $(triggers_SOURCES)
 triggers.useless: $(triggers_SOURCES)

@@ -1892,18 +1889,18 @@
 tutorial_IMAGES =
 tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
 tutorial_IDMAPS = \
-	metadata/introduction.idmap \
 	metadata/client-utility-programs.idmap \
-	metadata/se-innodb.idmap \
+	metadata/data-types.idmap \
+	metadata/dba-core.idmap \
+	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
 	metadata/installing.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/errors-problems.idmap \
+	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
 	metadata/replication-notes.idmap \
-	metadata/dba-core.idmap \
-	metadata/data-types.idmap
+	metadata/se-innodb.idmap \
+	metadata/sql-syntax.idmap
 tutorial.validpure: $(tutorial_SOURCES)
 tutorial.titles: $(tutorial_SOURCES)
 tutorial.useless: $(tutorial_SOURCES)

@@ -1923,9 +1920,9 @@
 using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
 using_mysql_programs_IDMAPS = \
 	metadata/client-utility-programs.idmap \
-	metadata/mysql-cluster.idmap \
+	metadata/dba-core.idmap \
 	metadata/installing.idmap \
-	metadata/dba-core.idmap
+	metadata/mysql-cluster.idmap
 using-mysql-programs.validpure: $(using_mysql_programs_SOURCES)
 using-mysql-programs.titles: $(using_mysql_programs_SOURCES)
 using-mysql-programs.useless: $(using_mysql_programs_SOURCES)

@@ -1944,11 +1941,11 @@
 views_IMAGES =
 views_SOURCES = views.xml $(views_INCLUDES)
 views_IDMAPS = \
-	metadata/information-schema.idmap \
-	metadata/sql-syntax.idmap \
 	metadata/dba-core.idmap \
+	metadata/faqs.idmap \
+	metadata/information-schema.idmap \
 	metadata/restrictions.idmap \
-	metadata/faqs.idmap
+	metadata/sql-syntax.idmap
 views.validpure: $(views_SOURCES)
 views.titles: $(views_SOURCES)
 views.useless: $(views_SOURCES)


Modified: trunk/refman-common/Makefile.depends
===================================================================
--- trunk/refman-common/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/refman-common/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 4, Lines Added: 10, Lines Deleted: 10; 2459 bytes

@@ -6,12 +6,12 @@
 connector_j_SOURCES = connector-j.xml $(connector_j_INCLUDES)
 connector_j_IDMAPS = \
 	../refman-5.0/metadata/charset.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/dba-core.idmap \
-	metadata/news-connector-j.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \
-	metadata/information-sources.idmap
+	metadata/information-sources.idmap \
+	metadata/news-connector-j.idmap
 connector-j.validpure: $(connector_j_SOURCES)
 connector-j.titles: $(connector_j_SOURCES)
 connector-j.useless: $(connector_j_SOURCES)

@@ -30,9 +30,9 @@
 	images/cmxj-overview.png
 connector_mxj_SOURCES = connector-mxj.xml $(connector_mxj_INCLUDES)
 connector_mxj_IDMAPS = \
-	metadata/news-connector-mxj.idmap \
 	metadata/connector-j.idmap \
-	metadata/information-sources.idmap
+	metadata/information-sources.idmap \
+	metadata/news-connector-mxj.idmap
 connector-mxj.validpure: $(connector_mxj_SOURCES)
 connector-mxj.titles: $(connector_mxj_SOURCES)
 connector-mxj.useless: $(connector_mxj_SOURCES)

@@ -60,8 +60,8 @@
 	../refman-5.0/metadata/apis.idmap \
 	../refman-5.0/metadata/connectors.idmap \
 	../refman-5.0/metadata/dba-core.idmap \
+	metadata/bug-reports.idmap \
 	metadata/connector-vstudioplugin.idmap \
-	metadata/bug-reports.idmap \
 	metadata/news-connector-net.idmap
 connector-net.validpure: $(connector_net_SOURCES)
 connector-net.titles: $(connector_net_SOURCES)

@@ -159,13 +159,13 @@
 	images/myodbc-win-tracing.png
 connector_odbc_SOURCES = connector-odbc.xml $(connector_odbc_INCLUDES)
 connector_odbc_IDMAPS = \
+	../refman-5.0/metadata/apis-c.idmap \
 	../refman-5.0/metadata/charset.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/dba-core.idmap \
-	../refman-5.0/metadata/apis-c.idmap \
-	metadata/news-myodbc.idmap \
 	../refman-5.0/metadata/functions-core.idmap \
-	metadata/information-sources.idmap
+	metadata/information-sources.idmap \
+	metadata/news-myodbc.idmap
 connector-odbc.validpure: $(connector_odbc_SOURCES)
 connector-odbc.titles: $(connector_odbc_SOURCES)
 connector-odbc.useless: $(connector_odbc_SOURCES)


Modified: trunk/ro/administrator/Makefile
===================================================================
--- trunk/ro/administrator/Makefile	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/ro/administrator/Makefile	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 548 bytes

@@ -17,7 +17,7 @@
 IDMAP_MAIN = administrator
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = . ../gui-common ../../refman-5.1 ../../refman-common
+IDMAP_REFS = . ../gui-common $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/ro/administrator/Makefile.depends
===================================================================
--- trunk/ro/administrator/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/ro/administrator/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 25, Lines Added: 78, Lines Deleted: 79; 14512 bytes

@@ -1,8 +1,8 @@
 administrator_INCLUDES = \
-	../common/fixedchars.ent \
-	../gui-common/../common/fixedchars.ent \
+	../../common/fixedchars.ent \
+	../gui-common/../../common/fixedchars.ent \
+	../gui-common/../../refman-common/urls.ent \
 	../gui-common/../gui-common/gui-common.ent \
-	../gui-common/../refman-common/urls.ent \
 	../gui-common/all-entities.ent \
 	../gui-common/appendix-common-files.xml \
 	../gui-common/appendix-connection-storage.xml \

@@ -82,19 +82,18 @@
 	images/user-information.png
 administrator_SOURCES = administrator.xml $(administrator_INCLUDES)
 administrator_IDMAPS = \
-	../refman-5.1/metadata/installing.idmap \
-	../refman-5.1/metadata/dba-core.idmap \
-	../refman-5.1/metadata/errors-problems.idmap \
-	../refman-5.1/metadata/using-mysql-programs.idmap \
-	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/storage-engines.idmap \
-	../gui-common/metadata/chapter-upgrade-all.idmap \
-	../refman-5.1/metadata/client-utility-programs.idmap \
-	../refman-5.1/metadata/se-myisam.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-5.1/metadata/se-merge.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/replication-configuration.idmap
+	../../refman-5.1/metadata/client-utility-programs.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 \
+	../../refman-5.1/metadata/replication-configuration.idmap \
+	../../refman-5.1/metadata/se-merge.idmap \
+	../../refman-5.1/metadata/se-myisam.idmap \
+	../../refman-5.1/metadata/sql-syntax.idmap \
+	../../refman-5.1/metadata/storage-engines.idmap \
+	../../refman-5.1/metadata/using-mysql-programs.idmap \
+	../../refman-common/metadata/bug-reports.idmap
 administrator.validpure: $(administrator_SOURCES)
 administrator.titles: $(administrator_SOURCES)
 administrator.useless: $(administrator_SOURCES)

@@ -105,15 +104,15 @@
 administrator-remprepped.xml: $(administrator_SOURCES) $(administrator_IDMAPS)
 
 backup_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 backup_IMAGES =
 backup_SOURCES = backup.xml $(backup_INCLUDES)
 backup_IDMAPS = \
-	metadata/main-window.idmap \
-	../refman-5.1/metadata/client-utility-programs.idmap \
-	metadata/chapter-options-administrator.idmap
+	../../refman-5.1/metadata/client-utility-programs.idmap \
+	metadata/chapter-options-administrator.idmap \
+	metadata/main-window.idmap
 backup.validpure: $(backup_SOURCES)
 backup.titles: $(backup_SOURCES)
 backup.useless: $(backup_SOURCES)

@@ -124,16 +123,16 @@
 backup-remprepped.xml: $(backup_SOURCES) $(backup_IDMAPS)
 
 catalogs_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 catalogs_IMAGES =
 catalogs_SOURCES = catalogs.xml $(catalogs_INCLUDES)
 catalogs_IDMAPS = \
-	metadata/main-window.idmap \
-	../refman-5.1/metadata/optimization.idmap \
-	../refman-5.1/metadata/sql-syntax.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap
+	../../refman-5.1/metadata/optimization.idmap \
+	../../refman-5.1/metadata/sql-syntax.idmap \
+	../gui-common/metadata/chapter-table-editor.idmap \
+	metadata/main-window.idmap
 catalogs.validpure: $(catalogs_SOURCES)
 catalogs.titles: $(catalogs_SOURCES)
 catalogs.useless: $(catalogs_SOURCES)

@@ -144,16 +143,16 @@
 catalogs-remprepped.xml: $(catalogs_SOURCES) $(catalogs_IDMAPS)
 
 chapter_options_administrator_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 chapter_options_administrator_IMAGES =
 chapter_options_administrator_SOURCES = chapter-options-administrator.xml $(chapter_options_administrator_INCLUDES)
 chapter_options_administrator_IDMAPS = \
-	../refman-5.1/metadata/dba-core.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
+	metadata/backup.idmap \
 	metadata/health.idmap \
-	metadata/user-administration.idmap \
-	metadata/backup.idmap
+	metadata/user-administration.idmap
 chapter-options-administrator.validpure: $(chapter_options_administrator_SOURCES)
 chapter-options-administrator.titles: $(chapter_options_administrator_SOURCES)
 chapter-options-administrator.useless: $(chapter_options_administrator_SOURCES)

@@ -164,7 +163,7 @@
 chapter-options-administrator-remprepped.xml: $(chapter_options_administrator_SOURCES) $(chapter_options_administrator_IDMAPS)
 
 connection_dialog_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/configure-service-mode-connection.png \

@@ -176,13 +175,13 @@
 	images/connection.png
 connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES)
 connection_dialog_IDMAPS = \
-	../refman-5.1/metadata/dba-core.idmap \
-	metadata/startup-variables.idmap \
-	metadata/main-window.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 \
-	../gui-common/metadata/appendix-connection-storage.idmap \
-	metadata/service-control.idmap
+	metadata/main-window.idmap \
+	metadata/service-control.idmap \
+	metadata/startup-variables.idmap
 connection-dialog.validpure: $(connection_dialog_SOURCES)
 connection-dialog.titles: $(connection_dialog_SOURCES)
 connection-dialog.useless: $(connection_dialog_SOURCES)

@@ -206,7 +205,7 @@
 copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
 
 health_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/graph-settings.png

@@ -214,11 +213,11 @@
 	images/graph-settings.png
 health_SOURCES = health.xml $(health_INCLUDES)
 health_IDMAPS = \
-	../refman-5.1/metadata/dba-core.idmap \
-	../refman-5.1/metadata/errors-problems.idmap \
-	metadata/startup-variables.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 \
-	../refman-5.1/metadata/sql-syntax.idmap
+	metadata/startup-variables.idmap
 health.validpure: $(health_SOURCES)
 health.titles: $(health_SOURCES)
 health.useless: $(health_SOURCES)

@@ -229,13 +228,13 @@
 health-remprepped.xml: $(health_SOURCES) $(health_IDMAPS)
 
 introduction_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 introduction_IMAGES =
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
-	../refman-5.1/metadata/client-utility-programs.idmap
+	../../refman-5.1/metadata/client-utility-programs.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -260,7 +259,7 @@
 legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
 
 main_window_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/mainwindow.png \

@@ -270,20 +269,20 @@
 	images/marked-area.png
 main_window_SOURCES = main-window.xml $(main_window_INCLUDES)
 main_window_IDMAPS = \
-	metadata/server-logs.idmap \
-	metadata/health.idmap \
-	metadata/startup-variables.idmap \
-	metadata/restore.idmap \
-	metadata/server-information.idmap \
-	metadata/replication-status.idmap \
 	../gui-common/metadata/chapter-options-connections.idmap \
-	metadata/server-connections.idmap \
-	metadata/connection-dialog.idmap \
-	metadata/catalogs.idmap \
 	metadata/administrator.idmap \
-	metadata/user-administration.idmap \
 	metadata/backup.idmap \
-	metadata/service-control.idmap
+	metadata/catalogs.idmap \
+	metadata/connection-dialog.idmap \
+	metadata/health.idmap \
+	metadata/replication-status.idmap \
+	metadata/restore.idmap \
+	metadata/server-connections.idmap \
+	metadata/server-information.idmap \
+	metadata/server-logs.idmap \
+	metadata/service-control.idmap \
+	metadata/startup-variables.idmap \
+	metadata/user-administration.idmap
 main-window.validpure: $(main_window_SOURCES)
 main-window.titles: $(main_window_SOURCES)
 main-window.useless: $(main_window_SOURCES)

@@ -294,7 +293,7 @@
 main-window-remprepped.xml: $(main_window_SOURCES) $(main_window_IDMAPS)
 
 replication_status_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/replication.png

@@ -302,7 +301,7 @@
 	images/replication.png
 replication_status_SOURCES = replication-status.xml $(replication_status_INCLUDES)
 replication_status_IDMAPS = \
-	../refman-5.1/metadata/replication-configuration.idmap
+	../../refman-5.1/metadata/replication-configuration.idmap
 replication-status.validpure: $(replication_status_SOURCES)
 replication-status.titles: $(replication_status_SOURCES)
 replication-status.useless: $(replication_status_SOURCES)

@@ -313,7 +312,7 @@
 replication-status-remprepped.xml: $(replication_status_SOURCES) $(replication_status_IDMAPS)
 
 restore_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/restore-content.png

@@ -332,14 +331,14 @@
 restore-remprepped.xml: $(restore_SOURCES) $(restore_IDMAPS)
 
 server_connections_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 server_connections_IMAGES =
 server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES)
 server_connections_IDMAPS = \
-	../refman-5.1/metadata/dba-core.idmap \
-	../refman-5.1/metadata/sql-syntax.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)
 server-connections.titles: $(server_connections_SOURCES)

@@ -351,7 +350,7 @@
 server-connections-remprepped.xml: $(server_connections_SOURCES) $(server_connections_IDMAPS)
 
 server_information_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 server_information_IMAGES =

@@ -367,7 +366,7 @@
 server-information-remprepped.xml: $(server_information_SOURCES) $(server_information_IDMAPS)
 
 server_logs_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/server-logs-general-log.png

@@ -375,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/dba-core.idmap \
+	../../refman-5.1/metadata/dba-core.idmap \
 	metadata/startup-variables.idmap
 server-logs.validpure: $(server_logs_SOURCES)
 server-logs.titles: $(server_logs_SOURCES)

@@ -387,15 +386,15 @@
 server-logs-remprepped.xml: $(server_logs_SOURCES) $(server_logs_IDMAPS)
 
 service_control_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 service_control_IMAGES =
 service_control_SOURCES = service-control.xml $(service_control_INCLUDES)
 service_control_IDMAPS = \
-	../refman-5.1/metadata/installing.idmap \
-	../refman-5.1/metadata/dba-core.idmap \
-	../refman-5.1/metadata/storage-engines.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
 service-control.validpure: $(service_control_SOURCES)
 service-control.titles: $(service_control_SOURCES)

@@ -407,13 +406,13 @@
 service-control-remprepped.xml: $(service_control_SOURCES) $(service_control_IDMAPS)
 
 startup_variables_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 startup_variables_IMAGES =
 startup_variables_SOURCES = startup-variables.xml $(startup_variables_INCLUDES)
 startup_variables_IDMAPS = \
-	../refman-5.1/metadata/using-mysql-programs.idmap \
+	../../refman-5.1/metadata/using-mysql-programs.idmap \
 	metadata/service-control.idmap
 startup-variables.validpure: $(startup_variables_SOURCES)
 startup-variables.titles: $(startup_variables_SOURCES)

@@ -425,7 +424,7 @@
 startup-variables-remprepped.xml: $(startup_variables_SOURCES) $(startup_variables_IDMAPS)
 
 tray_monitor_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/system-tray.png

@@ -444,7 +443,7 @@
 tray-monitor-remprepped.xml: $(tray_monitor_SOURCES) $(tray_monitor_IDMAPS)
 
 user_administration_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent \
 	images/user-accounts.png \

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

@@ -467,17 +466,17 @@
 user-administration-remprepped.xml: $(user_administration_SOURCES) $(user_administration_IDMAPS)
 
 xml_files_INCLUDES = \
-	../common/fixedchars.ent \
+	../../common/fixedchars.ent \
 	../gui-common/gui-common.ent \
 	all-entities.ent
 xml_files_IMAGES =
 xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES)
 xml_files_IDMAPS = \
-	metadata/health.idmap \
-	../gui-common/metadata/chapter-options-general.idmap \
-	../gui-common/metadata/appendix-translator-notes.idmap \
 	../gui-common/metadata/appendix-connection-storage.idmap \
-	metadata/administrator.idmap
+	../gui-common/metadata/appendix-translator-notes.idmap \
+	../gui-common/metadata/chapter-options-general.idmap \
+	metadata/administrator.idmap \
+	metadata/health.idmap
 xml-files.validpure: $(xml_files_SOURCES)
 xml-files.titles: $(xml_files_SOURCES)
 xml-files.useless: $(xml_files_SOURCES)


Modified: trunk/ro/gui-common/Makefile
===================================================================
--- trunk/ro/gui-common/Makefile	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/ro/gui-common/Makefile	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 899 bytes

@@ -1,7 +1,7 @@
 # Makefile for MySQL Reference Manual
 
 # Location of repository root relative to current directory
-REPO_ROOT = ..
+REPO_ROOT = ../..
 
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d

@@ -17,7 +17,7 @@
 IDMAP_MAIN = guibook
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
+IDMAP_REFS = . $(REPO_ROOT)/workbench $(REPO_ROOT)/query-browser ../administrator $(REPO_ROOT)/migration-toolkit $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables


Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends	2007-05-25 14:55:11 UTC (rev 6573)
+++ trunk/workbench/Makefile.depends	2007-05-25 15:06:24 UTC (rev 6574)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1485 bytes

@@ -52,9 +52,9 @@
 	images/workbench-windows.png
 overview_SOURCES = overview.xml $(overview_INCLUDES)
 overview_IDMAPS = \
+	../gui-common/metadata/chapter-grt-shell.idmap \
+	../gui-common/metadata/chapter-table-editor.idmap \
 	metadata/reverse-engineering.idmap \
-	../gui-common/metadata/chapter-table-editor.idmap \
-	../gui-common/metadata/chapter-grt-shell.idmap \
 	metadata/using.idmap
 overview.validpure: $(overview_SOURCES)
 overview.titles: $(overview_SOURCES)

@@ -134,13 +134,13 @@
 	images/workbench-windows.png
 workbench_SOURCES = workbench.xml $(workbench_INCLUDES)
 workbench_IDMAPS = \
+	../gui-common/metadata/chapter-options-editors.idmap \
+	../migration-toolkit/metadata/indepth.idmap \
 	../migration-toolkit/metadata/scripted-migration.idmap \
-	../gui-common/metadata/chapter-options-editors.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
+	../refman-5.1/metadata/se-myisam.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../migration-toolkit/metadata/indepth.idmap \
-	../refman-common/metadata/bug-reports.idmap \
-	../refman-5.1/metadata/se-myisam.idmap
+	../refman-common/metadata/bug-reports.idmap
 workbench.validpure: $(workbench_SOURCES)
 workbench.titles: $(workbench_SOURCES)
 workbench.useless: $(workbench_SOURCES)


Thread
svn commit - mysqldoc@docsrva: r6574 - in trunk: . administrator falcon guibook migration-toolkit mysqldoc-guide mysqlqb mysqltest ndbapi query-browse...paul25 May