List:Commits« Previous MessageNext Message »
From:paul Date:December 7 2007 6:18pm
Subject:svn commit - mysqldoc@docsrva: r9200 - in trunk: . administrator arbitrary guibook refman-4.1 refman-5.0 refman-5.1 refman-6.0 ro/administrator th/adm...
View as plain text  
Author: paul
Date: 2007-12-07 19:18:41 +0100 (Fri, 07 Dec 2007)
New Revision: 9200

Log:
 r34027@arctic:  paul | 2007-12-07 12:11:33 -0600
 Update dependencies.


Modified:
   trunk/administrator/Makefile.depends
   trunk/arbitrary/Makefile.depends
   trunk/guibook/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
   trunk/ro/administrator/Makefile.depends
   trunk/th/administrator/Makefile.depends

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


Modified: trunk/administrator/Makefile.depends
===================================================================
--- trunk/administrator/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/administrator/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1264 bytes

@@ -88,12 +88,12 @@
 	../refman-5.1/metadata/installing-core.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam-core.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 \
 	metadata/administrator.idmap \
 	metadata/backup.idmap \

@@ -421,7 +421,7 @@
 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/programs-using.idmap \
 	metadata/service-control.idmap
 startup-variables.validpure: $(startup_variables_SOURCES)
 startup-variables.titles: $(startup_variables_SOURCES)


Modified: trunk/arbitrary/Makefile.depends
===================================================================
--- trunk/arbitrary/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/arbitrary/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 5, Lines Added: 2, Lines Deleted: 6; 21879 bytes

@@ -175,7 +175,6 @@
 	../refman-common/images/published/myodbc-win-install-step2.png \
 	../refman-common/images/published/myodbc-win-install-step3.png \
 	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \

@@ -228,7 +227,6 @@
 	../refman-common/images/published/myodbc-win-install-step2.png \
 	../refman-common/images/published/myodbc-win-install-step3.png \
 	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \

@@ -311,7 +309,6 @@
 	../refman-common/images/published/myodbc-win-install-step2.png \
 	../refman-common/images/published/myodbc-win-install-step3.png \
 	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \

@@ -376,7 +373,6 @@
 	../refman-common/images/published/myodbc-win-install-step2.png \
 	../refman-common/images/published/myodbc-win-install-step3.png \
 	../refman-common/images/published/myodbc-win-install-step4.png \
-	../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-advanced.png \
 	../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png \

@@ -416,11 +412,11 @@
 	$(RM) connector-j.xml connector-j-arbitrary.xml
 	$(MAKE) connector-j.xml
 
-connectors-aspec.xml.cj-news.none.appendix.xml connectors-aspec.xml.connector-j.none.chapter.xml connectors-aspec.xml.connector-mxj.none.chapter.xml connectors-aspec.xml.connector-net-news.none.appendix.xml connectors-aspec.xml.connector-net.none.chapter.xml connectors-aspec.xml.connector-php.none.chapter.xml connectors-aspec.xml.connector-vstudio.none.chapter.xml connectors-aspec.xml.myodbc-connector.none.chapter.xml connectors-aspec.xml.myodbc-news.none.appendix.xml connectors-aspec.xml.vstudio-plugin-news.none.appendix.xml: ../dynamic-docs/changelog/connector-j-versions.xml ../dynamic-docs/changelog/connector-j.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-cj-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-j-connprops.xml ../refman-common/connector-j-errormap.xml ../refman-common/connector-j.xml ../refman-common/urls.ent ../ref!
 man-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-mxj.xml ../refman-common/images/published/cmxj-overview.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-net-versions.xml ../dynamic-docs/changelog/connector-net.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-cnet-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-net.xml ../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/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-php.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-!
 common/all-entities.ent ../refman-common/connector-vstudioplug!
 in.xml .
./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/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myaccess-odbc.png ../refman-common/images/published/myaccess.png ../refman-common/images/published/myarchitecture.png ../refman-common/images/published/myflowchart.png ../refman-common/images/published/myodbc-crystal-1.png ../refman-common/images/published/myodbc-crystal-2.png ../refman-common/images/published/myodbc-crystal-3.png ../refman-common/images/published/myodbc-crystal-4.png ../refman-common/images/published/myodbc-crystal-5.png ../refman-common/images/published/myodbc-crystal-6.png ../refman-common/images/published/myodbc-excel-step1.png ../refman-common/images/published/myodbc-excel-step2.png ../refman-common/images/pu!
 blished/myodbc-excel-step3.png ../refman-common/images/published/myodbc-excel-step4.png ../refman-common/images/published/myodbc-excel-step5.png ../refman-common/images/published/myodbc-link-step1.png ../refman-common/images/published/myodbc-link-step3.png ../refman-common/images/published/myodbc-link-step4.png ../refman-common/images/published/myodbc-link-step5.png ../refman-common/images/published/myodbc-macosx-install-step1.png ../refman-common/images/published/myodbc-macosx-install-step2.png ../refman-common/images/published/myodbc-macosx-install-step3.png ../refman-common/images/published/myodbc-macosx-install-step4.png ../refman-common/images/published/myodbc-macosx-install-step5.png ../refman-common/images/published/myodbc-macosx-install-step6.png ../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../refman-commo!
 n/images/published/myodbc-macosx-odbcadmin-tracing.png ../refm!
 an-commo
n/images/published/myodbc-win-install-step1.png ../refman-common/images/published/myodbc-win-install-step2.png ../refman-common/images/published/myodbc-win-install-step3.png ../refman-common/images/published/myodbc-win-install-step4.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5-1.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-win-odbcadmin-advanced.png ../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/published/myodbc-win-odbcadmin-main.png ../refman-common/images/published/myodbc-win-odbcadmin-options.png ../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-win-tracing.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-odbc-versions.xml ../dynamic-docs/changelog/connector-odbc.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/n!
 ews-codbc-core.xml ../refman-common/urls.ent ../dynamic-docs/changelog/vstudioplugin-versions.xml ../dynamic-docs/changelog/vstudioplugin.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-vstudioplugin-core.xml ../refman-common/urls.ent
+connectors-aspec.xml.cj-news.none.appendix.xml connectors-aspec.xml.connector-j.none.chapter.xml connectors-aspec.xml.connector-mxj.none.chapter.xml connectors-aspec.xml.connector-net-news.none.appendix.xml connectors-aspec.xml.connector-net.none.chapter.xml connectors-aspec.xml.connector-php.none.chapter.xml connectors-aspec.xml.connector-vstudio.none.chapter.xml connectors-aspec.xml.myodbc-connector.none.chapter.xml connectors-aspec.xml.myodbc-news.none.appendix.xml connectors-aspec.xml.vstudio-plugin-news.none.appendix.xml: ../dynamic-docs/changelog/connector-j-versions.xml ../dynamic-docs/changelog/connector-j.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-cj-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-j-connprops.xml ../refman-common/connector-j-errormap.xml ../refman-common/connector-j.xml ../refman-common/urls.ent ../ref!
 man-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-mxj.xml ../refman-common/images/published/cmxj-overview.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-net-versions.xml ../dynamic-docs/changelog/connector-net.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-cnet-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-net.xml ../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/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-php.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-!
 common/all-entities.ent ../refman-common/connector-vstudioplug!
 in.xml .
./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/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myaccess-odbc.png ../refman-common/images/published/myaccess.png ../refman-common/images/published/myarchitecture.png ../refman-common/images/published/myflowchart.png ../refman-common/images/published/myodbc-crystal-1.png ../refman-common/images/published/myodbc-crystal-2.png ../refman-common/images/published/myodbc-crystal-3.png ../refman-common/images/published/myodbc-crystal-4.png ../refman-common/images/published/myodbc-crystal-5.png ../refman-common/images/published/myodbc-crystal-6.png ../refman-common/images/published/myodbc-excel-step1.png ../refman-common/images/published/myodbc-excel-step2.png ../refman-common/images/pu!
 blished/myodbc-excel-step3.png ../refman-common/images/published/myodbc-excel-step4.png ../refman-common/images/published/myodbc-excel-step5.png ../refman-common/images/published/myodbc-link-step1.png ../refman-common/images/published/myodbc-link-step3.png ../refman-common/images/published/myodbc-link-step4.png ../refman-common/images/published/myodbc-link-step5.png ../refman-common/images/published/myodbc-macosx-install-step1.png ../refman-common/images/published/myodbc-macosx-install-step2.png ../refman-common/images/published/myodbc-macosx-install-step3.png ../refman-common/images/published/myodbc-macosx-install-step4.png ../refman-common/images/published/myodbc-macosx-install-step5.png ../refman-common/images/published/myodbc-macosx-install-step6.png ../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../refman-commo!
 n/images/published/myodbc-macosx-odbcadmin-tracing.png ../refm!
 an-commo
n/images/published/myodbc-win-install-step1.png ../refman-common/images/published/myodbc-win-install-step2.png ../refman-common/images/published/myodbc-win-install-step3.png ../refman-common/images/published/myodbc-win-install-step4.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-win-odbcadmin-advanced.png ../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/published/myodbc-win-odbcadmin-main.png ../refman-common/images/published/myodbc-win-odbcadmin-options.png ../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-win-tracing.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-odbc-versions.xml ../dynamic-docs/changelog/connector-odbc.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-codbc-core.xml ../refman-common/urls.ent ../dynamic-docs/changelog!
 /vstudioplugin-versions.xml ../dynamic-docs/changelog/vstudioplugin.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-vstudioplugin-core.xml ../refman-common/urls.ent
 	$(RM) connectors.xml connectors-arbitrary.xml
 	$(MAKE) connectors.xml
 
-connector-odbc-aspec.xml.myodbc-configuration.none.chapter.xml connector-odbc-aspec.xml.myodbc-connector.all.preface.xml connector-odbc-aspec.xml.myodbc-examples.none.chapter.xml connector-odbc-aspec.xml.myodbc-installation.none.chapter.xml connector-odbc-aspec.xml.myodbc-introduction.none.chapter.xml connector-odbc-aspec.xml.myodbc-news.none.appendix.xml connector-odbc-aspec.xml.myodbc-reference.none.chapter.xml connector-odbc-aspec.xml.myodbc-support.none.chapter.xml connector-odbc-aspec.xml.myodbc-usagenotes.none.chapter.xml: ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn-5!
 -1.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-win-odbcadmin-advanced.png ../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/published/myodbc-win-odbcadmin-main.png ../refman-common/images/published/myodbc-win-odbcadmin-options.png ../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-win-tracing.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myaccess-odbc.png ../refman-common/images/published/myaccess.png ../refman-common/images/published/myflowchart.png ../refman-common/images/published/myodbc-crystal-1.png ../refman-common/images/published/myod!
 bc-crystal-2.png ../refman-common/images/published/myodbc-crys!
 tal-3.pn
g ../refman-common/images/published/myodbc-crystal-4.png ../refman-common/images/published/myodbc-crystal-5.png ../refman-common/images/published/myodbc-crystal-6.png ../refman-common/images/published/myodbc-excel-step1.png ../refman-common/images/published/myodbc-excel-step2.png ../refman-common/images/published/myodbc-excel-step3.png ../refman-common/images/published/myodbc-excel-step4.png ../refman-common/images/published/myodbc-excel-step5.png ../refman-common/images/published/myodbc-link-step1.png ../refman-common/images/published/myodbc-link-step3.png ../refman-common/images/published/myodbc-link-step4.png ../refman-common/images/published/myodbc-link-step5.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myodbc-macosx-install-step1.png ../refman-common/images/published/myodbc-macosx-install-step2.png ../refman-common/images/published/myodbc-ma!
 cosx-install-step3.png ../refman-common/images/published/myodbc-macosx-install-step4.png ../refman-common/images/published/myodbc-macosx-install-step5.png ../refman-common/images/published/myodbc-macosx-install-step6.png ../refman-common/images/published/myodbc-win-install-step1.png ../refman-common/images/published/myodbc-win-install-step2.png ../refman-common/images/published/myodbc-win-install-step3.png ../refman-common/images/published/myodbc-win-install-step4.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myarchitecture.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-odbc-versions.xml ../dynamic-docs/changelog/connector-odbc.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-codbc-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/a!
 ll-entities.ent ../refman-common/connector-odbc.xml ../refman-!
 common/u
rls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent
+connector-odbc-aspec.xml.myodbc-configuration.none.chapter.xml connector-odbc-aspec.xml.myodbc-connector.all.preface.xml connector-odbc-aspec.xml.myodbc-examples.none.chapter.xml connector-odbc-aspec.xml.myodbc-installation.none.chapter.xml connector-odbc-aspec.xml.myodbc-introduction.none.chapter.xml connector-odbc-aspec.xml.myodbc-news.none.appendix.xml connector-odbc-aspec.xml.myodbc-reference.none.chapter.xml connector-odbc-aspec.xml.myodbc-support.none.chapter.xml connector-odbc-aspec.xml.myodbc-usagenotes.none.chapter.xml: ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-main.png ../refman-common/images/published/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/published/myodbc-win-odbcadmin-adddsn.p!
 ng ../refman-common/images/published/myodbc-win-odbcadmin-advanced.png ../refman-common/images/published/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/published/myodbc-win-odbcadmin-main.png ../refman-common/images/published/myodbc-win-odbcadmin-options.png ../refman-common/images/published/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/published/myodbc-win-tracing.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myaccess-odbc.png ../refman-common/images/published/myaccess.png ../refman-common/images/published/myflowchart.png ../refman-common/images/published/myodbc-crystal-1.png ../refman-common/images/published/myodbc-crystal-2.png ../refman-common/images/published/myodbc-crystal-3.pn!
 g ../refman-common/images/published/myodbc-crystal-4.png ../re!
 fman-com
mon/images/published/myodbc-crystal-5.png ../refman-common/images/published/myodbc-crystal-6.png ../refman-common/images/published/myodbc-excel-step1.png ../refman-common/images/published/myodbc-excel-step2.png ../refman-common/images/published/myodbc-excel-step3.png ../refman-common/images/published/myodbc-excel-step4.png ../refman-common/images/published/myodbc-excel-step5.png ../refman-common/images/published/myodbc-link-step1.png ../refman-common/images/published/myodbc-link-step3.png ../refman-common/images/published/myodbc-link-step4.png ../refman-common/images/published/myodbc-link-step5.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myodbc-macosx-install-step1.png ../refman-common/images/published/myodbc-macosx-install-step2.png ../refman-common/images/published/myodbc-macosx-install-step3.png ../refman-common/images/published/myodbc-macosx!
 -install-step4.png ../refman-common/images/published/myodbc-macosx-install-step5.png ../refman-common/images/published/myodbc-macosx-install-step6.png ../refman-common/images/published/myodbc-win-install-step1.png ../refman-common/images/published/myodbc-win-install-step2.png ../refman-common/images/published/myodbc-win-install-step3.png ../refman-common/images/published/myodbc-win-install-step4.png ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/images/published/myarchitecture.png ../refman-common/urls.ent ../dynamic-docs/changelog/connector-odbc-versions.xml ../dynamic-docs/changelog/connector-odbc.xml ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/news-codbc-core.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/u!
 rls.ent ../refman-common/../common/fixedchars.ent ../refman-co!
 mmon/all
-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent ../refman-common/../common/fixedchars.ent ../refman-common/all-entities.ent ../refman-common/connector-odbc.xml ../refman-common/urls.ent
 	$(RM) connector-odbc.xml connector-odbc-arbitrary.xml
 	$(MAKE) connector-odbc.xml
 


Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/guibook/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 872 bytes

@@ -215,12 +215,12 @@
 	../refman-5.1/metadata/installing-core.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-client.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/se-innodb-core.idmap \
 	../refman-5.1/metadata/se-merge.idmap \
 	../refman-5.1/metadata/se-myisam-core.idmap \
 	../refman-5.1/metadata/sql-syntax.idmap \
-	../refman-5.1/metadata/using-mysql-programs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../userguide/metadata/excel-mysql.idmap \
 	../userguide/metadata/gnu-fdl.idmap \


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/refman-4.1/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 19, Lines Added: 29, Lines Deleted: 54; 9254 bytes

@@ -19,8 +19,8 @@
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -54,8 +54,8 @@
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis.validpure: $(apis_SOURCES)
 apis.titles: $(apis_SOURCES)
 apis.useless: $(apis_SOURCES)

@@ -380,11 +380,11 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -452,12 +452,12 @@
 	metadata/optimization.idmap \
 	metadata/programs-client.idmap \
 	metadata/programs-miscellaneous.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 dynxml-local-news-4.1.validpure: $(dynxml_local_news_4_1_SOURCES)
 dynxml-local-news-4.1.titles: $(dynxml_local_news_4_1_SOURCES)
 dynxml-local-news-4.1.useless: $(dynxml_local_news_4_1_SOURCES)

@@ -513,12 +513,12 @@
 	metadata/mysql-cluster-configuration.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -597,11 +597,11 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 installing.validpure: $(installing_SOURCES)
 installing.titles: $(installing_SOURCES)
 installing.useless: $(installing_SOURCES)

@@ -892,7 +892,6 @@
 	sql-syntax.xml \
 	storage-engines.xml \
 	tutorial.xml \
-	using-mysql-programs.xml \
 	versions.ent
 manual_IMAGES = \
 	../refman-common/images/published/blackhole-1.png \

@@ -993,6 +992,7 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/programs.idmap \
 	metadata/replication.idmap \
 	metadata/restrictions.idmap \

@@ -1000,8 +1000,7 @@
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)
 manual.useless: $(manual_SOURCES)

@@ -1199,7 +1198,7 @@
 	metadata/mysql-cluster-multi-computer.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-utilities.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1251,7 +1250,7 @@
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1369,9 +1368,9 @@
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-upgrade-downgrade.idmap \
 	metadata/mysql-cluster-utilities.idmap \
+	metadata/programs-using.idmap \
 	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -1525,11 +1524,11 @@
 	metadata/language-structure.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -1597,9 +1596,9 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -1679,7 +1678,7 @@
 	metadata/dba-core.idmap \
 	metadata/installing.idmap \
 	metadata/programs-server.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -1716,10 +1715,10 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -1826,9 +1825,9 @@
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing.idmap \
+	metadata/programs-using.idmap \
 	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 se-innodb-core.validpure: $(se_innodb_core_SOURCES)
 se-innodb-core.titles: $(se_innodb_core_SOURCES)
 se-innodb-core.useless: $(se_innodb_core_SOURCES)

@@ -1920,12 +1919,12 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -1965,27 +1964,3 @@
 tutorial-manprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 tutorial-remprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 
-using_mysql_programs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-using_mysql_programs_IMAGES =
-using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
-using_mysql_programs_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.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)
-using-mysql-programs.valid: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs.validwarn: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/refman-5.0/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 26, Lines Added: 28, Lines Deleted: 54; 10746 bytes

@@ -19,8 +19,8 @@
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -54,8 +54,8 @@
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis.validpure: $(apis_SOURCES)
 apis.titles: $(apis_SOURCES)
 apis.useless: $(apis_SOURCES)

@@ -405,6 +405,7 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/replication-notes.idmap \

@@ -415,8 +416,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -523,13 +523,13 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-bdb-core.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 dynxml-local-installing-cs.validpure: $(dynxml_local_installing_cs_SOURCES)
 dynxml-local-installing-cs.titles: $(dynxml_local_installing_cs_SOURCES)

@@ -637,6 +637,7 @@
 	metadata/precision-math.idmap \
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
+	metadata/programs-using.idmap \
 	metadata/releasenotes-cs.idmap \
 	metadata/releasenotes-es.idmap \
 	metadata/replication-notes.idmap \

@@ -647,7 +648,6 @@
 	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 dynxml-local-news-5.0.validpure: $(dynxml_local_news_5_0_SOURCES)
 dynxml-local-news-5.0.titles: $(dynxml_local_news_5_0_SOURCES)

@@ -759,9 +759,9 @@
 	metadata/errors-problems.idmap \
 	metadata/installing-cs-core.idmap \
 	metadata/news-5.0-core.idmap \
+	metadata/programs-using.idmap \
 	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -845,12 +845,12 @@
 	metadata/mysql-cluster-configuration.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-merge.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -1134,6 +1134,7 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/releasenotes-es.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-bdb-core.idmap \

@@ -1141,7 +1142,6 @@
 	metadata/se-myisam-core.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)

@@ -1519,7 +1519,6 @@
 	stored-procedures.xml \
 	triggers.xml \
 	tutorial.xml \
-	using-mysql-programs.xml \
 	versions.ent \
 	views.xml
 manual_IMAGES = \

@@ -1648,6 +1647,7 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/programs.idmap \
 	metadata/releasenotes-cs.idmap \
 	metadata/releasenotes-es.idmap \

@@ -1673,7 +1673,6 @@
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)

@@ -1843,7 +1842,7 @@
 	metadata/mysql-cluster-multi-computer.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-utilities.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1895,7 +1894,7 @@
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -2032,8 +2031,8 @@
 	metadata/mysql-cluster-upgrade-downgrade.idmap \
 	metadata/mysql-cluster-utilities.idmap \
 	metadata/optimization.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2113,6 +2112,7 @@
 	metadata/precision-math.idmap \
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
+	metadata/programs-using.idmap \
 	metadata/releasenotes-cs.idmap \
 	metadata/releasenotes-es.idmap \
 	metadata/replication-notes.idmap \

@@ -2123,7 +2123,6 @@
 	metadata/sql-syntax.idmap \
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 news.validpure: $(news_SOURCES)
 news.titles: $(news_SOURCES)

@@ -2154,6 +2153,7 @@
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-bdb-core.idmap \

@@ -2162,8 +2162,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2252,10 +2251,10 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -2339,7 +2338,7 @@
 	metadata/installing-outline.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-server.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -2378,11 +2377,11 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2948,12 +2947,12 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/se-bdb-core.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/spatial-extensions.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -3046,31 +3045,6 @@
 tutorial-manprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 tutorial-remprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 
-using_mysql_programs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-using_mysql_programs_IMAGES =
-using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
-using_mysql_programs_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-cs-core.idmap \
-	metadata/installing-outline.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.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)
-using-mysql-programs.valid: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs.validwarn: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-
 views_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/refman-5.1/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 23, Lines Added: 29, Lines Deleted: 53; 10428 bytes

@@ -19,8 +19,8 @@
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -77,7 +77,7 @@
 apis_libmysqld_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/installing-core.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
 apis-libmysqld.useless: $(apis_libmysqld_SOURCES)

@@ -531,6 +531,7 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/replication-notes.idmap \

@@ -540,8 +541,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -574,12 +574,12 @@
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-merge.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 dynxml-local-errors-problems.validpure: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.titles: $(dynxml_local_errors_problems_SOURCES)
 dynxml-local-errors-problems.useless: $(dynxml_local_errors_problems_SOURCES)

@@ -655,12 +655,12 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)

@@ -737,13 +737,13 @@
 	metadata/programs-admin-util.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 dynxml-local-news-5.1.validpure: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.titles: $(dynxml_local_news_5_1_SOURCES)
 dynxml-local-news-5.1.useless: $(dynxml_local_news_5_1_SOURCES)

@@ -767,9 +767,9 @@
 	metadata/dba-core.idmap \
 	metadata/errors-problems-core.idmap \
 	metadata/installing-core.idmap \
+	metadata/programs-using.idmap \
 	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -1344,7 +1344,6 @@
 	stored-procedures.xml \
 	triggers.xml \
 	tutorial.xml \
-	using-mysql-programs.xml \
 	versions.ent \
 	views.xml
 manual_IMAGES = \

@@ -1465,6 +1464,7 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/programs.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-implementation.idmap \

@@ -1488,7 +1488,6 @@
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)

@@ -1688,7 +1687,7 @@
 	metadata/installing-core.idmap \
 	metadata/mysql-cluster-backup.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1735,7 +1734,7 @@
 mysql_cluster_process_management_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \
 	metadata/mysql-cluster-ccsg-merge-temp.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1908,11 +1907,11 @@
 	metadata/news-5.1-core.idmap \
 	metadata/partitioning.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
 	metadata/replication.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2005,6 +2004,7 @@
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-innodb-core.idmap \

@@ -2012,8 +2012,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2105,9 +2104,9 @@
 	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 programs-admin-util.validpure: $(programs_admin_util_SOURCES)
 programs-admin-util.titles: $(programs_admin_util_SOURCES)
 programs-admin-util.useless: $(programs_admin_util_SOURCES)

@@ -2133,10 +2132,10 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -2219,7 +2218,7 @@
 	metadata/installing-core.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-server.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -2258,11 +2257,11 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2737,6 +2736,7 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-blackhole.idmap \

@@ -2749,8 +2749,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/storage-engines.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/storage-engines.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -2844,29 +2843,6 @@
 tutorial-manprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 tutorial-remprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 
-using_mysql_programs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-using_mysql_programs_IMAGES =
-using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
-using_mysql_programs_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-ccsg-merge-temp.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.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)
-using-mysql-programs.valid: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs.validwarn: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-
 views_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/refman-6.0/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 26, Lines Added: 54, Lines Deleted: 52; 11747 bytes

@@ -19,8 +19,8 @@
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap \
+	metadata/programs.idmap
 apis-c.validpure: $(apis_c_SOURCES)
 apis-c.titles: $(apis_c_SOURCES)
 apis-c.useless: $(apis_c_SOURCES)

@@ -77,7 +77,7 @@
 apis_libmysqld_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/installing-core.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 apis-libmysqld.validpure: $(apis_libmysqld_SOURCES)
 apis-libmysqld.titles: $(apis_libmysqld_SOURCES)
 apis-libmysqld.useless: $(apis_libmysqld_SOURCES)

@@ -533,6 +533,7 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/replication-notes.idmap \

@@ -543,8 +544,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 dynxml-local-dba.validpure: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.titles: $(dynxml_local_dba_SOURCES)
 dynxml-local-dba.useless: $(dynxml_local_dba_SOURCES)

@@ -621,11 +621,11 @@
 	metadata/programs-client.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-myisam-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 dynxml-local-installing.validpure: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.titles: $(dynxml_local_installing_SOURCES)
 dynxml-local-installing.useless: $(dynxml_local_installing_SOURCES)

@@ -753,9 +753,9 @@
 	metadata/dba-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/installing-core.idmap \
+	metadata/programs-using.idmap \
 	metadata/se-innodb-core.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 dynxml-local-se-innodb.validpure: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.titles: $(dynxml_local_se_innodb_SOURCES)
 dynxml-local-se-innodb.useless: $(dynxml_local_se_innodb_SOURCES)

@@ -840,12 +840,12 @@
 	metadata/mysql-cluster-configuration.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-notes.idmap \
 	metadata/se-innodb-core.idmap \
 	metadata/se-merge.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 errors-problems.validpure: $(errors_problems_SOURCES)
 errors-problems.titles: $(errors_problems_SOURCES)
 errors-problems.useless: $(errors_problems_SOURCES)

@@ -1338,6 +1338,7 @@
 	programs-installation.xml \
 	programs-miscellaneous.xml \
 	programs-server.xml \
+	programs-using.xml \
 	programs.xml \
 	replication-configuration.xml \
 	replication-implementation.xml \

@@ -1361,7 +1362,6 @@
 	stored-procedures.xml \
 	triggers.xml \
 	tutorial.xml \
-	using-mysql-programs.xml \
 	versions.ent \
 	views.xml
 manual_IMAGES = \

@@ -1487,6 +1487,7 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/programs.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-implementation.idmap \

@@ -1511,7 +1512,6 @@
 	metadata/stored-procedures.idmap \
 	metadata/triggers.idmap \
 	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap \
 	metadata/views.idmap
 manual.validpure: $(manual_SOURCES)
 manual.titles: $(manual_SOURCES)

@@ -1711,7 +1711,7 @@
 	metadata/mysql-cluster-multi-computer.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-utilities.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-multi-computer.validpure: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.titles: $(mysql_cluster_multi_computer_SOURCES)
 mysql-cluster-multi-computer.useless: $(mysql_cluster_multi_computer_SOURCES)

@@ -1764,7 +1764,7 @@
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-process-management.idmap \
 	metadata/mysql-cluster-upgrade-downgrade.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 mysql-cluster-process-management.validpure: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.titles: $(mysql_cluster_process_management_SOURCES)
 mysql-cluster-process-management.useless: $(mysql_cluster_process_management_SOURCES)

@@ -1950,11 +1950,11 @@
 	metadata/mysql-cluster-utilities.idmap \
 	metadata/partitioning.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \
 	metadata/replication.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 mysql-cluster.validpure: $(mysql_cluster_SOURCES)
 mysql-cluster.titles: $(mysql_cluster_SOURCES)
 mysql-cluster.useless: $(mysql_cluster_SOURCES)

@@ -2061,6 +2061,7 @@
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-innodb-core.idmap \

@@ -2068,8 +2069,7 @@
 	metadata/se-myisam-core.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/stored-procedures.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/stored-procedures.idmap
 optimization.validpure: $(optimization_SOURCES)
 optimization.titles: $(optimization_SOURCES)
 optimization.useless: $(optimization_SOURCES)

@@ -2160,9 +2160,9 @@
 	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-implementation.idmap \
-	metadata/sql-syntax.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/sql-syntax.idmap
 programs-admin-util.validpure: $(programs_admin_util_SOURCES)
 programs-admin-util.titles: $(programs_admin_util_SOURCES)
 programs-admin-util.useless: $(programs_admin_util_SOURCES)

@@ -2188,10 +2188,10 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs-client.validpure: $(programs_client_SOURCES)
 programs-client.titles: $(programs_client_SOURCES)
 programs-client.useless: $(programs_client_SOURCES)

@@ -2274,7 +2274,7 @@
 	metadata/installing-core.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-server.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/programs-using.idmap
 programs-server.validpure: $(programs_server_SOURCES)
 programs-server.titles: $(programs_server_SOURCES)
 programs-server.useless: $(programs_server_SOURCES)

@@ -2284,6 +2284,29 @@
 programs-server-manprepped.xml: $(programs_server_SOURCES) $(programs_server_IDMAPS)
 programs-server-remprepped.xml: $(programs_server_SOURCES) $(programs_server_IDMAPS)
 
+programs_using_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../refman-common/urls.ent \
+	all-entities.ent \
+	versions.ent
+programs_using_IMAGES =
+programs_using_SOURCES = programs-using.xml $(programs_using_INCLUDES)
+programs_using_IDMAPS = \
+	metadata/dba-core.idmap \
+	metadata/installing-core.idmap \
+	metadata/mysql-cluster-configuration.idmap \
+	metadata/mysql-cluster-multi-computer.idmap \
+	metadata/programs-using.idmap
+programs-using.validpure: $(programs_using_SOURCES)
+programs-using.titles: $(programs_using_SOURCES)
+programs-using.useless: $(programs_using_SOURCES)
+programs-using.valid: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using.validwarn: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-prepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-manprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+programs-using-remprepped.xml: $(programs_using_SOURCES) $(programs_using_IDMAPS)
+
 programs_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -2295,6 +2318,7 @@
 	programs-installation.xml \
 	programs-miscellaneous.xml \
 	programs-server.xml \
+	programs-using.xml \
 	versions.ent
 programs_IMAGES =
 programs_SOURCES = programs.xml $(programs_INCLUDES)

@@ -2305,6 +2329,8 @@
 	metadata/information-schema.idmap \
 	metadata/installing-core.idmap \
 	metadata/internationalization.idmap \
+	metadata/mysql-cluster-configuration.idmap \
+	metadata/mysql-cluster-multi-computer.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \

@@ -2313,11 +2339,11 @@
 	metadata/programs-installation.idmap \
 	metadata/programs-miscellaneous.idmap \
 	metadata/programs-server.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-implementation.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 programs.validpure: $(programs_SOURCES)
 programs.titles: $(programs_SOURCES)
 programs.useless: $(programs_SOURCES)

@@ -2812,6 +2838,7 @@
 	metadata/optimization.idmap \
 	metadata/programs-admin-util.idmap \
 	metadata/programs-client.idmap \
+	metadata/programs-using.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/se-archive.idmap \
 	metadata/se-blackhole.idmap \

@@ -2826,8 +2853,7 @@
 	metadata/spatial-extensions.idmap \
 	metadata/sql-syntax.idmap \
 	metadata/storage-engines.idmap \
-	metadata/tutorial.idmap \
-	metadata/using-mysql-programs.idmap
+	metadata/tutorial.idmap
 storage-engines.validpure: $(storage_engines_SOURCES)
 storage-engines.titles: $(storage_engines_SOURCES)
 storage-engines.useless: $(storage_engines_SOURCES)

@@ -2920,30 +2946,6 @@
 tutorial-manprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 tutorial-remprepped.xml: $(tutorial_SOURCES) $(tutorial_IDMAPS)
 
-using_mysql_programs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-using_mysql_programs_IMAGES =
-using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES)
-using_mysql_programs_IDMAPS = \
-	metadata/dba-core.idmap \
-	metadata/installing-core.idmap \
-	metadata/mysql-cluster-configuration.idmap \
-	metadata/mysql-cluster-multi-computer.idmap \
-	metadata/programs.idmap \
-	metadata/using-mysql-programs.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)
-using-mysql-programs.valid: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs.validwarn: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) $(using_mysql_programs_IDMAPS)
-
 views_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \


Modified: trunk/ro/administrator/Makefile.depends
===================================================================
--- trunk/ro/administrator/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/ro/administrator/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1312 bytes

@@ -86,12 +86,12 @@
 	../../refman-5.1/metadata/installing-core.idmap \
 	../../refman-5.1/metadata/optimization.idmap \
 	../../refman-5.1/metadata/programs-client.idmap \
+	../../refman-5.1/metadata/programs-using.idmap \
 	../../refman-5.1/metadata/replication-configuration.idmap \
 	../../refman-5.1/metadata/se-merge.idmap \
 	../../refman-5.1/metadata/se-myisam-core.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 \
 	metadata/administrator.idmap \
 	metadata/backup.idmap \

@@ -416,7 +416,7 @@
 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/programs-using.idmap \
 	metadata/service-control.idmap
 startup-variables.validpure: $(startup_variables_SOURCES)
 startup-variables.titles: $(startup_variables_SOURCES)


Modified: trunk/th/administrator/Makefile.depends
===================================================================
--- trunk/th/administrator/Makefile.depends	2007-12-07 18:17:33 UTC (rev 9199)
+++ trunk/th/administrator/Makefile.depends	2007-12-07 18:18:41 UTC (rev 9200)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1312 bytes

@@ -97,12 +97,12 @@
 	../../refman-5.1/metadata/installing-core.idmap \
 	../../refman-5.1/metadata/optimization.idmap \
 	../../refman-5.1/metadata/programs-client.idmap \
+	../../refman-5.1/metadata/programs-using.idmap \
 	../../refman-5.1/metadata/replication-configuration.idmap \
 	../../refman-5.1/metadata/se-merge.idmap \
 	../../refman-5.1/metadata/se-myisam-core.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 \
 	metadata/administrator.idmap \
 	metadata/backup.idmap \

@@ -430,7 +430,7 @@
 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/programs-using.idmap \
 	metadata/service-control.idmap
 startup-variables.validpure: $(startup_variables_SOURCES)
 startup-variables.titles: $(startup_variables_SOURCES)


Thread
svn commit - mysqldoc@docsrva: r9200 - in trunk: . administrator arbitrary guibook refman-4.1 refman-5.0 refman-5.1 refman-6.0 ro/administrator th/adm...paul7 Dec