Author: paul
Date: 2008-05-02 17:27:11 +0200 (Fri, 02 May 2008)
New Revision: 10648
Log:
r31108@frost: paul | 2008-05-02 08:18:58 -0500
Tweaks
Modified:
trunk/it/refman-5.1/internationalization.xml
trunk/pt/refman-5.1/internationalization.xml
trunk/refman-4.1/internationalization.xml
trunk/refman-5.0/internationalization.xml
trunk/refman-5.1/internationalization.xml
trunk/refman-6.0/internationalization.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31104
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31031
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31108
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31031
Modified: trunk/it/refman-5.1/internationalization.xml
===================================================================
--- trunk/it/refman-5.1/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/it/refman-5.1/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4666 bytes
@@ -5498,11 +5498,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -5565,10 +5566,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -5600,8 +5602,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -5629,8 +5634,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -5670,8 +5674,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -5715,7 +5720,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -5797,7 +5802,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -5849,12 +5856,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
Modified: trunk/pt/refman-5.1/internationalization.xml
===================================================================
--- trunk/pt/refman-5.1/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/pt/refman-5.1/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4666 bytes
@@ -5498,11 +5498,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -5565,10 +5566,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -5600,8 +5602,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -5629,8 +5634,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -5670,8 +5674,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -5715,7 +5720,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -5797,7 +5802,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -5849,12 +5856,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/refman-4.1/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4657 bytes
@@ -5649,11 +5649,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -5716,10 +5717,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -5751,8 +5753,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -5780,8 +5785,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -5821,8 +5825,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -5865,7 +5870,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -6131,7 +6136,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -6215,12 +6222,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/refman-5.0/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4657 bytes
@@ -5500,11 +5500,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -5567,10 +5568,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -5602,8 +5604,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -5631,8 +5636,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -5672,8 +5676,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -5717,7 +5722,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -5799,7 +5804,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -5851,12 +5858,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/refman-5.1/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4657 bytes
@@ -5498,11 +5498,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -5565,10 +5566,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -5600,8 +5602,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -5629,8 +5634,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -5670,8 +5674,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -5715,7 +5720,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -5797,7 +5802,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -5849,12 +5856,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml 2008-05-02 02:13:18 UTC (rev 10647)
+++ trunk/refman-6.0/internationalization.xml 2008-05-02 15:27:11 UTC (rev 10648)
Changed blocks: 8, Lines Added: 25, Lines Deleted: 18; 4657 bytes
@@ -6765,11 +6765,12 @@
</para>
<para>
- The <literal><charset></literal> element must list a
- binary collation and a default collation. The default
- collation is usually <literal>general</literal> and case
- insensitive. (It is possible for the binary collation to be
- the default collation, but generally they are different.) The
+ The <literal><charset></literal> element must list all
+ the collations for the character set. These must include at
+ least a binary collation and a default collation. The default
+ collation is usually <literal>general_ci</literal> (general,
+ case insensitive). It is possible for the binary collation to
+ be the default collation, but usually they are different. The
default collation should have a <literal>primary</literal>
flag. The binary collation should have a
<literal>binary</literal> flag.
@@ -6832,10 +6833,11 @@
<listitem>
<para>
For each collation listed in the
- <filename>Index.xml</filename> file for the character set,
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>,
<filename><replaceable>MYSET</replaceable>.xml</filename>
must contain a <literal><collation></literal>
- element.
+ element that defines the character ordering.
</para>
</listitem>
@@ -6867,8 +6869,11 @@
<listitem>
<para>
- The file must implement at least the default and
- <literal>binary</literal> collations.
+ For each collation listed in the
+ <literal><charset></literal> element for the
+ character set in <filename>Index.xml</filename>, the
+ <filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
+ file must provide an implementation of the collation.
</para>
</listitem>
@@ -6896,8 +6901,7 @@
adding information for <replaceable>MYSYS</replaceable>. The
example here assumes that the character set has default and
binary collations, but more lines will be needed if
- <replaceable>MYSET</replaceable> has collations in addition to
- those two.
+ <replaceable>MYSET</replaceable> has additional collations.
</para>
<orderedlist>
@@ -6937,8 +6941,9 @@
<para>
Edit <filename>strings/Makefile.am</filename> and add
<filename>ctype-<replaceable>MYSET</replaceable>.c</filename>
- to all <literal>CSRCS</literal> variables, and to the
- <literal>EXTRA_DIST</literal> variable.
+ to each definition of the <literal>CSRCS</literal>
+ variable, and to the <literal>EXTRA_DIST</literal>
+ variable.
</para>
</listitem>
@@ -6982,7 +6987,7 @@
<literal>case</literal> control structure. Omit the
<literal>USE_MB</literal> and
<literal>USE_MB_IDENT</literal> lines for 8-bit
- character setss.
+ character sets.
</para>
<programlisting>
@@ -7064,7 +7069,9 @@
<para>
<literal><collation></literal> elements indicate
character ordering for comparisons and sorts, one element
- per collation
+ per collation (binary collations need no
+ <literal><map></literal> element because the character
+ codes themselves provide the ordering)
</para>
</listitem>
@@ -7116,12 +7123,12 @@
be the union of the applicable bitmask values that describe the
character. For example, <literal>'A'</literal> is an uppercase
character (<literal>_MY_U</literal>) as well as a hexadecimal
- digit (<literal>_MY_X</literal>), so
- <literal>ctype['A'+1]</literal> should contain the value:
+ digit (<literal>_MY_X</literal>), so its
+ <literal>ctype</literal> value should be defined like this:
</para>
<programlisting>
-_MY_U | _MY_X = 01 | 0200 = 0201
+ctype['A'+1] = _MY_U | _MY_X = 01 | 0200 = 0201
</programlisting>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10648 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 2 May |
