List:Commits« Previous MessageNext Message »
From:paul.dubois Date:May 18 2011 6:09pm
Subject:svn commit - mysqldoc@oter02: r26271 - in trunk: . dynamic-docs/topic-quickref quick-guides refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 ref...
View as plain text  
Author: pd221994
Date: 2011-05-18 20:09:48 +0200 (Wed, 18 May 2011)
New Revision: 26271

Log:
 r48109@dhcp-adc-twvpn-1-vpnpool-10-154-14-26:  paul | 2011-05-18 13:05:36 -0500
 Finish renaming Internationalization & Localization -> Globalization


Renamed/Moved:
   trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.0/mysql-i18n-excerpt-aspec.xml)
   trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.0/mysql-i18n-excerpt-base.xml)
   trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.1/mysql-i18n-excerpt-aspec.xml)
   trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.1/mysql-i18n-excerpt-base.xml)
   trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.5/mysql-i18n-excerpt-aspec.xml)
   trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.5/mysql-i18n-excerpt-base.xml)
   trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.6/mysql-i18n-excerpt-aspec.xml)
   trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.6/mysql-i18n-excerpt-base.xml)
Modified:
   svk:merge
   trunk/dynamic-docs/topic-quickref/quickrefs.xml
   trunk/quick-guides/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.5/Makefile.depends
   trunk/refman-5.6/Makefile.depends
   trunk/refman-6.0/Makefile.depends
   trunk/refman-common/Makefile.depends
   trunk/topic-guides/topics-5.0/Makefile
   trunk/topic-guides/topics-5.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile
   trunk/topic-guides/topics-5.1/Makefile.depends
   trunk/topic-guides/topics-5.5/Makefile
   trunk/topic-guides/topics-5.5/Makefile.depends
   trunk/topic-guides/topics-5.6/Makefile
   trunk/topic-guides/topics-5.6/Makefile.depends

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/dynamic-docs/topic-quickref/quickrefs.xml
===================================================================
--- trunk/dynamic-docs/topic-quickref/quickrefs.xml	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/dynamic-docs/topic-quickref/quickrefs.xml	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 758 bytes

@@ -59,7 +59,7 @@
     <qrentry id="replication-semisync" ver="5.5,5.6">Semisynchronous Replication</qrentry>
     <qrentry id="spatial-extensions">Spatial Extensions</qrentry>
     <qrentry id="precision-math">Precision Math</qrentry>
-    <qrentry id="internationalization-localization">I18N &amp; L18N</qrentry>
+    <qrentry id="globalization">Globalization</qrentry>
     <qrentry id="partitioning" ver="5.1,5.4,5.5,5.6,6.0">Partitioning</qrentry>
 
   </qrgroup>


Modified: trunk/quick-guides/Makefile.depends
===================================================================
--- trunk/quick-guides/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/quick-guides/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 2080 bytes

@@ -65,8 +65,8 @@
 	../refman-5.0/metadata/data-types.idmap \
 	../refman-5.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.0/metadata/functions-core.idmap \
+	../refman-5.0/metadata/globalization.idmap \
 	../refman-5.0/metadata/installing-updowngrade.idmap \
-	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/mysql-cluster-installation.idmap \
 	../refman-5.0/metadata/news-5.0-core.idmap \

@@ -82,7 +82,7 @@
 	../refman-5.1/metadata/partitioning.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \
 	../refman-5.5/metadata/extending-mysql.idmap \
-	../refman-5.5/metadata/internationalization.idmap \
+	../refman-5.5/metadata/globalization.idmap \
 	../refman-5.5/metadata/news-5.5-core.idmap \
 	../refman-5.6/metadata/news-5.6-core.idmap
 dynxml-local-changelog.validpure: $(dynxml_local_changelog_SOURCES)

@@ -603,8 +603,8 @@
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/functions-core.idmap \
+	../refman-5.0/metadata/globalization.idmap \
 	../refman-5.0/metadata/installing-updowngrade.idmap \
-	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/mysql-cluster-configuration-core.idmap \
 	../refman-5.0/metadata/mysql-cluster-installation.idmap \

@@ -637,7 +637,7 @@
 	../refman-5.5/metadata/dba-user-management-core.idmap \
 	../refman-5.5/metadata/extending-mysql.idmap \
 	../refman-5.5/metadata/functions-core.idmap \
-	../refman-5.5/metadata/internationalization.idmap \
+	../refman-5.5/metadata/globalization.idmap \
 	../refman-5.5/metadata/news-5.5-core.idmap \
 	../refman-5.5/metadata/performance-schema-core.idmap \
 	../refman-5.5/metadata/programs-using.idmap \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-5.0/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 75, Lines Added: 85, Lines Deleted: 85; 26907 bytes

@@ -19,8 +19,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -423,9 +423,9 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -461,8 +461,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-programs-core.idmap \
 	metadata/optimization.idmap \

@@ -584,9 +584,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -1064,9 +1064,9 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -1217,10 +1217,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-installation.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -1281,8 +1281,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -1328,6 +1328,7 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-perl.idmap \

@@ -1335,7 +1336,6 @@
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \
 	metadata/programs-using.idmap \

@@ -1462,7 +1462,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/sql-syntax-compound-statements.idmap \

@@ -1576,6 +1576,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -1589,7 +1590,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1662,7 +1662,7 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1715,6 +1715,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -1728,7 +1729,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1815,9 +1815,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -1902,6 +1902,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -1915,7 +1916,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1990,9 +1990,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2052,6 +2052,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2065,7 +2066,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2132,8 +2132,8 @@
 dynxml_local_manual_index_is_IDMAPS = \
 	metadata/apis-c.idmap \
 	metadata/dba-privilege-system.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/mysql-cluster-management.idmap \
 	metadata/optimization.idmap \

@@ -2184,6 +2184,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2197,7 +2198,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2306,6 +2306,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2319,7 +2320,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2428,6 +2428,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2441,7 +2442,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2511,8 +2511,8 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -2563,6 +2563,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2576,7 +2577,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2661,11 +2661,11 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -2752,6 +2752,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2765,7 +2766,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2842,8 +2842,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-programs-core.idmap \
 	metadata/optimization.idmap \

@@ -2903,6 +2903,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -2916,7 +2917,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3037,6 +3037,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -3050,7 +3051,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3166,6 +3166,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -3179,7 +3180,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3258,10 +3258,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -3344,6 +3344,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -3357,7 +3358,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3434,10 +3434,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -3510,6 +3510,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -3523,7 +3524,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3615,11 +3615,11 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-outline.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -3788,10 +3788,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -3856,10 +3856,10 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-using.idmap \

@@ -3902,8 +3902,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -3992,9 +3992,9 @@
 	metadata/dba.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-outline.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -4145,8 +4145,8 @@
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4308,6 +4308,38 @@
 functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 
+globalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/product-versions.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	../workbench/workbench.ent \
+	all-entities.ent \
+	versions.ent
+globalization_IMAGES =
+globalization_SOURCES = globalization.xml $(globalization_INCLUDES)
+globalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
+	metadata/information-schema.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+globalization.validpure: $(globalization_SOURCES)
+globalization.titles: $(globalization_SOURCES)
+globalization.useless: $(globalization_SOURCES)
+globalization.valid: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization.validwarn: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-prepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-helpprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-manprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-remprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+
 help_metadata_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4346,8 +4378,8 @@
 information_schema_IDMAPS = \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/sql-syntax-data-definition.idmap \
 	metadata/sql-syntax-server-administration.idmap \

@@ -4492,11 +4524,11 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \

@@ -4546,9 +4578,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.0-core.idmap \

@@ -4738,6 +4770,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-es.idmap \
 	metadata/installing-generic-binary.idmap \

@@ -4747,7 +4780,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -4782,38 +4814,6 @@
 installing-manprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 installing-remprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 
-internationalization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../common/product-versions.ent \
-	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-common/enterprise.ent \
-	../refman-common/urls.ent \
-	../workbench/workbench.ent \
-	all-entities.ent \
-	versions.ent
-internationalization_IMAGES =
-internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
-internationalization_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax-server-administration.idmap
-internationalization.validpure: $(internationalization_SOURCES)
-internationalization.titles: $(internationalization_SOURCES)
-internationalization.useless: $(internationalization_SOURCES)
-internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-helpprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-
 introduction_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4851,11 +4851,11 @@
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \
 	metadata/installing-outline.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster.idmap \

@@ -5587,6 +5587,7 @@
 	extending-mysql.xml \
 	faqs-core.xml \
 	functions-core.xml \
+	globalization.xml \
 	help-metadata.xml \
 	images/published/mysql-es-win32-fig1.png \
 	images/published/mysql-es-win32-fig2.png \

@@ -5603,7 +5604,6 @@
 	installing-version.xml \
 	installing-windows.xml \
 	installing.xml \
-	internationalization.xml \
 	introduction.xml \
 	language-structure-core.xml \
 	legalnotice.en.xml \

@@ -5643,6 +5643,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -5656,7 +5657,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6037,6 +6037,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-cs.idmap \

@@ -6050,7 +6051,6 @@
 	metadata/installing-version.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6566,11 +6566,11 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-version.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -6776,12 +6776,12 @@
 programs_installation_IDMAPS = \
 	metadata/backup.idmap \
 	metadata/dba-mysqld-server-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \
 	metadata/sql-syntax-server-administration.idmap

@@ -6912,6 +6912,7 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-outline.idmap \
 	metadata/installing-perl.idmap \

@@ -6920,7 +6921,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-installation.idmap \

@@ -7217,7 +7217,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/restrictions.idmap \
 	metadata/sql-syntax-compound-statements.idmap \

@@ -7527,8 +7527,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-overview.idmap \

@@ -7696,9 +7696,9 @@
 	metadata/dba.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \

@@ -7861,11 +7861,11 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/news-5.0-core.idmap \
 	metadata/optimization.idmap \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-5.1/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 79, Lines Added: 87, Lines Deleted: 87; 27399 bytes

@@ -20,8 +20,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -483,9 +483,9 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -523,8 +523,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-programs-core.idmap \
 	metadata/optimization.idmap \

@@ -653,9 +653,9 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-postinstall.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -1248,9 +1248,9 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -1407,10 +1407,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-installation.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -1473,8 +1473,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -1524,6 +1524,7 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-generic-binary.idmap \

@@ -1532,7 +1533,6 @@
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-server-core.idmap \
 	metadata/programs-using.idmap \

@@ -1720,7 +1720,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -1865,6 +1865,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -1883,7 +1884,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1962,7 +1962,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2016,6 +2016,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2034,7 +2035,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2126,6 +2126,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -2134,7 +2135,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -2223,6 +2223,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2241,7 +2242,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2322,9 +2322,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2387,6 +2387,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2405,7 +2406,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2479,8 +2479,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-privilege-system.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-overview.idmap \

@@ -2534,6 +2534,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2552,7 +2553,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2668,6 +2668,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2686,7 +2687,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2801,6 +2801,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2819,7 +2820,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2894,8 +2894,8 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -2948,6 +2948,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -2966,7 +2967,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3056,6 +3056,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \

@@ -3064,7 +3065,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -3155,6 +3155,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3173,7 +3174,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3255,8 +3255,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-programs-core.idmap \
 	metadata/optimization.idmap \

@@ -3319,6 +3319,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3337,7 +3338,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3466,6 +3466,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3484,7 +3485,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3608,6 +3608,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3626,7 +3627,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3710,9 +3710,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -3798,6 +3798,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3816,7 +3817,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3899,9 +3899,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -3976,6 +3976,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -3994,7 +3995,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -4091,6 +4091,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -4100,7 +4101,6 @@
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -4399,10 +4399,10 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \

@@ -4468,9 +4468,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-perl.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-using.idmap \

@@ -4517,8 +4517,8 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4611,10 +4611,10 @@
 	metadata/dba.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4831,8 +4831,8 @@
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4901,9 +4901,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster.idmap \
 	metadata/optimization.idmap \

@@ -5127,6 +5127,40 @@
 functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 
+globalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/product-versions.ent \
+	../innodb-plugin-1.0/innodb-entities.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	../workbench/workbench.ent \
+	all-entities.ent \
+	versions.ent
+globalization_IMAGES =
+globalization_SOURCES = globalization.xml $(globalization_INCLUDES)
+globalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
+	metadata/information-schema.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+globalization.validpure: $(globalization_SOURCES)
+globalization.titles: $(globalization_SOURCES)
+globalization.useless: $(globalization_SOURCES)
+globalization.valid: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization.validwarn: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-prepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-helpprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-manprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-remprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+
 help_metadata_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -5169,8 +5203,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-management.idmap \
 	metadata/mysql-cluster-programs-core.idmap \
 	metadata/news-5.1-core.idmap \

@@ -5512,6 +5546,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-linux.idmap \

@@ -5520,7 +5555,6 @@
 	metadata/installing-postinstall.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \

@@ -5597,9 +5631,9 @@
 	metadata/data-types.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.1-core.idmap \
 	metadata/news.idmap \

@@ -5785,6 +5819,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-aix.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \

@@ -5800,7 +5835,6 @@
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-installation.idmap \

@@ -5831,40 +5865,6 @@
 installing-manprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 installing-remprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 
-internationalization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../common/product-versions.ent \
-	../innodb-plugin-1.0/innodb-entities.ent \
-	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-common/enterprise.ent \
-	../refman-common/urls.ent \
-	../workbench/workbench.ent \
-	all-entities.ent \
-	versions.ent
-internationalization_IMAGES =
-internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
-internationalization_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax-server-administration.idmap
-internationalization.validpure: $(internationalization_SOURCES)
-internationalization.titles: $(internationalization_SOURCES)
-internationalization.useless: $(internationalization_SOURCES)
-internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-helpprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-
 introduction_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -5905,11 +5905,11 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -6770,6 +6770,7 @@
 	extending-mysql.xml \
 	faqs-core.xml \
 	functions-core.xml \
+	globalization.xml \
 	help-metadata.xml \
 	images/published/install-osx-pkg-1.png \
 	images/published/install-osx-pkg-4.png \

@@ -6794,7 +6795,6 @@
 	installing-updowngrade.xml \
 	installing-windows.xml \
 	installing.xml \
-	internationalization.xml \
 	introduction.xml \
 	language-structure-core.xml \
 	legalnotice.en.xml \

@@ -6834,6 +6834,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -6852,7 +6853,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -7320,6 +7320,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-aix.idmap \

@@ -7338,7 +7339,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice-mysql-cluster-excerpt.en.idmap \

@@ -7997,10 +7997,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -8190,11 +8190,11 @@
 programs_installation_IDMAPS = \
 	metadata/backup.idmap \
 	metadata/dba-mysqld-server-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-linux.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -8332,6 +8332,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-linux.idmap \

@@ -8341,7 +8342,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-configuration-core.idmap \
 	metadata/mysql-cluster-installation.idmap \

@@ -8657,7 +8657,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/replication-notes.idmap \
 	metadata/restrictions.idmap \

@@ -8961,9 +8961,9 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-management.idmap \

@@ -9143,9 +9143,9 @@
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/mysql-cluster-overview.idmap \
 	metadata/mysql-cluster-replication-core.idmap \


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-5.5/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 78, Lines Added: 86, Lines Deleted: 86; 26911 bytes

@@ -20,8 +20,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -481,9 +481,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -521,8 +521,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -672,9 +672,9 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-postinstall.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -1259,9 +1259,9 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1415,10 +1415,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \

@@ -1470,8 +1470,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -1634,7 +1634,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -1774,6 +1774,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -1791,7 +1792,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1860,7 +1860,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1915,6 +1915,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -1932,7 +1933,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2014,6 +2014,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -2021,7 +2022,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2102,6 +2102,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2119,7 +2120,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2190,9 +2190,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2256,6 +2256,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2273,7 +2274,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2337,8 +2337,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-privilege-system.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -2391,6 +2391,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2408,7 +2409,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2513,6 +2513,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2530,7 +2531,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2633,6 +2633,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2650,7 +2651,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2715,8 +2715,8 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2769,6 +2769,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2786,7 +2787,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2866,6 +2866,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \

@@ -2873,7 +2874,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -2957,6 +2957,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -2974,7 +2975,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3046,8 +3046,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/performance-schema-core.idmap \

@@ -3109,6 +3109,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -3126,7 +3127,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3245,6 +3245,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -3262,7 +3263,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3376,6 +3376,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -3393,7 +3394,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3467,9 +3467,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3550,6 +3550,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -3567,7 +3568,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3640,9 +3640,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3715,6 +3715,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -3732,7 +3733,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3819,6 +3819,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -3827,7 +3828,6 @@
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -3920,10 +3920,10 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4004,8 +4004,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-using.idmap \

@@ -4051,8 +4051,8 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4141,10 +4141,10 @@
 	metadata/dba.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4327,7 +4327,7 @@
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4439,10 +4439,10 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.5-core.idmap \

@@ -4665,6 +4665,39 @@
 functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 
+globalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/product-versions.ent \
+	../mysql-monitor-2.3/enterprise.ent \
+	../mysql-monitor-2.3/version.ent \
+	../refman-common/urls.ent \
+	../workbench/workbench.ent \
+	all-entities.ent \
+	versions.ent
+globalization_IMAGES =
+globalization_SOURCES = globalization.xml $(globalization_INCLUDES)
+globalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
+	metadata/information-schema.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+globalization.validpure: $(globalization_SOURCES)
+globalization.titles: $(globalization_SOURCES)
+globalization.useless: $(globalization_SOURCES)
+globalization.valid: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization.validwarn: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-prepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-helpprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-manprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-remprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+
 help_metadata_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4744,8 +4777,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/replication-notes.idmap \

@@ -5136,6 +5169,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-linux.idmap \

@@ -5144,7 +5178,6 @@
 	metadata/installing-postinstall.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \
 	metadata/programs-using.idmap \

@@ -5218,9 +5251,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.5-core.idmap \
 	metadata/news.idmap \

@@ -5388,6 +5421,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \
 	metadata/installing-general.idmap \

@@ -5401,7 +5435,6 @@
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.5-core.idmap \
 	metadata/news.idmap \

@@ -5427,39 +5460,6 @@
 installing-manprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 installing-remprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 
-internationalization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../common/product-versions.ent \
-	../mysql-monitor-2.3/enterprise.ent \
-	../mysql-monitor-2.3/version.ent \
-	../refman-common/urls.ent \
-	../workbench/workbench.ent \
-	all-entities.ent \
-	versions.ent
-internationalization_IMAGES =
-internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
-internationalization_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax-server-administration.idmap
-internationalization.validpure: $(internationalization_SOURCES)
-internationalization.titles: $(internationalization_SOURCES)
-internationalization.useless: $(internationalization_SOURCES)
-internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-helpprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-
 introduction_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -5500,12 +5500,12 @@
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news.idmap \

@@ -6266,6 +6266,7 @@
 	extending-mysql.xml \
 	faqs-core.xml \
 	functions-core.xml \
+	globalization.xml \
 	help-metadata.xml \
 	images/published/dtrace-groups.png \
 	images/published/install-osx-pkg-1.png \

@@ -6308,7 +6309,6 @@
 	installing-updowngrade.xml \
 	installing-windows.xml \
 	installing.xml \
-	internationalization.xml \
 	introduction.xml \
 	language-structure-core.xml \
 	legalnotice.en.xml \

@@ -6349,6 +6349,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \

@@ -6366,7 +6367,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6792,6 +6792,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \

@@ -6808,7 +6809,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -7101,10 +7101,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -7150,9 +7150,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/sql-syntax-data-definition.idmap \

@@ -7301,11 +7301,11 @@
 	metadata/backup.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-linux.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-using.idmap \
 	metadata/sql-syntax-server-administration.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)

@@ -7436,6 +7436,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-linux.idmap \

@@ -7445,7 +7446,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \

@@ -7751,7 +7751,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/replication-notes.idmap \
 	metadata/restrictions.idmap \

@@ -8031,8 +8031,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -8205,9 +8205,9 @@
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \


Modified: trunk/refman-5.6/Makefile.depends
===================================================================
--- trunk/refman-5.6/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-5.6/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 78, Lines Added: 85, Lines Deleted: 85; 26776 bytes

@@ -20,8 +20,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/performance-schema-core.idmap \

@@ -482,9 +482,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/performance-schema-core.idmap \

@@ -523,7 +523,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -673,9 +673,9 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-postinstall.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -1259,9 +1259,9 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1415,10 +1415,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \

@@ -1470,8 +1470,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -1590,7 +1590,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -1730,6 +1730,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -1756,7 +1757,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1825,7 +1825,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1880,6 +1880,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -1906,7 +1907,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1988,6 +1988,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -1995,7 +1996,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2076,6 +2076,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2102,7 +2103,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2173,9 +2173,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2239,6 +2239,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2265,7 +2266,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2329,8 +2329,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-privilege-system.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -2383,6 +2383,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2409,7 +2410,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2514,6 +2514,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2540,7 +2541,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2643,6 +2643,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2669,7 +2670,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2734,8 +2734,8 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2788,6 +2788,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -2814,7 +2815,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2894,6 +2894,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \

@@ -2901,7 +2902,6 @@
 	metadata/installing-macosx.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -2985,6 +2985,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3011,7 +3012,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3083,8 +3083,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/performance-schema-core.idmap \

@@ -3146,6 +3146,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3172,7 +3173,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3291,6 +3291,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3317,7 +3318,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3430,6 +3430,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3456,7 +3457,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3530,9 +3530,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3613,6 +3613,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3639,7 +3640,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3712,9 +3712,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3787,6 +3787,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -3813,7 +3814,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3900,6 +3900,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \

@@ -3908,7 +3909,6 @@
 	metadata/installing-solaris.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -3989,9 +3989,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4073,8 +4073,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-using.idmap \

@@ -4120,8 +4120,8 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4210,10 +4210,10 @@
 	metadata/dba.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4416,7 +4416,7 @@
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4492,6 +4492,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/innodb-compression.idmap \

@@ -4502,7 +4503,6 @@
 	metadata/innodb-performance.idmap \
 	metadata/innodb-row-format.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/meb.idmap \
 	metadata/optimization.idmap \

@@ -4725,6 +4725,39 @@
 functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 
+globalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/product-versions.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	../workbench/workbench.ent \
+	all-entities.ent \
+	versions.ent
+globalization_IMAGES =
+globalization_SOURCES = globalization.xml $(globalization_INCLUDES)
+globalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
+	metadata/information-schema.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+globalization.validpure: $(globalization_SOURCES)
+globalization.titles: $(globalization_SOURCES)
+globalization.useless: $(globalization_SOURCES)
+globalization.valid: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization.validwarn: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-prepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-helpprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-manprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-remprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+
 glossary_core_INCLUDES =
 glossary_core_IMAGES =
 glossary_core_SOURCES = glossary-core.xml $(glossary_core_INCLUDES)

@@ -4819,11 +4852,11 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/information-schema-innodb.idmap \
 	metadata/information-schema.idmap \
 	metadata/innodb-information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/replication-notes.idmap \

@@ -5246,6 +5279,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-linux.idmap \

@@ -5254,7 +5288,6 @@
 	metadata/installing-postinstall.idmap \
 	metadata/installing-solaris.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \
 	metadata/programs-using.idmap \

@@ -5490,6 +5523,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-freebsd.idmap \
 	metadata/installing-general.idmap \

@@ -5503,7 +5537,6 @@
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-5.6-core.idmap \
 	metadata/news.idmap \

@@ -5530,39 +5563,6 @@
 installing-manprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 installing-remprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 
-internationalization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../common/product-versions.ent \
-	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-common/enterprise.ent \
-	../refman-common/urls.ent \
-	../workbench/workbench.ent \
-	all-entities.ent \
-	versions.ent
-internationalization_IMAGES =
-internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
-internationalization_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax-server-administration.idmap
-internationalization.validpure: $(internationalization_SOURCES)
-internationalization.titles: $(internationalization_SOURCES)
-internationalization.useless: $(internationalization_SOURCES)
-internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-helpprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-
 introduction_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -5602,12 +5602,12 @@
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news.idmap \

@@ -6298,6 +6298,7 @@
 	extending-mysql.xml \
 	faqs-core.xml \
 	functions-core.xml \
+	globalization.xml \
 	glossary-core.xml \
 	help-metadata.xml \
 	images/published/dtrace-groups.png \

@@ -6331,7 +6332,6 @@
 	installing-updowngrade.xml \
 	installing-windows.xml \
 	installing.xml \
-	internationalization.xml \
 	introduction.xml \
 	language-structure-core.xml \
 	legalnotice.en.xml \

@@ -6372,6 +6372,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -6398,7 +6399,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6810,6 +6810,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema-innodb.idmap \

@@ -6835,7 +6836,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -7124,13 +7124,13 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/glossary-core.idmap \
 	metadata/information-schema.idmap \
 	metadata/innodb-create-index.idmap \
 	metadata/innodb-performance.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -7177,9 +7177,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/sql-syntax-data-definition.idmap \

@@ -7328,11 +7328,11 @@
 	metadata/backup.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-user-management-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-linux.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-using.idmap \
 	metadata/sql-syntax-server-administration.idmap
 programs-installation.validpure: $(programs_installation_SOURCES)

@@ -7463,6 +7463,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-envvar.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-linux.idmap \

@@ -7472,7 +7473,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \

@@ -7779,7 +7779,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/replication-notes.idmap \
 	metadata/restrictions.idmap \

@@ -8058,8 +8058,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -8231,10 +8231,10 @@
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/innodb-performance.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-6.0/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 76, Lines Added: 87, Lines Deleted: 87; 26967 bytes

@@ -19,8 +19,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -478,9 +478,9 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-development.idmap \

@@ -517,7 +517,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -667,9 +667,9 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -1254,9 +1254,9 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1411,10 +1411,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/replication-configuration.idmap \
 	metadata/replication-notes.idmap \

@@ -1467,8 +1467,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/precision-math.idmap \

@@ -1515,6 +1515,7 @@
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-perl.idmap \

@@ -1522,7 +1523,6 @@
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \

@@ -1558,7 +1558,7 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -1699,6 +1699,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -1709,7 +1710,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1782,7 +1782,7 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -1837,6 +1837,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -1847,7 +1848,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -1933,11 +1933,11 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2020,6 +2020,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2030,7 +2031,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2105,9 +2105,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2170,6 +2170,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2180,7 +2181,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2248,8 +2248,8 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-privilege-system.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -2303,6 +2303,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2313,7 +2314,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2423,6 +2423,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2433,7 +2434,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2540,6 +2540,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2550,7 +2551,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2619,8 +2619,8 @@
 	metadata/dba-privilege-system.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -2673,6 +2673,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2683,7 +2684,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2767,11 +2767,11 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -2858,6 +2858,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -2868,7 +2869,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -2944,8 +2944,8 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/performance-schema-core.idmap \

@@ -3007,6 +3007,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -3017,7 +3018,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3140,6 +3140,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -3150,7 +3151,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3267,6 +3267,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -3277,7 +3278,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3355,10 +3355,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3441,6 +3441,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -3451,7 +3452,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3528,10 +3528,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3606,6 +3606,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -3616,7 +3617,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -3707,11 +3707,11 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/licenses-third-party-core.idmap \

@@ -3830,10 +3830,10 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -3920,8 +3920,8 @@
 	metadata/dba-log-files.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/dba-security-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-perl.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-using.idmap \

@@ -3967,8 +3967,8 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4056,10 +4056,10 @@
 	metadata/dba.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/news.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4321,8 +4321,8 @@
 	metadata/dba-multiple-servers.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-client-core.idmap \

@@ -4391,9 +4391,9 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \

@@ -4615,6 +4615,39 @@
 functions-core-manprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 functions-core-remprepped.xml: $(functions_core_SOURCES) $(functions_core_IDMAPS)
 
+globalization_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../common/product-versions.ent \
+	../mysql-monitor-2.0/version.ent \
+	../mysql-monitor-common/enterprise.ent \
+	../refman-common/urls.ent \
+	../workbench/workbench.ent \
+	all-entities.ent \
+	versions.ent
+globalization_IMAGES =
+globalization_SOURCES = globalization.xml $(globalization_INCLUDES)
+globalization_IDMAPS = \
+	metadata/data-types.idmap \
+	metadata/dba-mysqld-server-core.idmap \
+	metadata/faqs-core.idmap \
+	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
+	metadata/information-schema.idmap \
+	metadata/optimization.idmap \
+	metadata/programs-installation.idmap \
+	metadata/replication-notes.idmap \
+	metadata/sql-syntax-server-administration.idmap
+globalization.validpure: $(globalization_SOURCES)
+globalization.titles: $(globalization_SOURCES)
+globalization.useless: $(globalization_SOURCES)
+globalization.valid: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization.validwarn: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-prepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-helpprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-manprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+globalization-remprepped.xml: $(globalization_SOURCES) $(globalization_IDMAPS)
+
 help_metadata_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4656,8 +4689,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/replication-notes.idmap \

@@ -4778,12 +4811,12 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/errors-problems.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/programs-admin-util-core.idmap \
 	metadata/programs-server-core.idmap \
 	metadata/programs-using.idmap \

@@ -4829,9 +4862,9 @@
 	metadata/data-types.idmap \
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-6.0-core.idmap \
 	metadata/news.idmap \

@@ -4979,6 +5012,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-generic-binary.idmap \
 	metadata/installing-perl.idmap \

@@ -4987,7 +5021,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news-6.0-core.idmap \
 	metadata/news.idmap \

@@ -5013,39 +5046,6 @@
 installing-manprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 installing-remprepped.xml: $(installing_SOURCES) $(installing_IDMAPS)
 
-internationalization_INCLUDES = \
-	../common/fixedchars.ent \
-	../common/phrases.ent \
-	../common/product-versions.ent \
-	../mysql-monitor-2.0/version.ent \
-	../mysql-monitor-common/enterprise.ent \
-	../refman-common/urls.ent \
-	../workbench/workbench.ent \
-	all-entities.ent \
-	versions.ent
-internationalization_IMAGES =
-internationalization_SOURCES = internationalization.xml $(internationalization_INCLUDES)
-internationalization_IDMAPS = \
-	metadata/data-types.idmap \
-	metadata/dba-mysqld-server-core.idmap \
-	metadata/faqs-core.idmap \
-	metadata/functions-core.idmap \
-	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
-	metadata/optimization.idmap \
-	metadata/programs-installation.idmap \
-	metadata/replication-notes.idmap \
-	metadata/sql-syntax-server-administration.idmap
-internationalization.validpure: $(internationalization_SOURCES)
-internationalization.titles: $(internationalization_SOURCES)
-internationalization.useless: $(internationalization_SOURCES)
-internationalization.valid: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization.validwarn: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-prepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-helpprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-manprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-internationalization-remprepped.xml: $(internationalization_SOURCES) $(internationalization_IDMAPS)
-
 introduction_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -5086,11 +5086,11 @@
 	metadata/errors-problems.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/news.idmap \

@@ -5758,6 +5758,7 @@
 	extending-mysql.xml \
 	faqs-core.xml \
 	functions-core.xml \
+	globalization.xml \
 	help-metadata.xml \
 	images/published/dtrace-groups.png \
 	information-schema.xml \

@@ -5769,7 +5770,6 @@
 	installing-updowngrade.xml \
 	installing-windows.xml \
 	installing.xml \
-	internationalization.xml \
 	introduction.xml \
 	legalnotice.en.xml \
 	licenses-third-party-core.xml \

@@ -5809,6 +5809,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -5819,7 +5820,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6235,6 +6235,7 @@
 	metadata/extending-mysql.idmap \
 	metadata/faqs-core.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/help-metadata.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-general.idmap \

@@ -6245,7 +6246,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/legalnotice.en.idmap \

@@ -6553,10 +6553,10 @@
 	metadata/errors-problems.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -6603,9 +6603,9 @@
 	metadata/dba-mysqld-server-core.idmap \
 	metadata/errors-problems.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
-	metadata/internationalization.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \
 	metadata/sql-syntax-data-definition.idmap \

@@ -6753,11 +6753,11 @@
 programs_installation_IDMAPS = \
 	metadata/backup.idmap \
 	metadata/dba-mysqld-server-core.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-postinstall.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/programs-installation.idmap \
 	metadata/programs-using.idmap \

@@ -6891,6 +6891,7 @@
 	metadata/dba-security-core.idmap \
 	metadata/dba-user-management-core.idmap \
 	metadata/events.idmap \
+	metadata/globalization.idmap \
 	metadata/installing-general.idmap \
 	metadata/installing-perl.idmap \
 	metadata/installing-postinstall.idmap \

@@ -6898,7 +6899,6 @@
 	metadata/installing-updowngrade.idmap \
 	metadata/installing-windows.idmap \
 	metadata/installing.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/programs-admin-util-core.idmap \

@@ -7247,7 +7247,7 @@
 restrictions_IMAGES =
 restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES)
 restrictions_IDMAPS = \
-	metadata/internationalization.idmap \
+	metadata/globalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/replication-notes.idmap \
 	metadata/restrictions.idmap \

@@ -7569,8 +7569,8 @@
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
 	metadata/functions-core.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
-	metadata/internationalization.idmap \
 	metadata/introduction.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \

@@ -7743,10 +7743,10 @@
 	metadata/errors-problems.idmap \
 	metadata/events.idmap \
 	metadata/extending-mysql.idmap \
+	metadata/globalization.idmap \
 	metadata/information-schema.idmap \
 	metadata/installing-source-core.idmap \
 	metadata/installing-updowngrade.idmap \
-	metadata/internationalization.idmap \
 	metadata/language-structure-core.idmap \
 	metadata/optimization.idmap \
 	metadata/partitioning.idmap \


Modified: trunk/refman-common/Makefile.depends
===================================================================
--- trunk/refman-common/Makefile.depends	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/refman-common/Makefile.depends	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1078 bytes

@@ -12,7 +12,7 @@
 connector_j_IDMAPS = \
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/internationalization.idmap \
+	../refman-5.0/metadata/globalization.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	metadata/connector-j.idmap \
 	metadata/information-sources.idmap \

@@ -154,8 +154,8 @@
 	../refman-5.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
+	../refman-5.0/metadata/globalization.idmap \
 	../refman-5.0/metadata/installing-source-core.idmap \
-	../refman-5.0/metadata/internationalization.idmap \
 	metadata/connector-odbc.idmap \
 	metadata/information-sources.idmap \
 	metadata/news-codbc-core.idmap


Modified: trunk/topic-guides/topics-5.0/Makefile
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/topic-guides/topics-5.0/Makefile	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1030 bytes

@@ -47,7 +47,7 @@
 
 DEPEND_FILES = \
 	mysql-backup-excerpt.arbitrary \
-	mysql-i18n-excerpt.arbitrary \
+	mysql-g11n-excerpt.arbitrary \
 	mysql-installation-excerpt.arbitrary \
 	mysql-linuxunix-excerpt.arbitrary \
 	mysql-macosx-excerpt.arbitrary \

@@ -62,7 +62,7 @@
 mysql-backup-excerpt.xml: mysql-backup-excerpt-arbitrary.xml
 	cp $< $@
 
-mysql-i18n-excerpt.xml: mysql-i18n-excerpt-arbitrary.xml
+mysql-g11n-excerpt.xml: mysql-g11n-excerpt-arbitrary.xml
 	cp $< $@
 
 mysql-installation-excerpt.xml: mysql-installation-excerpt-arbitrary.xml

@@ -99,7 +99,7 @@
 	$(RM) $(DEPEND_FILES)
 	$(RM) \
 		mysql-backup-excerpt.xml \
-		mysql-i18n-excerpt.xml \
+		mysql-g11n-excerpt.xml \
 		mysql-installation-excerpt.xml \
 		mysql-linuxunix-excerpt.xml \
 		mysql-macosx-excerpt.xml \


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 6, Lines Added: 134, Lines Deleted: 70; 17860 bytes

@@ -109,57 +109,57 @@
 mysql-backup-excerpt-manprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 mysql-backup-excerpt-remprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 
-mysql_i18n_excerpt_arbitrary_INCLUDES = \
+mysql_g11n_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../refman-5.0/internationalization.xml \
+	../../refman-5.0/globalization.xml \
 	../../refman-5.0/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_arbitrary_IMAGES =
-mysql_i18n_excerpt_arbitrary_SOURCES = mysql-i18n-excerpt-arbitrary.xml $(mysql_i18n_excerpt_arbitrary_INCLUDES)
-mysql_i18n_excerpt_arbitrary_IDMAPS =
-mysql-i18n-excerpt-arbitrary.validpure: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.titles: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.useless: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.valid: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary.validwarn: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-prepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-helpprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-manprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-remprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_arbitrary_IMAGES =
+mysql_g11n_excerpt_arbitrary_SOURCES = mysql-g11n-excerpt-arbitrary.xml $(mysql_g11n_excerpt_arbitrary_INCLUDES)
+mysql_g11n_excerpt_arbitrary_IDMAPS =
+mysql-g11n-excerpt-arbitrary.validpure: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.titles: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.useless: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.valid: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary.validwarn: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-prepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-helpprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-manprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-remprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
 
-mysql_i18n_excerpt_aspec_INCLUDES =
-mysql_i18n_excerpt_aspec_IMAGES =
-mysql_i18n_excerpt_aspec_SOURCES = mysql-i18n-excerpt-aspec.xml $(mysql_i18n_excerpt_aspec_INCLUDES)
-mysql_i18n_excerpt_aspec_IDMAPS =
-mysql-i18n-excerpt-aspec.validpure: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.titles: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.useless: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.valid: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec.validwarn: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-prepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-helpprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-manprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-remprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
+mysql_g11n_excerpt_aspec_INCLUDES =
+mysql_g11n_excerpt_aspec_IMAGES =
+mysql_g11n_excerpt_aspec_SOURCES = mysql-g11n-excerpt-aspec.xml $(mysql_g11n_excerpt_aspec_INCLUDES)
+mysql_g11n_excerpt_aspec_IDMAPS =
+mysql-g11n-excerpt-aspec.validpure: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.titles: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.useless: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.valid: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec.validwarn: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-prepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-helpprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-manprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-remprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
 
-mysql_i18n_excerpt_base_INCLUDES =
-mysql_i18n_excerpt_base_IMAGES =
-mysql_i18n_excerpt_base_SOURCES = mysql-i18n-excerpt-base.xml $(mysql_i18n_excerpt_base_INCLUDES)
-mysql_i18n_excerpt_base_IDMAPS =
-mysql-i18n-excerpt-base.validpure: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.titles: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.useless: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.valid: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base.validwarn: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-prepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-helpprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-manprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-remprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
+mysql_g11n_excerpt_base_INCLUDES =
+mysql_g11n_excerpt_base_IMAGES =
+mysql_g11n_excerpt_base_SOURCES = mysql-g11n-excerpt-base.xml $(mysql_g11n_excerpt_base_INCLUDES)
+mysql_g11n_excerpt_base_IDMAPS =
+mysql-g11n-excerpt-base.validpure: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.titles: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.useless: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.valid: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base.validwarn: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-prepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-helpprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-manprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-remprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
 
-mysql_i18n_excerpt_INCLUDES = \
+mysql_g11n_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/gpl-notice.en.xml \
 	../../common/legalnotice-misc-refman.en.xml \

@@ -169,26 +169,26 @@
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \
 	../../refman-5.0/all-entities.ent \
-	../../refman-5.0/internationalization.xml \
+	../../refman-5.0/globalization.xml \
 	../../refman-5.0/legalnotice.en.xml \
 	../../refman-5.0/versions.ent \
 	../../refman-common/urls.ent \
 	../../workbench/workbench.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_IMAGES =
-mysql_i18n_excerpt_SOURCES = mysql-i18n-excerpt.xml $(mysql_i18n_excerpt_INCLUDES)
-mysql_i18n_excerpt_IDMAPS =
-mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.valid: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt.validwarn: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-prepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-helpprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-manprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-remprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_IMAGES =
+mysql_g11n_excerpt_SOURCES = mysql-g11n-excerpt.xml $(mysql_g11n_excerpt_INCLUDES)
+mysql_g11n_excerpt_IDMAPS =
+mysql-g11n-excerpt.validpure: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.titles: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.useless: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.valid: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt.validwarn: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-prepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-helpprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-manprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-remprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
 
 mysql_installation_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \

@@ -1230,16 +1230,6 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml: ../../refman-common/urls.ent mysql-i18n-excerpt-base.xml ../../refman-5.0/metadata/internationalization.idmap ../../refman-5.0/internationalization.xml all-entities.ent ../../common/phrases.ent mysql-i18n-excerpt-aspec.xml ../../common/fixedchars.ent ../../refman-5.0/versions.ent
-	$(MAKE) mysql-i18n-excerpt.arbitraryforce
-
-# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-i18n-excerpt-arbitrary.xml: mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml
-	$(MAKE) mysql-i18n-excerpt.arbitrary
-	cp mysql-i18n-excerpt.arbitrary mysql-i18n-excerpt-arbitrary.xml
-
-
-# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-backup-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.xml mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.xml: ../../refman-5.0/metadata/replication-solutions.idmap ../../refman-5.0/backup.xml ../../refman-5.0/metadata/se-innodb-core.idmap ../../refman-common/urls.ent ../../refman-5.0/se-innodb-core.xml ../../refman-5.0/metadata/backup.idmap ../../refman-5.0/replication-solutions.xml all-entities.ent mysql-backup-excerpt-base.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.0/versions.ent mysql-backup-excerpt-aspec.xml
 	$(MAKE) mysql-backup-excerpt.arbitraryforce
 

@@ -1320,6 +1310,16 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
+mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml: ../../refman-common/urls.ent ../../refman-5.0/globalization.xml ../../refman-5.0/metadata/globalization.idmap all-entities.ent mysql-g11n-excerpt-base.xml ../../common/phrases.ent ../../common/fixedchars.ent mysql-g11n-excerpt-aspec.xml ../../refman-5.0/versions.ent
+	$(MAKE) mysql-g11n-excerpt.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+mysql-g11n-excerpt-arbitrary.xml: mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml
+	$(MAKE) mysql-g11n-excerpt.arbitrary
+	cp mysql-g11n-excerpt.arbitrary mysql-g11n-excerpt-arbitrary.xml
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.other-unix-notes.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.unix-postinstallation.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.bsd-notes.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.linux-installation-rpm.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.xml mysql-linuxunix-excerpt-aspec.xml.binary-installation.none.chapter.xml: ../../refman-common/urls.ent ../../refman-5.0/metadata/installing-generic-binary.idmap ../../refman-5.0/installing-generic-binary.xml mysql-linuxunix-excerpt-base.xml ../../refman-5.0/metadata/installing.idmap ../../refman-5.0/metadata/installing-postinstall.idmap all-entities.ent ../../common/phrases.ent mysql-linuxunix-excerpt-aspec.xml ../../refman-5.0/installing-postinstall.xml ../../common/fixedchars.ent ../../refman-5.0/versions.ent ../../refm
 an-5.0/installing.xml
 	$(MAKE) mysql-linuxunix-excerpt.arbitraryforce
 

Copied: trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.0/mysql-i18n-excerpt-aspec.xml)
===================================================================
--- trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-aspec.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-aspec.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book SYSTEM "http://dev.mysql.com/doc/dtd/arbitrary-specification.dtd">
+<book>
+
+  <fragment id="mysql-g11n-imports">
+
+    <include prefix="refman-5.0" src="globalization" filter="all" markas="preface"/>
+
+    <include prefix="refman-5.0" src="charset" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="charset-configuration" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="error-message-language" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="adding-character-set" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="adding-collation" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="time-zone-support" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.0" src="locale-support" filter="none" markas="chapter"/>
+
+  </fragment>
+
+</book>

Copied: trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.0/mysql-i18n-excerpt-base.xml)
===================================================================
--- trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.0/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+  %all.entities;
+]>
+<book id="mysql-g11n-excerpt" lang="en">
+
+  <title>MySQL Globalization</title>
+
+  <bookinfo>
+
+    <abstract>
+
+      <para>
+        This is the MySQL Globalization extract
+        from the MySQL &current-series; Reference Manual.
+      </para>
+
+      <para>
+        Document generated on:
+
+        <remark role="current.date"/>
+
+
+
+        <remark role="repository.revision"/>
+      </para>
+
+    </abstract>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../refman-5.0/legalnotice.en.xml"/>
+
+  </bookinfo>
+
+<!--SRCFILE mysql-g11n-imports-->
+
+</book>


Modified: trunk/topic-guides/topics-5.1/Makefile
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/topic-guides/topics-5.1/Makefile	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1079 bytes

@@ -52,7 +52,7 @@
 DEPEND_FILES = \
 	mysql-backup-excerpt.arbitrary \
 	mysql-cluster-excerpt.arbitrary \
-	mysql-i18n-excerpt.arbitrary \
+	mysql-g11n-excerpt.arbitrary \
 	mysql-infoschema-excerpt.arbitrary \
 	mysql-installation-excerpt.arbitrary \
 	mysql-linuxunix-excerpt.arbitrary \

@@ -73,7 +73,7 @@
 mysql-cluster-excerpt.xml: mysql-cluster-excerpt-arbitrary.xml
 	cp $< $@
 
-mysql-i18n-excerpt.xml: mysql-i18n-excerpt-arbitrary.xml
+mysql-g11n-excerpt.xml: mysql-g11n-excerpt-arbitrary.xml
 	cp $< $@
 
 mysql-infoschema-excerpt.xml: mysql-infoschema-excerpt-arbitrary.xml

@@ -120,7 +120,7 @@
 	$(RM) \
 		mysql-backup-excerpt.xml \
 		mysql-cluster-excerpt.xml \
-		mysql-i18n-excerpt.xml \
+		mysql-g11n-excerpt.xml \
 		mysql-infoschema-excerpt.xml \
 		mysql-installation-excerpt.xml \
 		mysql-linuxunix-excerpt.xml \


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 6, Lines Added: 134, Lines Deleted: 70; 19496 bytes

@@ -361,58 +361,58 @@
 mysql-cluster-excerpt-manprepped.xml: $(mysql_cluster_excerpt_SOURCES) $(mysql_cluster_excerpt_IDMAPS)
 mysql-cluster-excerpt-remprepped.xml: $(mysql_cluster_excerpt_SOURCES) $(mysql_cluster_excerpt_IDMAPS)
 
-mysql_i18n_excerpt_arbitrary_INCLUDES = \
+mysql_g11n_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
 	../../mysql-monitor-common/enterprise.ent \
-	../../refman-5.1/internationalization.xml \
+	../../refman-5.1/globalization.xml \
 	../../refman-5.1/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_arbitrary_IMAGES =
-mysql_i18n_excerpt_arbitrary_SOURCES = mysql-i18n-excerpt-arbitrary.xml $(mysql_i18n_excerpt_arbitrary_INCLUDES)
-mysql_i18n_excerpt_arbitrary_IDMAPS =
-mysql-i18n-excerpt-arbitrary.validpure: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.titles: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.useless: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.valid: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary.validwarn: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-prepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-helpprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-manprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-remprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_arbitrary_IMAGES =
+mysql_g11n_excerpt_arbitrary_SOURCES = mysql-g11n-excerpt-arbitrary.xml $(mysql_g11n_excerpt_arbitrary_INCLUDES)
+mysql_g11n_excerpt_arbitrary_IDMAPS =
+mysql-g11n-excerpt-arbitrary.validpure: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.titles: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.useless: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.valid: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary.validwarn: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-prepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-helpprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-manprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-remprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
 
-mysql_i18n_excerpt_aspec_INCLUDES =
-mysql_i18n_excerpt_aspec_IMAGES =
-mysql_i18n_excerpt_aspec_SOURCES = mysql-i18n-excerpt-aspec.xml $(mysql_i18n_excerpt_aspec_INCLUDES)
-mysql_i18n_excerpt_aspec_IDMAPS =
-mysql-i18n-excerpt-aspec.validpure: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.titles: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.useless: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.valid: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec.validwarn: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-prepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-helpprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-manprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-remprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
+mysql_g11n_excerpt_aspec_INCLUDES =
+mysql_g11n_excerpt_aspec_IMAGES =
+mysql_g11n_excerpt_aspec_SOURCES = mysql-g11n-excerpt-aspec.xml $(mysql_g11n_excerpt_aspec_INCLUDES)
+mysql_g11n_excerpt_aspec_IDMAPS =
+mysql-g11n-excerpt-aspec.validpure: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.titles: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.useless: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.valid: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec.validwarn: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-prepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-helpprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-manprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-remprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
 
-mysql_i18n_excerpt_base_INCLUDES =
-mysql_i18n_excerpt_base_IMAGES =
-mysql_i18n_excerpt_base_SOURCES = mysql-i18n-excerpt-base.xml $(mysql_i18n_excerpt_base_INCLUDES)
-mysql_i18n_excerpt_base_IDMAPS =
-mysql-i18n-excerpt-base.validpure: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.titles: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.useless: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.valid: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base.validwarn: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-prepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-helpprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-manprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-remprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
+mysql_g11n_excerpt_base_INCLUDES =
+mysql_g11n_excerpt_base_IMAGES =
+mysql_g11n_excerpt_base_SOURCES = mysql-g11n-excerpt-base.xml $(mysql_g11n_excerpt_base_INCLUDES)
+mysql_g11n_excerpt_base_IDMAPS =
+mysql-g11n-excerpt-base.validpure: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.titles: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.useless: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.valid: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base.validwarn: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-prepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-helpprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-manprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-remprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
 
-mysql_i18n_excerpt_INCLUDES = \
+mysql_g11n_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/gpl-notice.en.xml \
 	../../common/legalnotice-misc-refman.en.xml \

@@ -423,26 +423,26 @@
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \
 	../../refman-5.1/all-entities.ent \
-	../../refman-5.1/internationalization.xml \
+	../../refman-5.1/globalization.xml \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \
 	../../refman-common/urls.ent \
 	../../workbench/workbench.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_IMAGES =
-mysql_i18n_excerpt_SOURCES = mysql-i18n-excerpt.xml $(mysql_i18n_excerpt_INCLUDES)
-mysql_i18n_excerpt_IDMAPS =
-mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.valid: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt.validwarn: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-prepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-helpprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-manprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-remprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_IMAGES =
+mysql_g11n_excerpt_SOURCES = mysql-g11n-excerpt.xml $(mysql_g11n_excerpt_INCLUDES)
+mysql_g11n_excerpt_IDMAPS =
+mysql-g11n-excerpt.validpure: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.titles: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.useless: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.valid: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt.validwarn: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-prepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-helpprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-manprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-remprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
 
 mysql_infoschema_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \

@@ -1839,16 +1839,6 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml: ../../refman-common/urls.ent ../../refman-5.1/internationalization.xml ../../mysql-monitor-common/enterprise.ent ../../refman-5.1/metadata/internationalization.idmap mysql-i18n-excerpt-base.xml ../../refman-5.1/versions.ent all-entities.ent ../../common/phrases.ent mysql-i18n-excerpt-aspec.xml ../../common/fixedchars.ent
-	$(MAKE) mysql-i18n-excerpt.arbitraryforce
-
-# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-i18n-excerpt-arbitrary.xml: mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml
-	$(MAKE) mysql-i18n-excerpt.arbitrary
-	cp mysql-i18n-excerpt.arbitrary mysql-i18n-excerpt-arbitrary.xml
-
-
-# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-backup-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.xml mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.xml: ../../refman-common/urls.ent ../../refman-5.1/metadata/se-innodb-core.idmap ../../mysql-monitor-common/enterprise.ent ../../refman-5.1/metadata/replication-solutions.idmap ../../refman-5.1/replication-solutions.xml ../../refman-5.1/se-innodb-core.xml ../../refman-5.1/versions.ent all-entities.ent mysql-backup-excerpt-base.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.1/backup.xml ../../refman-5.1/metadata/backup.idmap mysql-backup-excerpt-aspec.xml
 	$(MAKE) mysql-backup-excerpt.arbitraryforce
 

@@ -1959,6 +1949,16 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
+mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml: ../../refman-common/urls.ent ../../mysql-monitor-common/enterprise.ent ../../refman-5.1/metadata/globalization.idmap mysql-g11n-excerpt-base.xml ../../refman-5.1/versions.ent all-entities.ent ../../common/phrases.ent ../../refman-5.1/globalization.xml ../../common/fixedchars.ent mysql-g11n-excerpt-aspec.xml
+	$(MAKE) mysql-g11n-excerpt.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+mysql-g11n-excerpt-arbitrary.xml: mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml
+	$(MAKE) mysql-g11n-excerpt.arbitrary
+	cp mysql-g11n-excerpt.arbitrary mysql-g11n-excerpt-arbitrary.xml
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-infoschema-excerpt-aspec.xml.faqs-information-schema.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.character-sets-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.processlist-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.events-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.files-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.columns-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schema-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.routines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.engines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.extended-show.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.user-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schemata-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.statistics-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collation-character-set-applicability-table.none.chapte
 r.xml mysql-infoschema-excerpt-aspec.xml.information-schema.all.preface.xml mysql-infoschema-excerpt-aspec.xml.table-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.table-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.referential-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.variables-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collations-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.other-information-schema-tables.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.plugins-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.partitions-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.status-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.views-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.column-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.key-column-usage-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.tables-ta
 ble.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.triggers-table.none.chapter.xml: ../../refman-common/urls.ent mysql-infoschema-excerpt-base.xml ../../mysql-monitor-common/enterprise.ent ../../refman-5.1/metadata/faqs-core.idmap mysql-infoschema-excerpt-aspec.xml ../../refman-5.1/faqs-core.xml ../../refman-5.1/versions.ent all-entities.ent ../../common/phrases.ent ../../refman-5.1/information-schema.xml ../../common/fixedchars.ent ../../refman-5.1/metadata/information-schema.idmap
 	$(MAKE) mysql-infoschema-excerpt.arbitraryforce
 

Copied: trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.1/mysql-i18n-excerpt-aspec.xml)
===================================================================
--- trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-aspec.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-aspec.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book SYSTEM "http://dev.mysql.com/doc/dtd/arbitrary-specification.dtd">
+<book>
+
+  <fragment id="mysql-g11n-imports">
+
+    <include prefix="refman-5.1" src="globalization" filter="all" markas="preface"/>
+
+    <include prefix="refman-5.1" src="charset" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="charset-configuration" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="error-message-language" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="adding-character-set" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="adding-collation" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="time-zone-support" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.1" src="locale-support" filter="none" markas="chapter"/>
+
+  </fragment>
+
+</book>

Copied: trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.1/mysql-i18n-excerpt-base.xml)
===================================================================
--- trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.1/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+  %all.entities;
+]>
+<book id="mysql-g11n-excerpt" lang="en">
+
+  <title>MySQL Globalization</title>
+
+  <bookinfo>
+
+    <abstract>
+
+      <para>
+        This is the MySQL Globalization extract
+        from the MySQL &current-series; Reference Manual.
+      </para>
+
+      <para>
+        Document generated on:
+
+        <remark role="current.date"/>
+
+
+
+        <remark role="repository.revision"/>
+      </para>
+
+    </abstract>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../refman-5.1/legalnotice.en.xml"/>
+
+  </bookinfo>
+
+<!--SRCFILE mysql-g11n-imports-->
+
+</book>


Modified: trunk/topic-guides/topics-5.5/Makefile
===================================================================
--- trunk/topic-guides/topics-5.5/Makefile	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/topic-guides/topics-5.5/Makefile	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1065 bytes

@@ -50,7 +50,7 @@
 DEPEND_FILES = \
 	help-topics.arbitrary \
 	mysql-backup-excerpt.arbitrary \
-	mysql-i18n-excerpt.arbitrary \
+	mysql-g11n-excerpt.arbitrary \
 	mysql-infoschema-excerpt.arbitrary \
 	mysql-installation-excerpt.arbitrary \
 	mysql-linuxunix-excerpt.arbitrary \

@@ -72,7 +72,7 @@
 mysql-backup-excerpt.xml: mysql-backup-excerpt-arbitrary.xml
 	cp $< $@
 
-mysql-i18n-excerpt.xml: mysql-i18n-excerpt-arbitrary.xml
+mysql-g11n-excerpt.xml: mysql-g11n-excerpt-arbitrary.xml
 	cp $< $@
 
 mysql-infoschema-excerpt.xml: mysql-infoschema-excerpt-arbitrary.xml

@@ -122,7 +122,7 @@
 	$(RM) \
 		help-topics-excerpt.xml \
 		mysql-backup-excerpt.xml \
-		mysql-i18n-excerpt.xml \
+		mysql-g11n-excerpt.xml \
 		mysql-infoschema-excerpt.xml \
 		mysql-installation-excerpt.xml \
 		mysql-linuxunix-excerpt.xml \


Modified: trunk/topic-guides/topics-5.5/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 6, Lines Added: 134, Lines Deleted: 70; 19274 bytes

@@ -343,57 +343,57 @@
 mysql-backup-excerpt-manprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 mysql-backup-excerpt-remprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 
-mysql_i18n_excerpt_arbitrary_INCLUDES = \
+mysql_g11n_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../refman-5.5/internationalization.xml \
+	../../refman-5.5/globalization.xml \
 	../../refman-5.5/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_arbitrary_IMAGES =
-mysql_i18n_excerpt_arbitrary_SOURCES = mysql-i18n-excerpt-arbitrary.xml $(mysql_i18n_excerpt_arbitrary_INCLUDES)
-mysql_i18n_excerpt_arbitrary_IDMAPS =
-mysql-i18n-excerpt-arbitrary.validpure: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.titles: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.useless: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.valid: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary.validwarn: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-prepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-helpprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-manprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-remprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_arbitrary_IMAGES =
+mysql_g11n_excerpt_arbitrary_SOURCES = mysql-g11n-excerpt-arbitrary.xml $(mysql_g11n_excerpt_arbitrary_INCLUDES)
+mysql_g11n_excerpt_arbitrary_IDMAPS =
+mysql-g11n-excerpt-arbitrary.validpure: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.titles: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.useless: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.valid: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary.validwarn: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-prepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-helpprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-manprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-remprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
 
-mysql_i18n_excerpt_aspec_INCLUDES =
-mysql_i18n_excerpt_aspec_IMAGES =
-mysql_i18n_excerpt_aspec_SOURCES = mysql-i18n-excerpt-aspec.xml $(mysql_i18n_excerpt_aspec_INCLUDES)
-mysql_i18n_excerpt_aspec_IDMAPS =
-mysql-i18n-excerpt-aspec.validpure: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.titles: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.useless: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.valid: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec.validwarn: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-prepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-helpprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-manprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-remprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
+mysql_g11n_excerpt_aspec_INCLUDES =
+mysql_g11n_excerpt_aspec_IMAGES =
+mysql_g11n_excerpt_aspec_SOURCES = mysql-g11n-excerpt-aspec.xml $(mysql_g11n_excerpt_aspec_INCLUDES)
+mysql_g11n_excerpt_aspec_IDMAPS =
+mysql-g11n-excerpt-aspec.validpure: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.titles: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.useless: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.valid: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec.validwarn: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-prepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-helpprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-manprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-remprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
 
-mysql_i18n_excerpt_base_INCLUDES =
-mysql_i18n_excerpt_base_IMAGES =
-mysql_i18n_excerpt_base_SOURCES = mysql-i18n-excerpt-base.xml $(mysql_i18n_excerpt_base_INCLUDES)
-mysql_i18n_excerpt_base_IDMAPS =
-mysql-i18n-excerpt-base.validpure: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.titles: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.useless: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.valid: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base.validwarn: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-prepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-helpprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-manprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-remprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
+mysql_g11n_excerpt_base_INCLUDES =
+mysql_g11n_excerpt_base_IMAGES =
+mysql_g11n_excerpt_base_SOURCES = mysql-g11n-excerpt-base.xml $(mysql_g11n_excerpt_base_INCLUDES)
+mysql_g11n_excerpt_base_IDMAPS =
+mysql-g11n-excerpt-base.validpure: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.titles: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.useless: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.valid: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base.validwarn: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-prepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-helpprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-manprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-remprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
 
-mysql_i18n_excerpt_INCLUDES = \
+mysql_g11n_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/gpl-notice.en.xml \
 	../../common/legalnotice-misc-refman.en.xml \

@@ -403,26 +403,26 @@
 	../../mysql-monitor-2.3/enterprise.ent \
 	../../mysql-monitor-2.3/version.ent \
 	../../refman-5.5/all-entities.ent \
-	../../refman-5.5/internationalization.xml \
+	../../refman-5.5/globalization.xml \
 	../../refman-5.5/legalnotice.en.xml \
 	../../refman-5.5/versions.ent \
 	../../refman-common/urls.ent \
 	../../workbench/workbench.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_IMAGES =
-mysql_i18n_excerpt_SOURCES = mysql-i18n-excerpt.xml $(mysql_i18n_excerpt_INCLUDES)
-mysql_i18n_excerpt_IDMAPS =
-mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.valid: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt.validwarn: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-prepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-helpprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-manprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-remprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_IMAGES =
+mysql_g11n_excerpt_SOURCES = mysql-g11n-excerpt.xml $(mysql_g11n_excerpt_INCLUDES)
+mysql_g11n_excerpt_IDMAPS =
+mysql-g11n-excerpt.validpure: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.titles: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.useless: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.valid: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt.validwarn: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-prepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-helpprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-manprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-remprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
 
 mysql_infoschema_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \

@@ -1925,16 +1925,6 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml: ../../refman-common/urls.ent ../../refman-5.5/internationalization.xml mysql-i18n-excerpt-base.xml ../../refman-5.5/metadata/internationalization.idmap all-entities.ent ../../common/phrases.ent mysql-i18n-excerpt-aspec.xml ../../common/fixedchars.ent ../../refman-5.5/versions.ent
-	$(MAKE) mysql-i18n-excerpt.arbitraryforce
-
-# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-i18n-excerpt-arbitrary.xml: mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml
-	$(MAKE) mysql-i18n-excerpt.arbitrary
-	cp mysql-i18n-excerpt.arbitrary mysql-i18n-excerpt-arbitrary.xml
-
-
-# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-backup-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.xml mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.xml: ../../refman-5.5/se-innodb-core.xml ../../refman-common/urls.ent ../../refman-5.5/backup.xml ../../refman-5.5/metadata/backup.idmap ../../refman-5.5/replication-solutions.xml all-entities.ent mysql-backup-excerpt-base.xml ../../common/phrases.ent ../../refman-5.5/metadata/replication-solutions.idmap ../../common/fixedchars.ent ../../refman-5.5/versions.ent ../../refman-5.5/metadata/se-innodb-core.idmap mysql-backup-excerpt-aspec.xml
 	$(MAKE) mysql-backup-excerpt.arbitraryforce
 

@@ -2055,6 +2045,16 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
+mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml: ../../refman-common/urls.ent all-entities.ent mysql-g11n-excerpt-base.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.5/versions.ent mysql-g11n-excerpt-aspec.xml ../../refman-5.5/metadata/globalization.idmap ../../refman-5.5/globalization.xml
+	$(MAKE) mysql-g11n-excerpt.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+mysql-g11n-excerpt-arbitrary.xml: mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml
+	$(MAKE) mysql-g11n-excerpt.arbitrary
+	cp mysql-g11n-excerpt.arbitrary mysql-g11n-excerpt-arbitrary.xml
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-infoschema-excerpt-aspec.xml.faqs-information-schema.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.character-sets-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.processlist-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.events-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.files-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.columns-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schema-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.routines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.engines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.extended-show.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.user-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schemata-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.statistics-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collation-character-set-applicability-table.none.chapte
 r.xml mysql-infoschema-excerpt-aspec.xml.information-schema.all.preface.xml mysql-infoschema-excerpt-aspec.xml.table-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.table-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.referential-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.variables-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collations-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.other-information-schema-tables.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.plugins-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.partitions-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.status-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.views-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.column-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.key-column-usage-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.tables-ta
 ble.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.triggers-table.none.chapter.xml: ../../refman-5.5/metadata/faqs-core.idmap ../../refman-common/urls.ent mysql-infoschema-excerpt-base.xml ../../refman-5.5/metadata/information-schema.idmap mysql-infoschema-excerpt-aspec.xml ../../refman-5.5/faqs-core.xml ../../refman-5.5/information-schema.xml all-entities.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.5/versions.ent
 	$(MAKE) mysql-infoschema-excerpt.arbitraryforce
 

Copied: trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.5/mysql-i18n-excerpt-aspec.xml)
===================================================================
--- trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-aspec.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-aspec.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book SYSTEM "http://dev.mysql.com/doc/dtd/arbitrary-specification.dtd">
+<book>
+
+  <fragment id="mysql-g11n-imports">
+
+    <include prefix="refman-5.5" src="globalization" filter="all" markas="preface"/>
+
+    <include prefix="refman-5.5" src="charset" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="charset-configuration" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="error-message-language" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="adding-character-set" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="adding-collation" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="time-zone-support" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.5" src="locale-support" filter="none" markas="chapter"/>
+
+  </fragment>
+
+</book>

Copied: trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.5/mysql-i18n-excerpt-base.xml)
===================================================================
--- trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.5/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+  %all.entities;
+]>
+<book id="mysql-g11n-excerpt" lang="en">
+
+  <title>MySQL Globalization</title>
+
+  <bookinfo>
+
+    <abstract>
+
+      <para>
+        This is the MySQL Globalization extract
+        from the MySQL &current-series; Reference Manual.
+      </para>
+
+      <para>
+        Document generated on:
+
+        <remark role="current.date"/>
+
+
+
+        <remark role="repository.revision"/>
+      </para>
+
+    </abstract>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../refman-5.5/legalnotice.en.xml"/>
+
+  </bookinfo>
+
+<!--SRCFILE mysql-g11n-imports-->
+
+</book>


Modified: trunk/topic-guides/topics-5.6/Makefile
===================================================================
--- trunk/topic-guides/topics-5.6/Makefile	2011-05-18 18:06:27 UTC (rev 26270)
+++ trunk/topic-guides/topics-5.6/Makefile	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1065 bytes

@@ -50,7 +50,7 @@
 DEPEND_FILES = \
 	help-topics.arbitrary \
 	mysql-backup-excerpt.arbitrary \
-	mysql-i18n-excerpt.arbitrary \
+	mysql-g11n-excerpt.arbitrary \
 	mysql-infoschema-excerpt.arbitrary \
 	mysql-installation-excerpt.arbitrary \
 	mysql-linuxunix-excerpt.arbitrary \

@@ -72,7 +72,7 @@
 mysql-backup-excerpt.xml: mysql-backup-excerpt-arbitrary.xml
 	cp $< $@
 
-mysql-i18n-excerpt.xml: mysql-i18n-excerpt-arbitrary.xml
+mysql-g11n-excerpt.xml: mysql-g11n-excerpt-arbitrary.xml
 	cp $< $@
 
 mysql-infoschema-excerpt.xml: mysql-infoschema-excerpt-arbitrary.xml

@@ -122,7 +122,7 @@
 	$(RM) \
 		help-topics-excerpt.xml \
 		mysql-backup-excerpt.xml \
-		mysql-i18n-excerpt.xml \
+		mysql-g11n-excerpt.xml \
 		mysql-infoschema-excerpt.xml \
 		mysql-installation-excerpt.xml \
 		mysql-linuxunix-excerpt.xml \


Modified: trunk/topic-guides/topics-5.6/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)
Changed blocks: 6, Lines Added: 134, Lines Deleted: 70; 19277 bytes

@@ -359,57 +359,57 @@
 mysql-backup-excerpt-manprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 mysql-backup-excerpt-remprepped.xml: $(mysql_backup_excerpt_SOURCES) $(mysql_backup_excerpt_IDMAPS)
 
-mysql_i18n_excerpt_arbitrary_INCLUDES = \
+mysql_g11n_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
-	../../refman-5.6/internationalization.xml \
+	../../refman-5.6/globalization.xml \
 	../../refman-5.6/versions.ent \
 	../../refman-common/urls.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_arbitrary_IMAGES =
-mysql_i18n_excerpt_arbitrary_SOURCES = mysql-i18n-excerpt-arbitrary.xml $(mysql_i18n_excerpt_arbitrary_INCLUDES)
-mysql_i18n_excerpt_arbitrary_IDMAPS =
-mysql-i18n-excerpt-arbitrary.validpure: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.titles: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.useless: $(mysql_i18n_excerpt_arbitrary_SOURCES)
-mysql-i18n-excerpt-arbitrary.valid: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary.validwarn: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-prepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-helpprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-manprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
-mysql-i18n-excerpt-arbitrary-remprepped.xml: $(mysql_i18n_excerpt_arbitrary_SOURCES) $(mysql_i18n_excerpt_arbitrary_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_arbitrary_IMAGES =
+mysql_g11n_excerpt_arbitrary_SOURCES = mysql-g11n-excerpt-arbitrary.xml $(mysql_g11n_excerpt_arbitrary_INCLUDES)
+mysql_g11n_excerpt_arbitrary_IDMAPS =
+mysql-g11n-excerpt-arbitrary.validpure: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.titles: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.useless: $(mysql_g11n_excerpt_arbitrary_SOURCES)
+mysql-g11n-excerpt-arbitrary.valid: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary.validwarn: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-prepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-helpprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-manprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
+mysql-g11n-excerpt-arbitrary-remprepped.xml: $(mysql_g11n_excerpt_arbitrary_SOURCES) $(mysql_g11n_excerpt_arbitrary_IDMAPS)
 
-mysql_i18n_excerpt_aspec_INCLUDES =
-mysql_i18n_excerpt_aspec_IMAGES =
-mysql_i18n_excerpt_aspec_SOURCES = mysql-i18n-excerpt-aspec.xml $(mysql_i18n_excerpt_aspec_INCLUDES)
-mysql_i18n_excerpt_aspec_IDMAPS =
-mysql-i18n-excerpt-aspec.validpure: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.titles: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.useless: $(mysql_i18n_excerpt_aspec_SOURCES)
-mysql-i18n-excerpt-aspec.valid: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec.validwarn: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-prepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-helpprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-manprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
-mysql-i18n-excerpt-aspec-remprepped.xml: $(mysql_i18n_excerpt_aspec_SOURCES) $(mysql_i18n_excerpt_aspec_IDMAPS)
+mysql_g11n_excerpt_aspec_INCLUDES =
+mysql_g11n_excerpt_aspec_IMAGES =
+mysql_g11n_excerpt_aspec_SOURCES = mysql-g11n-excerpt-aspec.xml $(mysql_g11n_excerpt_aspec_INCLUDES)
+mysql_g11n_excerpt_aspec_IDMAPS =
+mysql-g11n-excerpt-aspec.validpure: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.titles: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.useless: $(mysql_g11n_excerpt_aspec_SOURCES)
+mysql-g11n-excerpt-aspec.valid: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec.validwarn: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-prepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-helpprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-manprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
+mysql-g11n-excerpt-aspec-remprepped.xml: $(mysql_g11n_excerpt_aspec_SOURCES) $(mysql_g11n_excerpt_aspec_IDMAPS)
 
-mysql_i18n_excerpt_base_INCLUDES =
-mysql_i18n_excerpt_base_IMAGES =
-mysql_i18n_excerpt_base_SOURCES = mysql-i18n-excerpt-base.xml $(mysql_i18n_excerpt_base_INCLUDES)
-mysql_i18n_excerpt_base_IDMAPS =
-mysql-i18n-excerpt-base.validpure: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.titles: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.useless: $(mysql_i18n_excerpt_base_SOURCES)
-mysql-i18n-excerpt-base.valid: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base.validwarn: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-prepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-helpprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-manprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
-mysql-i18n-excerpt-base-remprepped.xml: $(mysql_i18n_excerpt_base_SOURCES) $(mysql_i18n_excerpt_base_IDMAPS)
+mysql_g11n_excerpt_base_INCLUDES =
+mysql_g11n_excerpt_base_IMAGES =
+mysql_g11n_excerpt_base_SOURCES = mysql-g11n-excerpt-base.xml $(mysql_g11n_excerpt_base_INCLUDES)
+mysql_g11n_excerpt_base_IDMAPS =
+mysql-g11n-excerpt-base.validpure: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.titles: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.useless: $(mysql_g11n_excerpt_base_SOURCES)
+mysql-g11n-excerpt-base.valid: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base.validwarn: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-prepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-helpprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-manprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
+mysql-g11n-excerpt-base-remprepped.xml: $(mysql_g11n_excerpt_base_SOURCES) $(mysql_g11n_excerpt_base_IDMAPS)
 
-mysql_i18n_excerpt_INCLUDES = \
+mysql_g11n_excerpt_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/gpl-notice.en.xml \
 	../../common/legalnotice-misc-refman.en.xml \

@@ -419,26 +419,26 @@
 	../../mysql-monitor-2.0/version.ent \
 	../../mysql-monitor-common/enterprise.ent \
 	../../refman-5.6/all-entities.ent \
-	../../refman-5.6/internationalization.xml \
+	../../refman-5.6/globalization.xml \
 	../../refman-5.6/legalnotice.en.xml \
 	../../refman-5.6/versions.ent \
 	../../refman-common/urls.ent \
 	../../workbench/workbench.ent \
 	all-entities.ent \
-	mysql-i18n-excerpt-aspec.xml \
-	mysql-i18n-excerpt-base.xml
-mysql_i18n_excerpt_IMAGES =
-mysql_i18n_excerpt_SOURCES = mysql-i18n-excerpt.xml $(mysql_i18n_excerpt_INCLUDES)
-mysql_i18n_excerpt_IDMAPS =
-mysql-i18n-excerpt.validpure: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.titles: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.useless: $(mysql_i18n_excerpt_SOURCES)
-mysql-i18n-excerpt.valid: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt.validwarn: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-prepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-helpprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-manprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
-mysql-i18n-excerpt-remprepped.xml: $(mysql_i18n_excerpt_SOURCES) $(mysql_i18n_excerpt_IDMAPS)
+	mysql-g11n-excerpt-aspec.xml \
+	mysql-g11n-excerpt-base.xml
+mysql_g11n_excerpt_IMAGES =
+mysql_g11n_excerpt_SOURCES = mysql-g11n-excerpt.xml $(mysql_g11n_excerpt_INCLUDES)
+mysql_g11n_excerpt_IDMAPS =
+mysql-g11n-excerpt.validpure: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.titles: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.useless: $(mysql_g11n_excerpt_SOURCES)
+mysql-g11n-excerpt.valid: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt.validwarn: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-prepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-helpprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-manprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
+mysql-g11n-excerpt-remprepped.xml: $(mysql_g11n_excerpt_SOURCES) $(mysql_g11n_excerpt_IDMAPS)
 
 mysql_infoschema_excerpt_arbitrary_INCLUDES = \
 	../../common/fixedchars.ent \

@@ -1941,16 +1941,6 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml: ../../refman-5.6/versions.ent ../../refman-common/urls.ent ../../refman-5.6/internationalization.xml mysql-i18n-excerpt-base.xml ../../refman-5.6/metadata/internationalization.idmap all-entities.ent ../../common/phrases.ent mysql-i18n-excerpt-aspec.xml ../../common/fixedchars.ent
-	$(MAKE) mysql-i18n-excerpt.arbitraryforce
-
-# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-i18n-excerpt-arbitrary.xml: mysql-i18n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset.none.chapter.xml mysql-i18n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-i18n-excerpt-aspec.xml.adding-character-set.none.chapter.xml mysql-i18n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-i18n-excerpt-aspec.xml.internationalization-localization.all.preface.xml
-	$(MAKE) mysql-i18n-excerpt.arbitrary
-	cp mysql-i18n-excerpt.arbitrary mysql-i18n-excerpt-arbitrary.xml
-
-
-# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-backup-excerpt-aspec.xml.backup-and-recovery.none.chapter.xml mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.xml mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.xml: ../../refman-5.6/versions.ent ../../refman-5.6/backup.xml ../../refman-common/urls.ent ../../refman-5.6/metadata/backup.idmap ../../refman-5.6/se-innodb-core.xml ../../refman-5.6/replication-solutions.xml ../../refman-5.6/metadata/replication-solutions.idmap ../../refman-5.6/metadata/se-innodb-core.idmap all-entities.ent mysql-backup-excerpt-base.xml ../../common/phrases.ent ../../common/fixedchars.ent mysql-backup-excerpt-aspec.xml
 	$(MAKE) mysql-backup-excerpt.arbitraryforce
 

@@ -2071,6 +2061,16 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
+mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml: ../../refman-5.6/metadata/globalization.idmap ../../refman-5.6/versions.ent ../../refman-common/urls.ent all-entities.ent mysql-g11n-excerpt-base.xml ../../common/phrases.ent ../../refman-5.6/globalization.xml ../../common/fixedchars.ent mysql-g11n-excerpt-aspec.xml
+	$(MAKE) mysql-g11n-excerpt.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+mysql-g11n-excerpt-arbitrary.xml: mysql-g11n-excerpt-aspec.xml.error-message-language.none.chapter.xml mysql-g11n-excerpt-aspec.xml.locale-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset-configuration.none.chapter.xml mysql-g11n-excerpt-aspec.xml.charset.none.chapter.xml mysql-g11n-excerpt-aspec.xml.globalization.all.preface.xml mysql-g11n-excerpt-aspec.xml.time-zone-support.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-collation.none.chapter.xml mysql-g11n-excerpt-aspec.xml.adding-character-set.none.chapter.xml
+	$(MAKE) mysql-g11n-excerpt.arbitrary
+	cp mysql-g11n-excerpt.arbitrary mysql-g11n-excerpt-arbitrary.xml
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
 mysql-infoschema-excerpt-aspec.xml.faqs-information-schema.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.character-sets-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.processlist-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.events-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.files-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.columns-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schema-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.routines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.engines-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.extended-show.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.user-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.schemata-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.statistics-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collation-character-set-applicability-table.none.chapte
 r.xml mysql-infoschema-excerpt-aspec.xml.information-schema.all.preface.xml mysql-infoschema-excerpt-aspec.xml.table-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.table-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.referential-constraints-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.variables-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.collations-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.other-information-schema-tables.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.plugins-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.partitions-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.status-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.views-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.column-privileges-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.key-column-usage-table.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.tables-ta
 ble.none.chapter.xml mysql-infoschema-excerpt-aspec.xml.triggers-table.none.chapter.xml: ../../refman-5.6/versions.ent ../../refman-common/urls.ent mysql-infoschema-excerpt-base.xml ../../refman-5.6/information-schema.xml mysql-infoschema-excerpt-aspec.xml ../../refman-5.6/faqs-core.xml all-entities.ent ../../refman-5.6/metadata/faqs-core.idmap ../../common/phrases.ent ../../refman-5.6/metadata/information-schema.idmap ../../common/fixedchars.ent
 	$(MAKE) mysql-infoschema-excerpt.arbitraryforce
 

Copied: trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-aspec.xml (from rev 26270, trunk/topic-guides/topics-5.6/mysql-i18n-excerpt-aspec.xml)
===================================================================
--- trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-aspec.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-aspec.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book SYSTEM "http://dev.mysql.com/doc/dtd/arbitrary-specification.dtd">
+<book>
+
+  <fragment id="mysql-g11n-imports">
+
+    <include prefix="refman-5.6" src="globalization" filter="all" markas="preface"/>
+
+    <include prefix="refman-5.6" src="charset" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="charset-configuration" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="error-message-language" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="adding-character-set" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="adding-collation" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="time-zone-support" filter="none" markas="chapter"/>
+
+    <include prefix="refman-5.6" src="locale-support" filter="none" markas="chapter"/>
+
+  </fragment>
+
+</book>

Copied: trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml (from rev 26270, trunk/topic-guides/topics-5.6/mysql-i18n-excerpt-base.xml)
===================================================================
--- trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml	                        (rev 0)
+++ trunk/topic-guides/topics-5.6/mysql-g11n-excerpt-base.xml	2011-05-18 18:09:48 UTC (rev 26271)

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+  %all.entities;
+]>
+<book id="mysql-g11n-excerpt" lang="en">
+
+  <title>MySQL Globalization</title>
+
+  <bookinfo>
+
+    <abstract>
+
+      <para>
+        This is the MySQL Globalization extract
+        from the MySQL &current-series; Reference Manual.
+      </para>
+
+      <para>
+        Document generated on:
+
+        <remark role="current.date"/>
+
+
+
+        <remark role="repository.revision"/>
+      </para>
+
+    </abstract>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../refman-5.6/legalnotice.en.xml"/>
+
+  </bookinfo>
+
+<!--SRCFILE mysql-g11n-imports-->
+
+</book>


Thread
svn commit - mysqldoc@oter02: r26271 - in trunk: . dynamic-docs/topic-quickref quick-guides refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 ref...paul.dubois19 May