svn commit - mysqldoc@docsrva: r4929 - trunk/refman-5.1

[mcbrown]

Author: mcbrown
Date: 2007-02-14 08:40:21 +0100 (Wed, 14 Feb 2007)
New Revision: 4929

Log:
Some edits and typo fixes from a reader



Modified:
   trunk/refman-5.1/replication-solutions.xml


Modified: trunk/refman-5.1/replication-solutions.xml
===================================================================
--- trunk/refman-5.1/replication-solutions.xml	2007-02-14 03:20:41 UTC (rev 4928)
+++ trunk/refman-5.1/replication-solutions.xml	2007-02-14 07:40:21 UTC (rev 4929)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 13; 2994 bytes

@@ -292,8 +292,7 @@
 
   <section id="replication-solutions-diffengines">
 
-    <title>Using Replication with different Master and Slave Storage
-      Engines</title>
+    <title>Using Replication with different Master and Slave Storage
Engines</title>
 
     <para>
       The replication process does not care if the source table on the

@@ -731,21 +730,21 @@
       <listitem>
         <para>
           Master 1 is the primary master where all changes and updates
-          are written to the database. Binary logging on this machine
-          should be enabled.
+          are written to the database. Binary logging should be enabled
+          on this machine.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Master 2 is the slave to the Master 1 that provide the
+          Master 2 is the slave to the Master 1 that provides the
           replication functionality to the remainder of the slaves in
           the replication structure. Master 2 is the only machine
-          allowed to connect to Master 2. Master 2 also has binary
+          allowed to connect to Master 1. Master 2 also has binary
           logging enabled, and the <option>--log-slave-updates</option>
-          so that replication instructions from Master 1 are also
+          option so that replication instructions from Master 1 are also
           written to Master 2's binary log so that they can then be
-          replicated to the real slaves.
+          replicated to the true slaves.
         </para>
       </listitem>
 

@@ -928,17 +927,17 @@
       MASTER TO MASTER_HOST='Slave1'</literal> (where
       <literal>'Slave1'</literal> represents the real hostname of
       <literal>Slave 1</literal>). To <literal>CHANGE
MASTER</literal>,
-      add all information about how to connect to <literal>S1</literal>
-      from <literal>S2</literal> or <literal>S3</literal>
-      (<replaceable>user</replaceable>,
+      add all information about how to connect to <literal>Slave
+      1</literal> from <literal>Slave 2</literal> or
<literal>Slave
+      3</literal> (<replaceable>user</replaceable>,
       <replaceable>password</replaceable>,
       <replaceable>port</replaceable>). In <literal>CHANGE
       MASTER</literal>, there is no need to specify the name of
       <literal>Slave 1</literal>'s binary log or binary log position to
       read from: We know it is the first binary log and position 4,
       which are the defaults for <literal>CHANGE MASTER</literal>.
-      Finally, use <literal>START SLAVE</literal> on
-      <literal>S2</literal> and <literal>Slave 3</literal>.
+      Finally, use <literal>START SLAVE</literal> on <literal>Slave
+      2</literal> and <literal>Slave 3</literal>.
     </para>
 
     <para>