svn commit - mysqldoc@docsrva: r8770 - in trunk: it/refman-common mysqlqb pt/refman-common refman-4.1 refman-5.0 refman-5.1 refman-6.0

[mcbrown]

Author: mcbrown
Date: 2007-11-16 16:30:35 +0100 (Fri, 16 Nov 2007)
New Revision: 8770

Log:
Updating dependencies 



Modified:
   trunk/it/refman-common/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/pt/refman-common/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-6.0/Makefile.depends


Modified: trunk/it/refman-common/Makefile.depends
===================================================================
--- trunk/it/refman-common/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/it/refman-common/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1208 bytes

@@ -7,9 +7,9 @@
 connector_j_IMAGES =
 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/internationalization.idmap \
 	../../refman-5.0/metadata/sql-syntax.idmap \
 	metadata/connector-j.idmap \
 	metadata/information-sources.idmap \

@@ -164,10 +164,10 @@
 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/functions-core.idmap \
+	../../refman-5.0/metadata/internationalization.idmap \
 	metadata/connector-odbc.idmap \
 	metadata/information-sources.idmap \
 	metadata/news-codbc-core.idmap


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/mysqlqb/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 4, Lines Added: 1, Lines Deleted: 3; 1538 bytes

@@ -13,7 +13,6 @@
 mysqlqb_IDMAPS = \
 	../refman-5.0/metadata/apis-c.idmap \
 	../refman-5.0/metadata/apis.idmap \
-	../refman-5.0/metadata/charset.idmap \
 	../refman-5.0/metadata/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
 	../refman-5.0/metadata/dba-core.idmap \

@@ -69,7 +68,6 @@
 mysqlqb_functions_SOURCES = mysqlqb_functions.xml $(mysqlqb_functions_INCLUDES)
 mysqlqb_functions_IDMAPS = \
 	../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 \

@@ -104,7 +102,6 @@
 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/client-utility-programs.idmap \
 	../refman-5.0/metadata/data-types.idmap \
 	../refman-5.0/metadata/dba-core.idmap \

@@ -112,6 +109,7 @@
 	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-cs.idmap \
+	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/language-structure.idmap \
 	../refman-5.0/metadata/mysql-cluster.idmap \


Modified: trunk/pt/refman-common/Makefile.depends
===================================================================
--- trunk/pt/refman-common/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/pt/refman-common/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1208 bytes

@@ -7,9 +7,9 @@
 connector_j_IMAGES =
 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/internationalization.idmap \
 	../../refman-5.0/metadata/sql-syntax.idmap \
 	metadata/connector-j.idmap \
 	metadata/information-sources.idmap \

@@ -164,10 +164,10 @@
 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/functions-core.idmap \
+	../../refman-5.0/metadata/internationalization.idmap \
 	metadata/connector-odbc.idmap \
 	metadata/information-sources.idmap \
 	metadata/news-codbc-core.idmap


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/refman-4.1/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 12, Lines Added: 46, Lines Deleted: 46; 9009 bytes

@@ -779,11 +779,15 @@
 	../refman-common/connector-php.xml \
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/credits.xml \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
 	../refman-common/images/published/cmxj-overview.png \
 	../refman-common/images/published/cnet-win-install-step1.png \
 	../refman-common/images/published/cnet-win-install-step2.png \
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/myaccess-odbc.png \
 	../refman-common/images/published/myaccess.png \
 	../refman-common/images/published/myarchitecture.png \

@@ -827,7 +831,11 @@
 	../refman-common/images/published/mysql-vstudioplugin-1.png \
 	../refman-common/images/published/mysql-vstudioplugin-3.png \
 	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/images/published/proxy-architecture.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/information-sources.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/mysql-proxy.xml \

@@ -861,14 +869,6 @@
 	errors-problems.xml \
 	extending-mysql.xml \
 	functions-core.xml \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/published/blackhole-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png \
 	installing.xml \
 	internationalization.xml \
 	introduction.xml \

@@ -906,11 +906,15 @@
 	using-mysql-programs.xml \
 	versions.ent
 manual_IMAGES = \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
 	../refman-common/images/published/cmxj-overview.png \
 	../refman-common/images/published/cnet-win-install-step1.png \
 	../refman-common/images/published/cnet-win-install-step2.png \
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/myaccess-odbc.png \
 	../refman-common/images/published/myaccess.png \
 	../refman-common/images/published/myarchitecture.png \

@@ -954,15 +958,11 @@
 	../refman-common/images/published/mysql-vstudioplugin-1.png \
 	../refman-common/images/published/mysql-vstudioplugin-3.png \
 	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/images/published/proxy-architecture.png \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/published/blackhole-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \

@@ -1187,12 +1187,12 @@
 mysql_cluster_multi_computer_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/multi-comp-1.png \
 	versions.ent
 mysql_cluster_multi_computer_IMAGES = \
-	images/multi-comp-1.png
+	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml
$(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
 	metadata/dba-core.idmap \

@@ -1217,16 +1217,16 @@
 mysql_cluster_overview_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-components-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
 	versions.ent
 mysql_cluster_overview_IMAGES = \
-	images/cluster-components-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml
$(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \

@@ -1269,14 +1269,14 @@
 mysql_cluster_upgrade_downgrade_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-upgrade-downgrade-table.png \
-	images/rolling-restarts.png \
 	versions.ent
 mysql_cluster_upgrade_downgrade_IMAGES = \
-	images/cluster-upgrade-downgrade-table.png \
-	images/rolling-restarts.png
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml
$(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
 	metadata/installing.idmap \

@@ -1294,12 +1294,12 @@
 mysql_cluster_utilities_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/ndb-size-pl-1.png \
 	versions.ent
 mysql_cluster_utilities_IMAGES = \
-	images/ndb-size-pl-1.png
+	../refman-common/images/published/ndb-size-pl-1.png
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml
$(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \

@@ -1322,15 +1322,15 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/multi-comp-1.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png \
 	mysql-cluster-backup.xml \
 	mysql-cluster-configuration.xml \
 	mysql-cluster-faq.xml \

@@ -1345,13 +1345,13 @@
 	mysql-cluster-utilities.xml \
 	versions.ent
 mysql_cluster_IMAGES = \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/multi-comp-1.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \

@@ -1732,13 +1732,13 @@
 storage_engines_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/blackhole-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/published/blackhole-1.png \
 	se-innodb.xml \
 	versions.ent
 storage_engines_IMAGES = \
-	images/published/blackhole-1.png
+	../refman-common/images/published/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
 	metadata/client-utility-programs.idmap \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/refman-5.0/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 16, Lines Added: 49, Lines Deleted: 49; 10730 bytes

@@ -1151,12 +1151,16 @@
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/credits.xml \
 	../refman-common/images/active-master-mysql-server.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
 	../refman-common/images/published/cmxj-overview.png \
 	../refman-common/images/published/cnet-win-install-step1.png \
 	../refman-common/images/published/cnet-win-install-step2.png \
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \
 	../refman-common/images/published/myaccess.png \

@@ -1201,9 +1205,13 @@
 	../refman-common/images/published/mysql-vstudioplugin-1.png \
 	../refman-common/images/published/mysql-vstudioplugin-3.png \
 	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/images/published/proxy-architecture.png \
 	../refman-common/images/published/redundancy-after.png \
 	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png \
 	../refman-common/information-sources.xml \

@@ -1245,11 +1253,6 @@
 	faqs.xml \
 	functions-core.xml \
 	ha.xml \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/published/blackhole-1.png \
 	images/published/mysql-cfg-fig1.png \
 	images/published/mysql-cfg-fig10.png \
 	images/published/mysql-cfg-fig2.png \

@@ -1265,9 +1268,6 @@
 	images/published/mysql-es-win32-fig3.png \
 	images/published/mysql-es-win32-fig4.png \
 	images/published/mysql-esi-win32-uninst.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png \
 	information-schema.xml \
 	installing-cs.xml \
 	installing-es.xml \

@@ -1326,12 +1326,16 @@
 	views.xml
 manual_IMAGES = \
 	../refman-common/images/active-master-mysql-server.png \
+	../refman-common/images/published/blackhole-1.png \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
 	../refman-common/images/published/cmxj-overview.png \
 	../refman-common/images/published/cnet-win-install-step1.png \
 	../refman-common/images/published/cnet-win-install-step2.png \
 	../refman-common/images/published/cnet-win-install-step3.png \
 	../refman-common/images/published/cnet-win-install-step4.png \
 	../refman-common/images/published/drbd-main.png \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/myaccess-odbc.png \
 	../refman-common/images/published/myaccess.png \

@@ -1376,16 +1380,15 @@
 	../refman-common/images/published/mysql-vstudioplugin-1.png \
 	../refman-common/images/published/mysql-vstudioplugin-3.png \
 	../refman-common/images/published/mysql-vstudioplugin-4.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/images/published/proxy-architecture.png \
 	../refman-common/images/published/redundancy-after.png \
 	../refman-common/images/published/redundancy-before.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/images/published/scaleout.png \
 	../refman-common/images/published/submaster-performance.png \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/published/blackhole-1.png \
 	images/published/mysql-cfg-fig1.png \
 	images/published/mysql-cfg-fig10.png \
 	images/published/mysql-cfg-fig2.png \

@@ -1400,10 +1403,7 @@
 	images/published/mysql-es-win32-fig2.png \
 	images/published/mysql-es-win32-fig3.png \
 	images/published/mysql-es-win32-fig4.png \
-	images/published/mysql-esi-win32-uninst.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png
+	images/published/mysql-esi-win32-uninst.png
 manual_SOURCES = manual.xml $(manual_INCLUDES)
 manual_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \

@@ -1622,12 +1622,12 @@
 mysql_cluster_multi_computer_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/multi-comp-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/multi-comp-1.png \
 	versions.ent
 mysql_cluster_multi_computer_IMAGES = \
-	images/multi-comp-1.png
+	../refman-common/images/published/multi-comp-1.png
 mysql_cluster_multi_computer_SOURCES = mysql-cluster-multi-computer.xml
$(mysql_cluster_multi_computer_INCLUDES)
 mysql_cluster_multi_computer_IDMAPS = \
 	metadata/installing-cs.idmap \

@@ -1651,16 +1651,16 @@
 mysql_cluster_overview_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-components-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
 	versions.ent
 mysql_cluster_overview_IMAGES = \
-	images/cluster-components-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png
 mysql_cluster_overview_SOURCES = mysql-cluster-overview.xml
$(mysql_cluster_overview_INCLUDES)
 mysql_cluster_overview_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \

@@ -1722,14 +1722,14 @@
 mysql_cluster_upgrade_downgrade_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-upgrade-downgrade-table.png \
-	images/rolling-restarts.png \
 	versions.ent
 mysql_cluster_upgrade_downgrade_IMAGES = \
-	images/cluster-upgrade-downgrade-table.png \
-	images/rolling-restarts.png
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_upgrade_downgrade_SOURCES = mysql-cluster-upgrade-downgrade.xml
$(mysql_cluster_upgrade_downgrade_INCLUDES)
 mysql_cluster_upgrade_downgrade_IDMAPS = \
 	metadata/installing-cs.idmap \

@@ -1747,12 +1747,12 @@
 mysql_cluster_utilities_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/ndb-size-pl-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/ndb-size-pl-1.png \
 	versions.ent
 mysql_cluster_utilities_IMAGES = \
-	images/ndb-size-pl-1.png
+	../refman-common/images/published/ndb-size-pl-1.png
 mysql_cluster_utilities_SOURCES = mysql-cluster-utilities.xml
$(mysql_cluster_utilities_INCLUDES)
 mysql_cluster_utilities_IDMAPS = \
 	../ndbapi/metadata/ndbapi.idmap \

@@ -1775,15 +1775,15 @@
 mysql_cluster_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/multi-comp-1.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png \
 	mysql-cluster-backup.xml \
 	mysql-cluster-configuration.xml \
 	mysql-cluster-glossary.xml \

@@ -1798,13 +1798,13 @@
 	mysql-cluster-utilities.xml \
 	versions.ent
 mysql_cluster_IMAGES = \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/ndb-size-pl-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png
+	../refman-common/images/published/cluster-components-1.png \
+	../refman-common/images/published/cluster-upgrade-downgrade-table.png \
+	../refman-common/images/published/multi-comp-1.png \
+	../refman-common/images/published/ndb-size-pl-1.png \
+	../refman-common/images/published/replicas-groups-1-1.png \
+	../refman-common/images/published/replicas-groups-1-2.png \
+	../refman-common/images/published/rolling-restarts.png
 mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
 mysql_cluster_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \

@@ -2308,12 +2308,12 @@
 se_blackhole_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/blackhole-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/published/blackhole-1.png \
 	versions.ent
 se_blackhole_IMAGES = \
-	images/published/blackhole-1.png
+	../refman-common/images/published/blackhole-1.png
 se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
 se_blackhole_IDMAPS = \
 	metadata/replication-configuration.idmap

@@ -2549,9 +2549,9 @@
 storage_engines_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
+	../refman-common/images/published/blackhole-1.png \
 	../refman-common/urls.ent \
 	all-entities.ent \
-	images/published/blackhole-1.png \
 	se-archive.xml \
 	se-bdb.xml \
 	se-blackhole.xml \

@@ -2564,7 +2564,7 @@
 	se-myisam.xml \
 	versions.ent
 storage_engines_IMAGES = \
-	images/published/blackhole-1.png
+	../refman-common/images/published/blackhole-1.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
 	metadata/client-utility-programs.idmap \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/refman-5.1/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 15, Lines Added: 6, Lines Deleted: 13; 4868 bytes

@@ -365,11 +365,11 @@
 	metadata/apis-c.idmap \
 	metadata/apis-php.idmap \
 	metadata/apis.idmap \
-	metadata/charset.idmap \
 	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/internationalization.idmap \
 	metadata/sql-syntax.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)

@@ -389,7 +389,6 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \

@@ -653,7 +652,6 @@
 dynxml_local_functions_IDMAPS = \
 	../refman-common/metadata/credits.idmap \
 	metadata/apis-c.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \

@@ -696,7 +694,6 @@
 	../ndbapi/metadata/class-ndbtransaction.idmap \
 	../ndbapi/metadata/mgm-api.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
-	metadata/charset.idmap \
 	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \

@@ -842,7 +839,6 @@
 	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-php.idmap \
-	metadata/charset.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \

@@ -851,6 +847,7 @@
 	metadata/ha.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	metadata/optimization.idmap \
 	metadata/replication-configuration.idmap \

@@ -921,11 +918,11 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
+	metadata/internationalization.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	metadata/news-5.1-core.idmap \
 	metadata/partitioning.idmap \

@@ -954,7 +951,6 @@
 	../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/dba-core.idmap \

@@ -993,7 +989,6 @@
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/charset.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \

@@ -1080,7 +1075,6 @@
 language_structure_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/apis-perl.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \

@@ -1403,7 +1397,6 @@
 	metadata/apis-php.idmap \
 	metadata/apis-progutils.idmap \
 	metadata/apis.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \

@@ -2432,11 +2425,11 @@
 se_myisam_IMAGES =
 se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES)
 se_myisam_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/sql-syntax.idmap
 se-myisam.validpure: $(se_myisam_SOURCES)

@@ -2481,7 +2474,6 @@
 	../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 \

@@ -2490,6 +2482,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \
+	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \

@@ -2548,12 +2541,12 @@
 	../refman-common/images/published/se-federated-structure.png
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \
 	metadata/faqs.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/language-structure.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	metadata/optimization.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2007-11-16 15:23:55 UTC (rev 8769)
+++ trunk/refman-6.0/Makefile.depends	2007-11-16 15:30:35 UTC (rev 8770)
Changed blocks: 14, Lines Added: 6, Lines Deleted: 12; 4559 bytes

@@ -365,11 +365,11 @@
 	metadata/apis-c.idmap \
 	metadata/apis-php.idmap \
 	metadata/apis.idmap \
-	metadata/charset.idmap \
 	metadata/connectors.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/internationalization.idmap \
 	metadata/sql-syntax.idmap
 connectors.validpure: $(connectors_SOURCES)
 connectors.titles: $(connectors_SOURCES)

@@ -389,7 +389,6 @@
 data_types_IMAGES =
 data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
 data_types_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \

@@ -617,7 +616,6 @@
 dynxml_local_functions_IDMAPS = \
 	../refman-common/metadata/credits.idmap \
 	metadata/apis-c.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \

@@ -822,7 +820,6 @@
 	../refman-common/metadata/connector-odbc.idmap \
 	metadata/apis-c.idmap \
 	metadata/apis-php.idmap \
-	metadata/charset.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \

@@ -831,6 +828,7 @@
 	metadata/ha.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/mysql-cluster-configuration.idmap \
 	metadata/mysql-cluster-disk-data.idmap \
 	metadata/mysql-cluster-interconnects.idmap \

@@ -912,11 +910,11 @@
 information_schema_IMAGES =
 information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
 information_schema_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/dba-core.idmap \
 	metadata/events.idmap \
 	metadata/faqs.idmap \
 	metadata/information-schema.idmap \
+	metadata/internationalization.idmap \
 	metadata/mysql-cluster-disk-data.idmap \
 	metadata/partitioning.idmap \
 	metadata/replication-notes.idmap \

@@ -944,7 +942,6 @@
 	../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/dba-core.idmap \

@@ -983,7 +980,6 @@
 internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
 internationalization_IDMAPS = \
 	../refman-common/metadata/information-sources.idmap \
-	metadata/charset.idmap \
 	metadata/data-types.idmap \
 	metadata/dba-core.idmap \
 	metadata/faqs.idmap \

@@ -1071,7 +1067,6 @@
 language_structure_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/apis-perl.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \

@@ -1388,7 +1383,6 @@
 	metadata/apis-php.idmap \
 	metadata/apis-progutils.idmap \
 	metadata/apis.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/connectors.idmap \
 	metadata/data-types.idmap \

@@ -2483,11 +2477,11 @@
 se_myisam_IMAGES =
 se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES)
 se_myisam_IDMAPS = \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/sql-syntax.idmap
 se-myisam.validpure: $(se_myisam_SOURCES)

@@ -2532,7 +2526,6 @@
 	../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 \

@@ -2541,6 +2534,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
 	metadata/information-schema.idmap \
+	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure.idmap \
 	metadata/mysql-cluster-disk-data.idmap \

@@ -2604,12 +2598,12 @@
 storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
 storage_engines_IDMAPS = \
 	../query-browser/metadata/query-browser.idmap \
-	metadata/charset.idmap \
 	metadata/client-utility-programs.idmap \
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs.idmap \
 	metadata/installing.idmap \
+	metadata/internationalization.idmap \
 	metadata/language-structure.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \