Author: paul
Date: 2009-08-27 19:43:38 +0200 (Thu, 27 Aug 2009)
New Revision: 16311
Log:
r26062@arctic: paul | 2009-08-27 12:41:28 -0500
Minor revisions
Modified:
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
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:25910
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43880
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:26062
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43880
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml 2009-08-27 17:05:07 UTC (rev 16310)
+++ trunk/refman-4.1/internationalization.xml 2009-08-27 17:43:38 UTC (rev 16311)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 21; 1606 bytes
@@ -1939,32 +1939,16 @@
<para>
Parameters in the message template are replaced with values
that apply to a specific error occurrence. These parameters
- use their own character set:
+ use their own character set. Identifiers such as table or
+ column names use UTF-8. Data values retain their character
+ set. For example, in the following duplicate-key message,
+ <literal>'<replaceable>xxx</replaceable>'</literal> has the
+ character set of the table column associated with key 1:
</para>
- <itemizedlist>
-
- <listitem>
- <para>
- Data values retain their character set. For example, in
- the following duplicate-key message,
- <literal>'<replaceable>xxx</replaceable>'</literal> has
- the character set of the table column associated with
- key 1:
- </para>
-
<programlisting>
Duplicate entry '<replaceable>xxx</replaceable>' for key1
</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Identifiers such as table or column names use UTF-8.
- </para>
- </listitem>
-
- </itemizedlist>
</listitem>
</itemizedlist>
Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml 2009-08-27 17:05:07 UTC (rev 16310)
+++ trunk/refman-5.0/internationalization.xml 2009-08-27 17:43:38 UTC (rev 16311)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 21; 1606 bytes
@@ -1963,32 +1963,16 @@
<para>
Parameters in the message template are replaced with values
that apply to a specific error occurrence. These parameters
- use their own character set:
+ use their own character set. Identifiers such as table or
+ column names use UTF-8. Data values retain their character
+ set. For example, in the following duplicate-key message,
+ <literal>'<replaceable>xxx</replaceable>'</literal> has the
+ character set of the table column associated with key 1:
</para>
- <itemizedlist>
-
- <listitem>
- <para>
- Data values retain their character set. For example, in
- the following duplicate-key message,
- <literal>'<replaceable>xxx</replaceable>'</literal> has
- the character set of the table column associated with
- key 1:
- </para>
-
<programlisting>
Duplicate entry '<replaceable>xxx</replaceable>' for key1
</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Identifiers such as table or column names use UTF-8.
- </para>
- </listitem>
-
- </itemizedlist>
</listitem>
</itemizedlist>
Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml 2009-08-27 17:05:07 UTC (rev 16310)
+++ trunk/refman-5.1/internationalization.xml 2009-08-27 17:43:38 UTC (rev 16311)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 21; 1606 bytes
@@ -1963,32 +1963,16 @@
<para>
Parameters in the message template are replaced with values
that apply to a specific error occurrence. These parameters
- use their own character set:
+ use their own character set. Identifiers such as table or
+ column names use UTF-8. Data values retain their character
+ set. For example, in the following duplicate-key message,
+ <literal>'<replaceable>xxx</replaceable>'</literal> has the
+ character set of the table column associated with key 1:
</para>
- <itemizedlist>
-
- <listitem>
- <para>
- Data values retain their character set. For example, in
- the following duplicate-key message,
- <literal>'<replaceable>xxx</replaceable>'</literal> has
- the character set of the table column associated with
- key 1:
- </para>
-
<programlisting>
Duplicate entry '<replaceable>xxx</replaceable>' for key1
</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Identifiers such as table or column names use UTF-8.
- </para>
- </listitem>
-
- </itemizedlist>
</listitem>
</itemizedlist>
Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml 2009-08-27 17:05:07 UTC (rev 16310)
+++ trunk/refman-6.0/internationalization.xml 2009-08-27 17:43:38 UTC (rev 16311)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 21; 1606 bytes
@@ -1963,32 +1963,16 @@
<para>
Parameters in the message template are replaced with values
that apply to a specific error occurrence. These parameters
- use their own character set:
+ use their own character set. Identifiers such as table or
+ column names use UTF-8. Data values retain their character
+ set. For example, in the following duplicate-key message,
+ <literal>'<replaceable>xxx</replaceable>'</literal> has the
+ character set of the table column associated with key 1:
</para>
- <itemizedlist>
-
- <listitem>
- <para>
- Data values retain their character set. For example, in
- the following duplicate-key message,
- <literal>'<replaceable>xxx</replaceable>'</literal> has
- the character set of the table column associated with
- key 1:
- </para>
-
<programlisting>
Duplicate entry '<replaceable>xxx</replaceable>' for key1
</programlisting>
- </listitem>
-
- <listitem>
- <para>
- Identifiers such as table or column names use UTF-8.
- </para>
- </listitem>
-
- </itemizedlist>
</listitem>
</itemizedlist>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r16311 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 27 Aug |
