svn commit - mysqldoc@docsrva: r6019 - trunk/refman-5.0

[mcbrown]

Author: mcbrown
Date: 2007-04-20 10:51:39 +0200 (Fri, 20 Apr 2007)
New Revision: 6019

Log:
Changing wording and structure after th ES installer was removed



Modified:
   trunk/refman-5.0/Makefile
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.0/installing-es.xml


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2007-04-20 08:26:05 UTC (rev 6018)
+++ trunk/refman-5.0/Makefile	2007-04-20 08:51:39 UTC (rev 6019)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 650 bytes

@@ -76,10 +76,6 @@
 clean::
 	$(RM) fill_help_tables.sql fill_help_tables.sql-tmp
 
-# Import document dependency specifications
-
-include Makefile.depends
-
 # Import standard target rules
 
 # Need xml-html-dir for formatting the manual itself into a subdir,

@@ -113,3 +109,8 @@
 # Import directory specific extensions
 
 include ../refman-common/Makefile.ext
+
+# Import document dependency specifications
+
+include Makefile.depends
+


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-04-20 08:26:05 UTC (rev 6018)
+++ trunk/refman-5.0/Makefile.depends	2007-04-20 08:51:39 UTC (rev 6019)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1122; 40143 bytes

@@ -1,1122 +0,0 @@
-apis_c_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-apis_c_IMAGES =
-apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES)
-apis-c-prepped.xml: $(apis_c_SOURCES)
-apis-c-manprepped.xml: $(apis_c_SOURCES)
-apis-c-remprepped.xml: $(apis_c_SOURCES)
-
-apis_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	apis-c.xml \
-	versions.ent
-apis_IMAGES =
-apis_SOURCES = apis.xml $(apis_INCLUDES)
-apis-prepped.xml: $(apis_SOURCES)
-apis-manprepped.xml: $(apis_SOURCES)
-apis-remprepped.xml: $(apis_SOURCES)
-
-charset_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-charset_IMAGES =
-charset_SOURCES = charset.xml $(charset_INCLUDES)
-charset-prepped.xml: $(charset_SOURCES)
-charset-manprepped.xml: $(charset_SOURCES)
-charset-remprepped.xml: $(charset_SOURCES)
-
-client_utility_programs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-client_utility_programs_IMAGES =
-client_utility_programs_SOURCES = client-utility-programs.xml
$(client_utility_programs_INCLUDES)
-client-utility-programs-prepped.xml: $(client_utility_programs_SOURCES)
-client-utility-programs-manprepped.xml: $(client_utility_programs_SOURCES)
-client-utility-programs-remprepped.xml: $(client_utility_programs_SOURCES)
-
-config_wizard_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	versions.ent
-config_wizard_IMAGES = \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png
-config_wizard_SOURCES = config-wizard.xml $(config_wizard_INCLUDES)
-config-wizard-prepped.xml: $(config_wizard_SOURCES)
-config-wizard-manprepped.xml: $(config_wizard_SOURCES)
-config-wizard-remprepped.xml: $(config_wizard_SOURCES)
-
-connectors_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/../common/fixedchars.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-php.xml \
-	../refman-common/connector-vstudioplugin.xml \
-	../refman-common/images/cmxj-overview.png \
-	../refman-common/images/cnet-win-install-step1.png \
-	../refman-common/images/cnet-win-install-step2.png \
-	../refman-common/images/cnet-win-install-step3.png \
-	../refman-common/images/cnet-win-install-step4.png \
-	../refman-common/images/myaccess-odbc.png \
-	../refman-common/images/myaccess.png \
-	../refman-common/images/myarchitecture.png \
-	../refman-common/images/myflowchart.png \
-	../refman-common/images/myodbc-crystal-1.png \
-	../refman-common/images/myodbc-crystal-2.png \
-	../refman-common/images/myodbc-crystal-3.png \
-	../refman-common/images/myodbc-crystal-4.png \
-	../refman-common/images/myodbc-crystal-5.png \
-	../refman-common/images/myodbc-crystal-6.png \
-	../refman-common/images/myodbc-excel-step1.png \
-	../refman-common/images/myodbc-excel-step2.png \
-	../refman-common/images/myodbc-excel-step3.png \
-	../refman-common/images/myodbc-excel-step4.png \
-	../refman-common/images/myodbc-excel-step5.png \
-	../refman-common/images/myodbc-link-step1.png \
-	../refman-common/images/myodbc-link-step3.png \
-	../refman-common/images/myodbc-link-step4.png \
-	../refman-common/images/myodbc-link-step5.png \
-	../refman-common/images/myodbc-macosx-install-step1.png \
-	../refman-common/images/myodbc-macosx-install-step2.png \
-	../refman-common/images/myodbc-macosx-install-step3.png \
-	../refman-common/images/myodbc-macosx-install-step4.png \
-	../refman-common/images/myodbc-macosx-install-step5.png \
-	../refman-common/images/myodbc-macosx-install-step6.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/myodbc-win-install-step1.png \
-	../refman-common/images/myodbc-win-install-step2.png \
-	../refman-common/images/myodbc-win-install-step3.png \
-	../refman-common/images/myodbc-win-install-step4.png \
-	../refman-common/images/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-win-tracing.png \
-	../refman-common/images/mysql-vstudioplugin-1.png \
-	../refman-common/images/mysql-vstudioplugin-3.png \
-	../refman-common/images/mysql-vstudioplugin-4.png \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-connectors_IMAGES = \
-	../refman-common/images/cmxj-overview.png \
-	../refman-common/images/cnet-win-install-step1.png \
-	../refman-common/images/cnet-win-install-step2.png \
-	../refman-common/images/cnet-win-install-step3.png \
-	../refman-common/images/cnet-win-install-step4.png \
-	../refman-common/images/myaccess-odbc.png \
-	../refman-common/images/myaccess.png \
-	../refman-common/images/myarchitecture.png \
-	../refman-common/images/myflowchart.png \
-	../refman-common/images/myodbc-crystal-1.png \
-	../refman-common/images/myodbc-crystal-2.png \
-	../refman-common/images/myodbc-crystal-3.png \
-	../refman-common/images/myodbc-crystal-4.png \
-	../refman-common/images/myodbc-crystal-5.png \
-	../refman-common/images/myodbc-crystal-6.png \
-	../refman-common/images/myodbc-excel-step1.png \
-	../refman-common/images/myodbc-excel-step2.png \
-	../refman-common/images/myodbc-excel-step3.png \
-	../refman-common/images/myodbc-excel-step4.png \
-	../refman-common/images/myodbc-excel-step5.png \
-	../refman-common/images/myodbc-link-step1.png \
-	../refman-common/images/myodbc-link-step3.png \
-	../refman-common/images/myodbc-link-step4.png \
-	../refman-common/images/myodbc-link-step5.png \
-	../refman-common/images/myodbc-macosx-install-step1.png \
-	../refman-common/images/myodbc-macosx-install-step2.png \
-	../refman-common/images/myodbc-macosx-install-step3.png \
-	../refman-common/images/myodbc-macosx-install-step4.png \
-	../refman-common/images/myodbc-macosx-install-step5.png \
-	../refman-common/images/myodbc-macosx-install-step6.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/myodbc-win-install-step1.png \
-	../refman-common/images/myodbc-win-install-step2.png \
-	../refman-common/images/myodbc-win-install-step3.png \
-	../refman-common/images/myodbc-win-install-step4.png \
-	../refman-common/images/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-win-tracing.png \
-	../refman-common/images/mysql-vstudioplugin-1.png \
-	../refman-common/images/mysql-vstudioplugin-3.png \
-	../refman-common/images/mysql-vstudioplugin-4.png
-connectors_SOURCES = connectors.xml $(connectors_INCLUDES)
-connectors-prepped.xml: $(connectors_SOURCES)
-connectors-manprepped.xml: $(connectors_SOURCES)
-connectors-remprepped.xml: $(connectors_SOURCES)
-
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright-prepped.xml: $(copyright_SOURCES)
-copyright-manprepped.xml: $(copyright_SOURCES)
-copyright-remprepped.xml: $(copyright_SOURCES)
-
-data_types_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-data_types_IMAGES =
-data_types_SOURCES = data-types.xml $(data_types_INCLUDES)
-data-types-prepped.xml: $(data_types_SOURCES)
-data-types-manprepped.xml: $(data_types_SOURCES)
-data-types-remprepped.xml: $(data_types_SOURCES)
-
-dba_optvars_table_INCLUDES =
-dba_optvars_table_IMAGES =
-dba_optvars_table_SOURCES = dba-optvars-table.xml $(dba_optvars_table_INCLUDES)
-dba-optvars-table-prepped.xml: $(dba_optvars_table_SOURCES)
-dba-optvars-table-manprepped.xml: $(dba_optvars_table_SOURCES)
-dba-optvars-table-remprepped.xml: $(dba_optvars_table_SOURCES)
-
-dynxml_generated_dba_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	dba-optvars-table.xml \
-	versions.ent
-dynxml_generated_dba_IMAGES =
-dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
-dynxml-generated-dba-prepped.xml: $(dynxml_generated_dba_SOURCES)
-dynxml-generated-dba-manprepped.xml: $(dynxml_generated_dba_SOURCES)
-dynxml-generated-dba-remprepped.xml: $(dynxml_generated_dba_SOURCES)
-
-dynxml_generated_functions_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-dynxml_generated_functions_IMAGES =
-dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml
$(dynxml_generated_functions_INCLUDES)
-dynxml-generated-functions-prepped.xml: $(dynxml_generated_functions_SOURCES)
-dynxml-generated-functions-manprepped.xml: $(dynxml_generated_functions_SOURCES)
-dynxml-generated-functions-remprepped.xml: $(dynxml_generated_functions_SOURCES)
-
-errmsgs_client_INCLUDES =
-errmsgs_client_IMAGES =
-errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES)
-errmsgs-client-prepped.xml: $(errmsgs_client_SOURCES)
-errmsgs-client-manprepped.xml: $(errmsgs_client_SOURCES)
-errmsgs-client-remprepped.xml: $(errmsgs_client_SOURCES)
-
-errmsgs_server_INCLUDES =
-errmsgs_server_IMAGES =
-errmsgs_server_SOURCES = errmsgs-server.xml $(errmsgs_server_INCLUDES)
-errmsgs-server-prepped.xml: $(errmsgs_server_SOURCES)
-errmsgs-server-manprepped.xml: $(errmsgs_server_SOURCES)
-errmsgs-server-remprepped.xml: $(errmsgs_server_SOURCES)
-
-errors_problems_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	versions.ent
-errors_problems_IMAGES =
-errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES)
-errors-problems-prepped.xml: $(errors_problems_SOURCES)
-errors-problems-manprepped.xml: $(errors_problems_SOURCES)
-errors-problems-remprepped.xml: $(errors_problems_SOURCES)
-
-extending_mysql_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-extending_mysql_IMAGES =
-extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES)
-extending-mysql-prepped.xml: $(extending_mysql_SOURCES)
-extending-mysql-manprepped.xml: $(extending_mysql_SOURCES)
-extending-mysql-remprepped.xml: $(extending_mysql_SOURCES)
-
-faqs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-faqs_IMAGES =
-faqs_SOURCES = faqs.xml $(faqs_INCLUDES)
-faqs-prepped.xml: $(faqs_SOURCES)
-faqs-manprepped.xml: $(faqs_SOURCES)
-faqs-remprepped.xml: $(faqs_SOURCES)
-
-information_schema_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-information_schema_IMAGES =
-information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
-information-schema-prepped.xml: $(information_schema_SOURCES)
-information-schema-manprepped.xml: $(information_schema_SOURCES)
-information-schema-remprepped.xml: $(information_schema_SOURCES)
-
-installing_cs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-installing_cs_IMAGES =
-installing_cs_SOURCES = installing-cs.xml $(installing_cs_INCLUDES)
-installing-cs-prepped.xml: $(installing_cs_SOURCES)
-installing-cs-manprepped.xml: $(installing_cs_SOURCES)
-installing-cs-remprepped.xml: $(installing_cs_SOURCES)
-
-installing_es_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	config-wizard.xml \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png \
-	versions.ent
-installing_es_IMAGES = \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png
-installing_es_SOURCES = installing-es.xml $(installing_es_INCLUDES)
-installing-es-prepped.xml: $(installing_es_SOURCES)
-installing-es-manprepped.xml: $(installing_es_SOURCES)
-installing-es-remprepped.xml: $(installing_es_SOURCES)
-
-installing_version_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-installing_version_IMAGES =
-installing_version_SOURCES = installing-version.xml $(installing_version_INCLUDES)
-installing-version-prepped.xml: $(installing_version_SOURCES)
-installing-version-manprepped.xml: $(installing_version_SOURCES)
-installing-version-remprepped.xml: $(installing_version_SOURCES)
-
-installing_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	config-wizard.xml \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png \
-	installing-cs.xml \
-	installing-es.xml \
-	installing-version.xml \
-	versions.ent
-installing_IMAGES = \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png
-installing_SOURCES = installing.xml $(installing_INCLUDES)
-installing-prepped.xml: $(installing_SOURCES)
-installing-manprepped.xml: $(installing_SOURCES)
-installing-remprepped.xml: $(installing_SOURCES)
-
-introduction_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/../common/fixedchars.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/information-sources.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/maxdb.en.xml \
-	../refman-common/urls.ent \
-	../refman-common/what-is-mysql-ab.en.xml \
-	../refman-common/what-is.en.xml \
-	all-entities.ent \
-	versions.ent
-introduction_IMAGES =
-introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
-introduction-prepped.xml: $(introduction_SOURCES)
-introduction-manprepped.xml: $(introduction_SOURCES)
-introduction-remprepped.xml: $(introduction_SOURCES)
-
-language_structure_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	reserved-new-5.0.xml \
-	reservedwords.xml \
-	versions.ent
-language_structure_IMAGES =
-language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES)
-language-structure-prepped.xml: $(language_structure_SOURCES)
-language-structure-manprepped.xml: $(language_structure_SOURCES)
-language-structure-remprepped.xml: $(language_structure_SOURCES)
-
-legalnotice_en_INCLUDES = \
-	copyright.xml
-legalnotice_en_IMAGES =
-legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
-legalnotice.en-prepped.xml: $(legalnotice_en_SOURCES)
-legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES)
-legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES)
-
-manual_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/../common/fixedchars.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/bug-reports.xml \
-	../refman-common/connector-j.xml \
-	../refman-common/connector-mxj.xml \
-	../refman-common/connector-net.xml \
-	../refman-common/connector-odbc.xml \
-	../refman-common/connector-php.xml \
-	../refman-common/connector-vstudioplugin.xml \
-	../refman-common/credits.xml \
-	../refman-common/images/cmxj-overview.png \
-	../refman-common/images/cnet-win-install-step1.png \
-	../refman-common/images/cnet-win-install-step2.png \
-	../refman-common/images/cnet-win-install-step3.png \
-	../refman-common/images/cnet-win-install-step4.png \
-	../refman-common/images/myaccess-odbc.png \
-	../refman-common/images/myaccess.png \
-	../refman-common/images/myarchitecture.png \
-	../refman-common/images/myflowchart.png \
-	../refman-common/images/myodbc-crystal-1.png \
-	../refman-common/images/myodbc-crystal-2.png \
-	../refman-common/images/myodbc-crystal-3.png \
-	../refman-common/images/myodbc-crystal-4.png \
-	../refman-common/images/myodbc-crystal-5.png \
-	../refman-common/images/myodbc-crystal-6.png \
-	../refman-common/images/myodbc-excel-step1.png \
-	../refman-common/images/myodbc-excel-step2.png \
-	../refman-common/images/myodbc-excel-step3.png \
-	../refman-common/images/myodbc-excel-step4.png \
-	../refman-common/images/myodbc-excel-step5.png \
-	../refman-common/images/myodbc-link-step1.png \
-	../refman-common/images/myodbc-link-step3.png \
-	../refman-common/images/myodbc-link-step4.png \
-	../refman-common/images/myodbc-link-step5.png \
-	../refman-common/images/myodbc-macosx-install-step1.png \
-	../refman-common/images/myodbc-macosx-install-step2.png \
-	../refman-common/images/myodbc-macosx-install-step3.png \
-	../refman-common/images/myodbc-macosx-install-step4.png \
-	../refman-common/images/myodbc-macosx-install-step5.png \
-	../refman-common/images/myodbc-macosx-install-step6.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/myodbc-win-install-step1.png \
-	../refman-common/images/myodbc-win-install-step2.png \
-	../refman-common/images/myodbc-win-install-step3.png \
-	../refman-common/images/myodbc-win-install-step4.png \
-	../refman-common/images/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-win-tracing.png \
-	../refman-common/images/mysql-vstudioplugin-1.png \
-	../refman-common/images/mysql-vstudioplugin-3.png \
-	../refman-common/images/mysql-vstudioplugin-4.png \
-	../refman-common/information-sources.xml \
-	../refman-common/licenses.xml \
-	../refman-common/manual-conventions.en.xml \
-	../refman-common/maxdb.en.xml \
-	../refman-common/news-cluster.xml \
-	../refman-common/news-connector-j.xml \
-	../refman-common/news-connector-net.xml \
-	../refman-common/news-myodbc.xml \
-	../refman-common/news-vstudioplugin.xml \
-	../refman-common/urls.ent \
-	../refman-common/what-is-mysql-ab.en.xml \
-	../refman-common/what-is.en.xml \
-	all-entities.ent \
-	apis-c.xml \
-	apis.xml \
-	charset.xml \
-	client-utility-programs.xml \
-	config-wizard.xml \
-	connectors.xml \
-	copyright.xml \
-	data-types.xml \
-	dba-optvars-table.xml \
-	dynxml-generated-dba.xml \
-	dynxml-generated-functions.xml \
-	errmsgs-client.xml \
-	errmsgs-server.xml \
-	errors-problems.xml \
-	extending-mysql.xml \
-	faqs.xml \
-	images/blackhole-1.png \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png \
-	images/ndb-size-pl-1.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 \
-	installing-version.xml \
-	installing.xml \
-	introduction.xml \
-	language-structure.xml \
-	legalnotice.en.xml \
-	mysql-cluster.xml \
-	news-5.0.xml \
-	news.xml \
-	optimization.xml \
-	precision-math.xml \
-	preface.xml \
-	releasenotes-cs-5.0.xml \
-	releasenotes-cs.xml \
-	releasenotes-es-5.0.xml \
-	releasenotes-es.xml \
-	replication.xml \
-	reserved-new-5.0.xml \
-	reservedwords.xml \
-	restrictions.xml \
-	se-archive.xml \
-	se-bdb.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam.xml \
-	spatial-extensions.xml \
-	sql-syntax.xml \
-	storage-engines.xml \
-	stored-procedures.xml \
-	triggers.xml \
-	tutorial.xml \
-	using-mysql-programs.xml \
-	versions.ent \
-	views.xml
-manual_IMAGES = \
-	../refman-common/images/cmxj-overview.png \
-	../refman-common/images/cnet-win-install-step1.png \
-	../refman-common/images/cnet-win-install-step2.png \
-	../refman-common/images/cnet-win-install-step3.png \
-	../refman-common/images/cnet-win-install-step4.png \
-	../refman-common/images/myaccess-odbc.png \
-	../refman-common/images/myaccess.png \
-	../refman-common/images/myarchitecture.png \
-	../refman-common/images/myflowchart.png \
-	../refman-common/images/myodbc-crystal-1.png \
-	../refman-common/images/myodbc-crystal-2.png \
-	../refman-common/images/myodbc-crystal-3.png \
-	../refman-common/images/myodbc-crystal-4.png \
-	../refman-common/images/myodbc-crystal-5.png \
-	../refman-common/images/myodbc-crystal-6.png \
-	../refman-common/images/myodbc-excel-step1.png \
-	../refman-common/images/myodbc-excel-step2.png \
-	../refman-common/images/myodbc-excel-step3.png \
-	../refman-common/images/myodbc-excel-step4.png \
-	../refman-common/images/myodbc-excel-step5.png \
-	../refman-common/images/myodbc-link-step1.png \
-	../refman-common/images/myodbc-link-step3.png \
-	../refman-common/images/myodbc-link-step4.png \
-	../refman-common/images/myodbc-link-step5.png \
-	../refman-common/images/myodbc-macosx-install-step1.png \
-	../refman-common/images/myodbc-macosx-install-step2.png \
-	../refman-common/images/myodbc-macosx-install-step3.png \
-	../refman-common/images/myodbc-macosx-install-step4.png \
-	../refman-common/images/myodbc-macosx-install-step5.png \
-	../refman-common/images/myodbc-macosx-install-step6.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-main.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-macosx-odbcadmin-tracing.png \
-	../refman-common/images/myodbc-win-install-step1.png \
-	../refman-common/images/myodbc-win-install-step2.png \
-	../refman-common/images/myodbc-win-install-step3.png \
-	../refman-common/images/myodbc-win-install-step4.png \
-	../refman-common/images/myodbc-win-odbcadmin-adddsn.png \
-	../refman-common/images/myodbc-win-odbcadmin-advanced.png \
-	../refman-common/images/myodbc-win-odbcadmin-driverselect.png \
-	../refman-common/images/myodbc-win-odbcadmin-main.png \
-	../refman-common/images/myodbc-win-odbcadmin-options.png \
-	../refman-common/images/myodbc-win-odbcadmin-sampledsn.png \
-	../refman-common/images/myodbc-win-tracing.png \
-	../refman-common/images/mysql-vstudioplugin-1.png \
-	../refman-common/images/mysql-vstudioplugin-3.png \
-	../refman-common/images/mysql-vstudioplugin-4.png \
-	images/blackhole-1.png \
-	images/cluster-components-1.png \
-	images/cluster-upgrade-downgrade-table.png \
-	images/multi-comp-1.png \
-	images/mysql-cfg-fig1.png \
-	images/mysql-cfg-fig10.png \
-	images/mysql-cfg-fig2.png \
-	images/mysql-cfg-fig3.png \
-	images/mysql-cfg-fig4.png \
-	images/mysql-cfg-fig5.png \
-	images/mysql-cfg-fig6.png \
-	images/mysql-cfg-fig7.png \
-	images/mysql-cfg-fig8.png \
-	images/mysql-cfg-fig9.png \
-	images/mysql-es-win32-fig1.png \
-	images/mysql-es-win32-fig2.png \
-	images/mysql-es-win32-fig3.png \
-	images/mysql-es-win32-fig4.png \
-	images/mysql-es-win32-fig5.png \
-	images/mysql-es-win32-fig6.png \
-	images/mysql-esi-win32-uninst.png \
-	images/ndb-size-pl-1.png \
-	images/replicas-groups-1-1.png \
-	images/replicas-groups-1-2.png \
-	images/rolling-restarts.png
-manual_SOURCES = manual.xml $(manual_INCLUDES)
-manual-prepped.xml: $(manual_SOURCES)
-manual-manprepped.xml: $(manual_SOURCES)
-manual-remprepped.xml: $(manual_SOURCES)
-
-mysql_cluster_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../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 \
-	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
-mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES)
-mysql-cluster-prepped.xml: $(mysql_cluster_SOURCES)
-mysql-cluster-manprepped.xml: $(mysql_cluster_SOURCES)
-mysql-cluster-remprepped.xml: $(mysql_cluster_SOURCES)
-
-news_5_0_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-news_5_0_IMAGES =
-news_5_0_SOURCES = news-5.0.xml $(news_5_0_INCLUDES)
-news-5.0-prepped.xml: $(news_5_0_SOURCES)
-news-5.0-manprepped.xml: $(news_5_0_SOURCES)
-news-5.0-remprepped.xml: $(news_5_0_SOURCES)
-
-news_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/../common/fixedchars.ent \
-	../refman-common/all-entities.ent \
-	../refman-common/news-cluster.xml \
-	../refman-common/news-connector-j.xml \
-	../refman-common/news-connector-net.xml \
-	../refman-common/news-myodbc.xml \
-	../refman-common/news-vstudioplugin.xml \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	news-5.0.xml \
-	versions.ent
-news_IMAGES =
-news_SOURCES = news.xml $(news_INCLUDES)
-news-prepped.xml: $(news_SOURCES)
-news-manprepped.xml: $(news_SOURCES)
-news-remprepped.xml: $(news_SOURCES)
-
-optimization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-optimization_IMAGES =
-optimization_SOURCES = optimization.xml $(optimization_INCLUDES)
-optimization-prepped.xml: $(optimization_SOURCES)
-optimization-manprepped.xml: $(optimization_SOURCES)
-optimization-remprepped.xml: $(optimization_SOURCES)
-
-precision_math_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-precision_math_IMAGES =
-precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES)
-precision-math-prepped.xml: $(precision_math_SOURCES)
-precision-math-manprepped.xml: $(precision_math_SOURCES)
-precision-math-remprepped.xml: $(precision_math_SOURCES)
-
-preface_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-preface_IMAGES =
-preface_SOURCES = preface.xml $(preface_INCLUDES)
-preface-prepped.xml: $(preface_SOURCES)
-preface-manprepped.xml: $(preface_SOURCES)
-preface-remprepped.xml: $(preface_SOURCES)
-
-releasenotes_cs_5_0_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-releasenotes_cs_5_0_IMAGES =
-releasenotes_cs_5_0_SOURCES = releasenotes-cs-5.0.xml $(releasenotes_cs_5_0_INCLUDES)
-releasenotes-cs-5.0-prepped.xml: $(releasenotes_cs_5_0_SOURCES)
-releasenotes-cs-5.0-manprepped.xml: $(releasenotes_cs_5_0_SOURCES)
-releasenotes-cs-5.0-remprepped.xml: $(releasenotes_cs_5_0_SOURCES)
-
-releasenotes_cs_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	releasenotes-cs-5.0.xml \
-	versions.ent
-releasenotes_cs_IMAGES =
-releasenotes_cs_SOURCES = releasenotes-cs.xml $(releasenotes_cs_INCLUDES)
-releasenotes-cs-prepped.xml: $(releasenotes_cs_SOURCES)
-releasenotes-cs-manprepped.xml: $(releasenotes_cs_SOURCES)
-releasenotes-cs-remprepped.xml: $(releasenotes_cs_SOURCES)
-
-releasenotes_es_5_0_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-releasenotes_es_5_0_IMAGES =
-releasenotes_es_5_0_SOURCES = releasenotes-es-5.0.xml $(releasenotes_es_5_0_INCLUDES)
-releasenotes-es-5.0-prepped.xml: $(releasenotes_es_5_0_SOURCES)
-releasenotes-es-5.0-manprepped.xml: $(releasenotes_es_5_0_SOURCES)
-releasenotes-es-5.0-remprepped.xml: $(releasenotes_es_5_0_SOURCES)
-
-releasenotes_es_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	releasenotes-es-5.0.xml \
-	versions.ent
-releasenotes_es_IMAGES =
-releasenotes_es_SOURCES = releasenotes-es.xml $(releasenotes_es_INCLUDES)
-releasenotes-es-prepped.xml: $(releasenotes_es_SOURCES)
-releasenotes-es-manprepped.xml: $(releasenotes_es_SOURCES)
-releasenotes-es-remprepped.xml: $(releasenotes_es_SOURCES)
-
-replication_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-replication_IMAGES =
-replication_SOURCES = replication.xml $(replication_INCLUDES)
-replication-prepped.xml: $(replication_SOURCES)
-replication-manprepped.xml: $(replication_SOURCES)
-replication-remprepped.xml: $(replication_SOURCES)
-
-reserved_new_5_0_INCLUDES =
-reserved_new_5_0_IMAGES =
-reserved_new_5_0_SOURCES = reserved-new-5.0.xml $(reserved_new_5_0_INCLUDES)
-reserved-new-5.0-prepped.xml: $(reserved_new_5_0_SOURCES)
-reserved-new-5.0-manprepped.xml: $(reserved_new_5_0_SOURCES)
-reserved-new-5.0-remprepped.xml: $(reserved_new_5_0_SOURCES)
-
-reservedwords_INCLUDES =
-reservedwords_IMAGES =
-reservedwords_SOURCES = reservedwords.xml $(reservedwords_INCLUDES)
-reservedwords-prepped.xml: $(reservedwords_SOURCES)
-reservedwords-manprepped.xml: $(reservedwords_SOURCES)
-reservedwords-remprepped.xml: $(reservedwords_SOURCES)
-
-restrictions_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-restrictions_IMAGES =
-restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
-restrictions-prepped.xml: $(restrictions_SOURCES)
-restrictions-manprepped.xml: $(restrictions_SOURCES)
-restrictions-remprepped.xml: $(restrictions_SOURCES)
-
-se_archive_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_archive_IMAGES =
-se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES)
-se-archive-prepped.xml: $(se_archive_SOURCES)
-se-archive-manprepped.xml: $(se_archive_SOURCES)
-se-archive-remprepped.xml: $(se_archive_SOURCES)
-
-se_bdb_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_bdb_IMAGES =
-se_bdb_SOURCES = se-bdb.xml $(se_bdb_INCLUDES)
-se-bdb-prepped.xml: $(se_bdb_SOURCES)
-se-bdb-manprepped.xml: $(se_bdb_SOURCES)
-se-bdb-remprepped.xml: $(se_bdb_SOURCES)
-
-se_blackhole_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	images/blackhole-1.png \
-	versions.ent
-se_blackhole_IMAGES = \
-	images/blackhole-1.png
-se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES)
-se-blackhole-prepped.xml: $(se_blackhole_SOURCES)
-se-blackhole-manprepped.xml: $(se_blackhole_SOURCES)
-se-blackhole-remprepped.xml: $(se_blackhole_SOURCES)
-
-se_csv_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_csv_IMAGES =
-se_csv_SOURCES = se-csv.xml $(se_csv_INCLUDES)
-se-csv-prepped.xml: $(se_csv_SOURCES)
-se-csv-manprepped.xml: $(se_csv_SOURCES)
-se-csv-remprepped.xml: $(se_csv_SOURCES)
-
-se_example_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_example_IMAGES =
-se_example_SOURCES = se-example.xml $(se_example_INCLUDES)
-se-example-prepped.xml: $(se_example_SOURCES)
-se-example-manprepped.xml: $(se_example_SOURCES)
-se-example-remprepped.xml: $(se_example_SOURCES)
-
-se_federated_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_federated_IMAGES =
-se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES)
-se-federated-prepped.xml: $(se_federated_SOURCES)
-se-federated-manprepped.xml: $(se_federated_SOURCES)
-se-federated-remprepped.xml: $(se_federated_SOURCES)
-
-se_innodb_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_innodb_IMAGES =
-se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES)
-se-innodb-prepped.xml: $(se_innodb_SOURCES)
-se-innodb-manprepped.xml: $(se_innodb_SOURCES)
-se-innodb-remprepped.xml: $(se_innodb_SOURCES)
-
-se_memory_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_memory_IMAGES =
-se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES)
-se-memory-prepped.xml: $(se_memory_SOURCES)
-se-memory-manprepped.xml: $(se_memory_SOURCES)
-se-memory-remprepped.xml: $(se_memory_SOURCES)
-
-se_merge_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_merge_IMAGES =
-se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES)
-se-merge-prepped.xml: $(se_merge_SOURCES)
-se-merge-manprepped.xml: $(se_merge_SOURCES)
-se-merge-remprepped.xml: $(se_merge_SOURCES)
-
-se_myisam_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-se_myisam_IMAGES =
-se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES)
-se-myisam-prepped.xml: $(se_myisam_SOURCES)
-se-myisam-manprepped.xml: $(se_myisam_SOURCES)
-se-myisam-remprepped.xml: $(se_myisam_SOURCES)
-
-spatial_extensions_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-spatial_extensions_IMAGES =
-spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES)
-spatial-extensions-prepped.xml: $(spatial_extensions_SOURCES)
-spatial-extensions-manprepped.xml: $(spatial_extensions_SOURCES)
-spatial-extensions-remprepped.xml: $(spatial_extensions_SOURCES)
-
-sql_syntax_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-sql_syntax_IMAGES =
-sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
-sql-syntax-prepped.xml: $(sql_syntax_SOURCES)
-sql-syntax-manprepped.xml: $(sql_syntax_SOURCES)
-sql-syntax-remprepped.xml: $(sql_syntax_SOURCES)
-
-storage_engines_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	images/blackhole-1.png \
-	se-archive.xml \
-	se-bdb.xml \
-	se-blackhole.xml \
-	se-csv.xml \
-	se-example.xml \
-	se-federated.xml \
-	se-innodb.xml \
-	se-memory.xml \
-	se-merge.xml \
-	se-myisam.xml \
-	versions.ent
-storage_engines_IMAGES = \
-	images/blackhole-1.png
-storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES)
-storage-engines-prepped.xml: $(storage_engines_SOURCES)
-storage-engines-manprepped.xml: $(storage_engines_SOURCES)
-storage-engines-remprepped.xml: $(storage_engines_SOURCES)
-
-stored_procedures_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-stored_procedures_IMAGES =
-stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES)
-stored-procedures-prepped.xml: $(stored_procedures_SOURCES)
-stored-procedures-manprepped.xml: $(stored_procedures_SOURCES)
-stored-procedures-remprepped.xml: $(stored_procedures_SOURCES)
-
-triggers_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-triggers_IMAGES =
-triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
-triggers-prepped.xml: $(triggers_SOURCES)
-triggers-manprepped.xml: $(triggers_SOURCES)
-triggers-remprepped.xml: $(triggers_SOURCES)
-
-tutorial_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-tutorial_IMAGES =
-tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES)
-tutorial-prepped.xml: $(tutorial_SOURCES)
-tutorial-manprepped.xml: $(tutorial_SOURCES)
-tutorial-remprepped.xml: $(tutorial_SOURCES)
-
-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-prepped.xml: $(using_mysql_programs_SOURCES)
-using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES)
-using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES)
-
-views_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../refman-common/urls.ent \
-	all-entities.ent \
-	versions.ent
-views_IMAGES =
-views_SOURCES = views.xml $(views_INCLUDES)
-views-prepped.xml: $(views_SOURCES)
-views-manprepped.xml: $(views_SOURCES)
-views-remprepped.xml: $(views_SOURCES)
-


Modified: trunk/refman-5.0/installing-es.xml
===================================================================
--- trunk/refman-5.0/installing-es.xml	2007-04-20 08:26:05 UTC (rev 6018)
+++ trunk/refman-5.0/installing-es.xml	2007-04-20 08:51:39 UTC (rev 6019)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 10; 2304 bytes

@@ -38,9 +38,9 @@
       distribution plus the latest available service pack or hot-fix.
       You only need to install the latest service pack or hot-fix
       – this will include all updates since the previous main
-      distribution release Enterprise Installer. For platforms that do
-      not yet have an Enterprise Installer, use the Community Server
-      instructions (see <xref linkend="installing-cs"/>).
+      distribution release. For platforms that do not have a MySQL
+      Enterprise Server installer, use the Community Server instructions
+      (see <xref linkend="installing-cs"/>).
     </para>
 
   </section>

@@ -120,7 +120,7 @@
 
   <section id="installing-es-installer">
 
-    <title>Installing MySQL Enterprise</title>
+    <title>Installing the Enterprise MySQL Server</title>
       &es-only;
       
           <para>

@@ -132,7 +132,7 @@
 
     <section id="installing-es-installer-windows">
 
-      <title>Using the Enterprise Installer for Windows</title>
+      <title>Using the Enterprise MySQL Installer for Windows</title>
 &es-only;
 
       <remark role="todo">

@@ -141,10 +141,10 @@
       </remark>
 
       <para>
-        The Enterprise installer installs the MySQL server and the MySQL
-        Instance Configuration Wizard, and enables you to run the
-        configuration wizard to set up and configure your server before
-        use.
+        The Enterprise MySQL Server installer installs the MySQL server
+        and the MySQL Server Configuration Wizard, and enables you to
+        run the configuration wizard to set up and configure your server
+        before use.
       </para>
 
       <para>

@@ -294,10 +294,16 @@
 
       </orderedlist>
 
-      <xi:include href="config-wizard.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
+      <para>
+        If you selected to run the MySQL Configuration Wizard, see
+        <xref
+  linkend="config-wizard"/>.
+      </para>
 
     </section>
 
+    <xi:include href="config-wizard.xml" 
xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
   </section>
 
   <section id="installing-es-upgrade">