Author: paul
Date: 2006-01-14 19:04:17 +0100 (Sat, 14 Jan 2006)
New Revision: 829
Log:
r6202@frost: paul | 2006-01-14 11:24:35 -0600
Combine sections.
Modified:
trunk/
trunk/refman-4.1/charset.xml
trunk/refman-4.1/renamed-nodes.txt
trunk/refman-5.0/charset.xml
trunk/refman-5.0/renamed-nodes.txt
trunk/refman-5.1/charset.xml
trunk/refman-5.1/renamed-nodes.txt
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6201
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6202
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-4.1/charset.xml 2006-01-14 18:04:17 UTC (rev 829)
@@ -1898,12 +1898,6 @@
according to the standard SQL specification.
</para>
- </section>
-
- <section id="charset-cast">
-
- <title>&title-charset-cast;</title>
-
<para>
You may also use <literal>CAST()</literal> to convert a string
to a different character set. The syntax is:
Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-4.1/renamed-nodes.txt 2006-01-14 18:04:17 UTC (rev 829)
@@ -96,3 +96,4 @@
client-side-scripts client-utility-programs
mysqlcc client-utility-programs
innodb-start innodb-parameters
+charset-cast charset-convert
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-5.0/charset.xml 2006-01-14 18:04:17 UTC (rev 829)
@@ -1803,12 +1803,6 @@
according to the standard SQL specification.
</para>
- </section>
-
- <section id="charset-cast">
-
- <title>&title-charset-cast;</title>
-
<para>
You may also use <literal>CAST()</literal> to convert a string
to a different character set. The syntax is:
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-5.0/renamed-nodes.txt 2006-01-14 18:04:17 UTC (rev 829)
@@ -393,3 +393,4 @@
mysqlcc client-utility-programs
innodb-start innodb-parameters
federated-install federated-storage-engine
+charset-cast charset-convert
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-5.1/charset.xml 2006-01-14 18:04:17 UTC (rev 829)
@@ -1802,12 +1802,6 @@
according to the standard SQL specification.
</para>
- </section>
-
- <section id="charset-cast">
-
- <title>&title-charset-cast;</title>
-
<para>
You may also use <literal>CAST()</literal> to convert a string
to a different character set. The syntax is:
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-5.1/renamed-nodes.txt 2006-01-14 18:04:17 UTC (rev 829)
@@ -97,3 +97,4 @@
mysqlcc client-utility-programs
innodb-start innodb-parameters
federated-install federated-storage-engine
+charset-cast charset-convert
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-14 18:03:54 UTC (rev 828)
+++ trunk/refman-common/titles.en.ent 2006-01-14 18:04:17 UTC (rev 829)
@@ -129,7 +129,6 @@
<!ENTITY title-charset-asian-sets "Asian Character Sets">
<!ENTITY title-charset-baltic-sets "Baltic Character Sets">
<!ENTITY title-charset-binary-op "<literal>BINARY</literal> Operator">
-<!ENTITY title-charset-cast "<literal>CAST()</literal>">
<!ENTITY title-charset-ce-sets "Central European Character Sets">
<!ENTITY title-charset-charsets "Character Sets and Collations That MySQL Supports">
<!ENTITY title-charset-collate "Using <literal>COLLATE</literal> in SQL Statements">
@@ -142,7 +141,7 @@
<!ENTITY title-charset-config-file "New Character Set Configuration File Format">
<!ENTITY title-charset-connection "Connection Character Sets and Collations">
<!ENTITY title-charset-conversion "Converting 4.0 Character Columns to 4.1 Format">
-<!ENTITY title-charset-convert "<literal>CONVERT()</literal>">
+<!ENTITY title-charset-convert "<literal>CONVERT()</literal> and <literal>CAST()</literal>">
<!ENTITY title-charset-cyrillic-sets "Cyrillic Character Sets">
<!ENTITY title-charset-database "Database Character Set and Collation">
<!ENTITY title-charset-defaults "Determining the Default Character Set and Collation">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r829 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 14 Jan |
