svn commit - mysqldoc@docsrva: r15088 - in trunk: refman-5.1 refman-5.4 refman-6.0

[jon.stephens]

Author: jstephens
Date: 2009-05-28 07:25:34 +0200 (Thu, 28 May 2009)
New Revision: 15088

Log:

Wording

Fixes Docs Bug #44924



Modified:
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-5.4/replication-options-core.xml
   trunk/refman-6.0/replication-options-core.xml


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2009-05-28 04:14:55 UTC (rev 15087)
+++ trunk/refman-5.1/replication-options-core.xml	2009-05-28 05:25:34 UTC (rev 15088)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 7; 1375 bytes

@@ -2459,13 +2459,12 @@
           Controls whether <literal>IDEMPOTENT</literal> or
           <literal>STRICT</literal> mode is used in replication conflict
           resolution and error checking. <literal>IDEMPOTENT</literal>
-          mode causes suppression of some errors, including
-          duplicate-key and no-key-found errors. Beginning with MySQL
-          5.1.23-ndb-6.2.14 and MySQL 5.1.24, this mode should be
-          employed in multi-master replication, circular replication,
-          and some other special replication scenarios.
-          <literal>STRICT</literal> mode is the default, and is suitable
-          for most other cases.
+          mode causes suppression of duplicate-key and no-key-found
+          errors. Beginning with MySQL 5.1.23-ndb-6.2.14 and MySQL
+          5.1.24, this mode should be employed in multi-master
+          replication, circular replication, and some other special
+          replication scenarios. <literal>STRICT</literal> mode is the
+          default, and is suitable for most other cases.
         </para>
       </listitem>
 


Modified: trunk/refman-5.4/replication-options-core.xml
===================================================================
--- trunk/refman-5.4/replication-options-core.xml	2009-05-28 04:14:55 UTC (rev 15087)
+++ trunk/refman-5.4/replication-options-core.xml	2009-05-28 05:25:34 UTC (rev 15088)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1241 bytes

@@ -2417,12 +2417,11 @@
           Controls whether <literal>IDEMPOTENT</literal> or
           <literal>STRICT</literal> mode is used in replication conflict
           resolution and error checking. <literal>IDEMPOTENT</literal>
-          mode causes suppression of some errors, including
-          duplicate-key and no-key-found errors. This mode should be
-          employed in multi-master replication, circular replication,
-          and some other special replication scenarios.
-          <literal>STRICT</literal> mode is the default, and is suitable
-          for most other cases.
+          mode causes suppression of duplicate-key and no-key-found
+          errors. This mode should be employed in multi-master
+          replication, circular replication, and some other special
+          replication scenarios. <literal>STRICT</literal> mode is the
+          default, and is suitable for most other cases.
         </para>
       </listitem>
 


Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	2009-05-28 04:14:55 UTC (rev 15087)
+++ trunk/refman-6.0/replication-options-core.xml	2009-05-28 05:25:34 UTC (rev 15088)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 1307 bytes

@@ -2271,12 +2271,12 @@
           Controls whether <literal>IDEMPOTENT</literal> or
           <literal>STRICT</literal> mode is used in replication conflict
           resolution and error checking. <literal>IDEMPOTENT</literal>
-          mode causes suppression of some errors, including
-          duplicate-key and no-key-found errors. Beginning with MySQL
-          6.0.5, this mode should be employed in multi-master
-          replication, circular replication, and some other special
-          replication scenarios. <literal>STRICT</literal> mode is the
-          default, and is suitable for most other cases.
+          mode causes suppression of duplicate-key and no-key-found
+          errors. Beginning with MySQL 6.0.5, this mode should be
+          employed in multi-master replication, circular replication,
+          and some other special replication scenarios.
+          <literal>STRICT</literal> mode is the default, and is suitable
+          for most other cases.
         </para>
       </listitem>