List:Commits« Previous MessageNext Message »
From:paul.dubois Date:May 16 2010 9:33pm
Subject:svn commit - mysqldoc@docsrva: r20661 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0
View as plain text  
Author: paul
Date: 2010-05-16 23:33:48 +0200 (Sun, 16 May 2010)
New Revision: 20661

Log:
 r59022@frost:  paul | 2010-05-16 16:33:22 -0500
 Oracle style guidelines:
 No mdash in title
 Use colon rather than mdash in lists
 No spaces around mdash


Modified:
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-4.1/installing-updowngrade.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/internationalization.xml
   trunk/refman-4.1/mysql-cluster-configuration-core.xml
   trunk/refman-4.1/mysql-cluster-faq.xml
   trunk/refman-4.1/mysql-cluster-management.xml
   trunk/refman-4.1/mysql-cluster-multi-computer.xml
   trunk/refman-4.1/mysql-cluster-overview.xml
   trunk/refman-4.1/mysql-cluster-programs-core.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/sql-syntax-data-manipulation.xml
   trunk/refman-4.1/sql-syntax-replication.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/dba-log-files.xml
   trunk/refman-5.0/dba-privilege-system.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/faqs-core.xml
   trunk/refman-5.0/installing-core.xml
   trunk/refman-5.0/internationalization.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/manual.xml
   trunk/refman-5.0/mysql-cluster-configuration-core.xml
   trunk/refman-5.0/mysql-cluster-management.xml
   trunk/refman-5.0/mysql-cluster-multi-computer.xml
   trunk/refman-5.0/mysql-cluster-overview.xml
   trunk/refman-5.0/mysql-cluster-programs-core.xml
   trunk/refman-5.0/mysql-cluster.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/replication-configuration.xml
   trunk/refman-5.0/se-innodb-core.xml
   trunk/refman-5.0/sql-syntax-data-manipulation.xml
   trunk/refman-5.0/sql-syntax-replication.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/dba-log-files.xml
   trunk/refman-5.1/dba-mysqld-server-core.xml
   trunk/refman-5.1/dba-privilege-system.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/faqs-core.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.1/information-schema.xml
   trunk/refman-5.1/installing-i5os.xml
   trunk/refman-5.1/installing-postinstall.xml
   trunk/refman-5.1/installing-windows.xml
   trunk/refman-5.1/internationalization.xml
   trunk/refman-5.1/mysql-cluster-configuration-core.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/mysql-cluster-news-core.xml
   trunk/refman-5.1/mysql-cluster-overview.xml
   trunk/refman-5.1/mysql-cluster-programs-core.xml
   trunk/refman-5.1/mysql-cluster-replication-core.xml
   trunk/refman-5.1/mysql-cluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-5.1/replication-configuration.xml
   trunk/refman-5.1/replication-notes.xml
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/sql-syntax-data-definition.xml
   trunk/refman-5.1/sql-syntax-data-manipulation.xml
   trunk/refman-5.1/storage-engines-core.xml
   trunk/refman-5.1/tutorial.xml
   trunk/refman-5.4/data-types.xml
   trunk/refman-5.4/dba-log-files.xml
   trunk/refman-5.4/dba-mysqld-server-core.xml
   trunk/refman-5.4/dba-privilege-system.xml
   trunk/refman-5.4/errors-problems-core.xml
   trunk/refman-5.4/faqs-core.xml
   trunk/refman-5.4/functions-core.xml
   trunk/refman-5.4/information-schema.xml
   trunk/refman-5.4/installing-core.xml
   trunk/refman-5.4/internationalization.xml
   trunk/refman-5.4/optimization.xml
   trunk/refman-5.4/partitioning.xml
   trunk/refman-5.4/replication-configuration.xml
   trunk/refman-5.4/replication-notes.xml
   trunk/refman-5.4/replication-options-core.xml
   trunk/refman-5.4/restrictions.xml
   trunk/refman-5.4/sql-syntax-data-definition.xml
   trunk/refman-5.4/sql-syntax-data-manipulation.xml
   trunk/refman-5.4/sql-syntax-replication.xml
   trunk/refman-5.4/storage-engines-core.xml
   trunk/refman-5.4/tutorial.xml
   trunk/refman-5.5/data-types.xml
   trunk/refman-5.5/dba-log-files.xml
   trunk/refman-5.5/dba-mysqld-server-core.xml
   trunk/refman-5.5/dba-privilege-system.xml
   trunk/refman-5.5/errors-problems-core.xml
   trunk/refman-5.5/faqs-core.xml
   trunk/refman-5.5/functions-core.xml
   trunk/refman-5.5/information-schema.xml
   trunk/refman-5.5/installing-core.xml
   trunk/refman-5.5/internationalization.xml
   trunk/refman-5.5/optimization.xml
   trunk/refman-5.5/partitioning.xml
   trunk/refman-5.5/replication-configuration.xml
   trunk/refman-5.5/replication-notes.xml
   trunk/refman-5.5/replication-options-core.xml
   trunk/refman-5.5/restrictions.xml
   trunk/refman-5.5/sql-syntax-data-definition.xml
   trunk/refman-5.5/sql-syntax-data-manipulation.xml
   trunk/refman-5.5/sql-syntax-replication.xml
   trunk/refman-5.5/storage-engines-core.xml
   trunk/refman-5.5/tutorial.xml
   trunk/refman-6.0/charset-tmp.xml
   trunk/refman-6.0/data-types.xml
   trunk/refman-6.0/dba-log-files.xml
   trunk/refman-6.0/dba-mysqld-server-core.xml
   trunk/refman-6.0/dba-privilege-system.xml
   trunk/refman-6.0/errors-problems.xml
   trunk/refman-6.0/functions-core.xml
   trunk/refman-6.0/information-schema.xml
   trunk/refman-6.0/installing-core.xml
   trunk/refman-6.0/internationalization.xml
   trunk/refman-6.0/optimization.xml
   trunk/refman-6.0/partitioning.xml
   trunk/refman-6.0/replication-configuration.xml
   trunk/refman-6.0/replication-multi-master-upgrade.xml
   trunk/refman-6.0/replication-notes.xml
   trunk/refman-6.0/replication-options-core.xml
   trunk/refman-6.0/replication-solutions.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-6.0/sql-syntax-data-definition.xml
   trunk/refman-6.0/sql-syntax-data-manipulation.xml
   trunk/refman-6.0/sql-syntax-replication.xml
   trunk/refman-6.0/storage-engines-core.xml
   trunk/refman-6.0/tutorial.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:39148
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:59020
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:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:39148
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:59022
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/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 589 bytes

@@ -4115,7 +4115,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/errors-problems.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1488 bytes

@@ -1381,9 +1381,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1648,9 +1648,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>


Modified: trunk/refman-4.1/installing-updowngrade.xml
===================================================================
--- trunk/refman-4.1/installing-updowngrade.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/installing-updowngrade.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1412 bytes

@@ -1200,13 +1200,12 @@
             <command>mysql_fix_privilege_tables</command> script to
             widen the <literal>Password</literal> column in the
             <literal>user</literal> table so that it can hold long
-            password hashes. However &mdash; to provide backward
+            password hashes. However&mdash;to provide backward
             compatibility allowing pre-4.1 clients to continue
-            connecting to their short-hash accounts &mdash; run the
-            server with the
-            <option role="mysqld">--old-passwords</option> option.
-            Eventually, when all your clients are upgraded to 4.1, you
-            can stop using the
+            connecting to their short-hash accounts&mdash;run the server
+            with the <option role="mysqld">--old-passwords</option>
+            option. Eventually, when all your clients are upgraded to
+            4.1, you can stop using the
             <option role="mysqld">--old-passwords</option> server
             option. You can also change the passwords for your MySQL
             accounts to use the new more secure format. A 4.1


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/installing.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 807 bytes

@@ -2675,7 +2675,7 @@
             <xref linkend="mysql-install-wizard-starting"/>. Rather than
             opening a port, you also have the option of adding MySQL as
             a program that bypasses the Windows Firewall. One or the
-            other option is sufficient &mdash; you need not do both.
+            other option is sufficient&mdash;you need not do both.
             Additionally, when running the MySQL Server Configuration
             Wizard on Windows Vista ensure that you are logged in as a
             user with administrative rights.


Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 13, Lines Deleted: 14; 3271 bytes

@@ -3508,10 +3508,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata.
       </para>
 

@@ -5636,7 +5636,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -5711,8 +5711,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -5752,8 +5752,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -5796,7 +5796,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -7625,10 +7625,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-4.1/mysql-cluster-configuration-core.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-configuration-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-configuration-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 15, Lines Added: 42, Lines Deleted: 40; 10425 bytes

@@ -374,7 +374,7 @@
 
     <section id="mysql-cluster-config-example">
 
-      <title>MySQL Cluster Configuration &mdash; Basic Example</title>
+      <title>MySQL Cluster Configuration: Basic Example</title>
 
       <indexterm>
         <primary>MySQL Cluster</primary>

@@ -1017,9 +1017,10 @@
 
           <para>
             This parameter specifies where to send cluster logging
-            information. There are three options in this regard &mdash;
-            <literal>CONSOLE</literal>, <literal>SYSLOG</literal>, and
-            <literal>FILE</literal> &mdash; with <literal>FILE</literal>
+            information. There are three options in this
+            regard&mdash;<literal>CONSOLE</literal>,
+            <literal>SYSLOG</literal>, and
+            <literal>FILE</literal>&mdash;with <literal>FILE</literal>
             being the default:
           </para>
 

@@ -1808,7 +1809,7 @@
 
           <para>
             In MySQL &current-series;, the default value is
-            <literal>100</literal> &mdash; that is, 100 percent of the
+            <literal>100</literal>&mdash;that is, 100 percent of the
             default maximum, or roughly 5 MB. It is possible to reduce
             this value safely, but it should never be less than 5
             percent. If you encounter Error 773 <errortext>Out of string

@@ -3147,8 +3148,8 @@
           </para>
 
           <para>
-            It is also important to ensure that even the worst of cases
-            &mdash; a complete crash of the cluster &mdash; is handled
+            It is also important to ensure that even the worst of
+            cases&mdash;a complete crash of the cluster&mdash;is handled
             properly. To guarantee that this happens, all transactions
             taking place within a given interval are put into a global
             checkpoint, which can be thought of as a set of committed

@@ -5084,12 +5085,12 @@
         Memory, Index Memory, and String Memory</link> that are used to
         configure local checkpoints for a MySQL Cluster do not exist in
         isolation, but rather are very much interdepedent on each other.
-        In this section, we illustrate how these parameters &mdash;
-        including <literal>DataMemory</literal>,
+        In this section, we illustrate how these
+        parameters&mdash;including <literal>DataMemory</literal>,
         <literal>IndexMemory</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal>, and
-        <literal>NoOfFragmentLogFiles</literal> &mdash; relate to one
+        <literal>NoOfFragmentLogFiles</literal>&mdash;relate to one
         another in a working Cluster.
       </para>
 

@@ -5165,7 +5166,7 @@
         A good starting point is to determine the amount of time that
         should elapse between local checkpoints (LCPs). It is worth
         noting that, in the event of a system restart, it takes 40-60
-        percent of this interval to execute the REDO log &mdash; for
+        percent of this interval to execute the REDO log&mdash;for
         example, if the time between LCPs is 5 minutes (300 seconds),
         then it should take 2 to 3 minutes (120 to 180 seconds) for the
         REDO log to be read.

@@ -5176,8 +5177,8 @@
         size of the <literal>DataMemory</literal> parameter. In this
         example, we assume that this is 2 GB. The
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> parameter
-        represents the amount of data to be checkpointed per unit time
-        &mdash; however, this parameter is actually expressed as the
+        represents the amount of data to be checkpointed per unit
+        time&mdash;however, this parameter is actually expressed as the
         number of 8K memory pages to be checkpointed per 100
         milliseconds. 2 GB per 300 seconds is approximately 6.8 MB per
         second, or 700 KB per 100 milliseconds, which works out to

@@ -5188,24 +5189,25 @@
         Similarly, we can calculate
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> in terms
         of the time for local checkpoints and the amount of memory
-        required for indexes &mdash; that is, the
+        required for indexes&mdash;that is, the
         <literal>IndexMemory</literal>. Assuming that we allow 512 MB
         for indexes, this works out to approximately 20 8-KB pages per
         100 milliseconds for this parameter.
       </para>
 
       <para>
-        Next, we need to determine the number of REDO log files required
-        &mdash; that is, fragment log files &mdash; the corresponding
-        parameter being <literal>NoOfFragmentLogFiles</literal>. We need
-        to make sure that there are sufficient REDO log files for
-        keeping records for at least 3 local checkpoints. In a
-        production setting, there are always uncertainties &mdash; for
-        instance, we cannot be sure that disks always operate at top
-        speed or with maximum throughput. For this reason, it is best to
-        err on the side of caution, so we double our requirement and
-        calculate a number of fragment log files which should be enough
-        to keep records covering 6 local checkpoints.
+        Next, we need to determine the number of REDO log files
+        required&mdash;that is, fragment log files&mdash;the
+        corresponding parameter being
+        <literal>NoOfFragmentLogFiles</literal>. We need to make sure
+        that there are sufficient REDO log files for keeping records for
+        at least 3 local checkpoints. In a production setting, there are
+        always uncertainties&mdash;for instance, we cannot be sure that
+        disks always operate at top speed or with maximum throughput.
+        For this reason, it is best to err on the side of caution, so we
+        double our requirement and calculate a number of fragment log
+        files which should be enough to keep records covering 6 local
+        checkpoints.
       </para>
 
       <para>

@@ -5255,7 +5257,7 @@
             15000 <literal role="stmt">UPDATE</literal> statements per
             hour is roughly the same as 5 updates per second. Each
             update uses 72 bytes, plus 4 bytes per column * 5 columns
-            updated, plus 32 bytes per column * 5 columns &mdash; this
+            updated, plus 32 bytes per column * 5 columns&mdash;this
             works out to 72 + 20 + 160 = 252 bytes per operation, and
             multiplying this by 5 operation per second yields 1260 bytes
             per second.

@@ -5281,7 +5283,7 @@
         by 1800 seconds, this yields 16524000 bytes required for REDO
         logging, or approximately 15.75 MB. The unit used for
         <literal>NoOfFragmentLogFiles</literal> represents a set of 4
-        16-MB log files &mdash; that is, 64 MB. Thus, the minimum value
+        16-MB log files&mdash;that is, 64 MB. Thus, the minimum value
         (3) for this parameter is sufficient for the scenario envisioned
         in this example, since 3 times 64 = 192 MB, or about 12 times
         what is required; the default value of 8 (or 512 MB) is more

@@ -5332,9 +5334,9 @@
 
     <para>
       It is also stated what type of restart is required (node restart
-      or system restart) &mdash; and whether the restart must be done
-      with <option>--initial</option> &mdash; to change the value of a
-      given configuration parameter.
+      or system restart)&mdash;and whether the restart must be done with
+      <option>--initial</option>&mdash;to change the value of a given
+      configuration parameter.
     </para>
 
     <para>

@@ -5342,8 +5344,8 @@
       the cluster's data nodes must be restarted in turn (also referred
       to as a <firstterm>rolling restart</firstterm>). It is possible to
       update cluster configuration parameters marked as
-      <literal>node</literal> online &mdash; that is, without shutting
-      down the cluster &mdash; in this fashion. An initial node restart
+      <literal>node</literal> online&mdash;that is, without shutting
+      down the cluster&mdash;in this fashion. An initial node restart
       requires restarting each <command>ndbd</command> process with the
       <option>--initial</option> option.
     </para>

@@ -5371,11 +5373,11 @@
       </para>
 
       <para>
-        However, decreasing the values of such parameters &mdash;
-        whether this is done via a node restart, node initial restart,
-        or even a complete system restart of the cluster &mdash; is not
-        to be undertaken lightly; it is recommended that you do so only
-        after careful planning and testing. This is especially true with
+        However, decreasing the values of such parameters&mdash;whether
+        this is done via a node restart, node initial restart, or even a
+        complete system restart of the cluster&mdash;is not to be
+        undertaken lightly; it is recommended that you do so only after
+        careful planning and testing. This is especially true with
         regard to those parameters that relate to memory usage and disk
         space, such as <literal>MaxNoOfTables</literal>,
         <literal>MaxNoOfOrderedIndexes</literal>, and

@@ -5394,8 +5396,8 @@
 
     <note>
       <para>
-        <literal>4294967039</literal> &mdash; which often appears as a
-        maximum value in these tables &mdash; is defined in the
+        <literal>4294967039</literal>&mdash;which often appears as a
+        maximum value in these tables&mdash;is defined in the
         <literal role="se">NDBCLUSTER</literal> sources as
         <literal>MAX_INT_RNIL</literal> and is equal to
         <literal>0xFFFFFEFF</literal>, or

@@ -5830,7 +5832,7 @@
           <para>
             Determines the probability of gaps in an autoincremented
             column. Set it to <literal>1</literal> to minimize this.
-            Setting it to a high value for optimization &mdash; makes
+            Setting it to a high value for optimization&mdash;makes
             inserts faster, but decreases the likelihood that
             consecutive autoincrement numbers will be used in a batch of
             inserts. Default value: <literal>32</literal>. Minimum


Modified: trunk/refman-4.1/mysql-cluster-faq.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-faq.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-faq.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 7, Lines Added: 8, Lines Deleted: 8; 3262 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="mysql-cluster-faq">
 
-  <title>MySQL &current-series; FAQ &mdash; MySQL Cluster</title>
+  <title>MySQL &current-series; FAQ: MySQL Cluster</title>
 
   <indexterm>
     <primary>MySQL Cluster</primary>

@@ -666,7 +666,7 @@
         <para>
           Note that creating MySQL Cluster tables with <literal>USING
           HASH</literal> for all primary keys and unique indexes will
-          generally cause table updates to run more quickly &mdash; in
+          generally cause table updates to run more quickly&mdash;in
           some cases by a much as 20 to 30 percent faster than updates
           on tables where <literal>USING HASH</literal> was not used in
           creating primary and unique keys. This is due to the fact that

@@ -888,7 +888,7 @@
           designed and implemented with the assumption that it would be
           run under conditions guaranteeing dedicated high-speed
           connectivity such as that found in a LAN setting using 100
-          Mbps or gigabit Ethernet &mdash; preferably the latter. We
+          Mbps or gigabit Ethernet&mdash;preferably the latter. We
           neither test nor warrant its performance using anything slower
           than this.
         </para>

@@ -965,7 +965,7 @@
 
         <para>
           Some specialized configuration parameters and files are
-          required to set up a MySQL Cluster &mdash; see
+          required to set up a MySQL Cluster&mdash;see
           <xref linkend="mysql-cluster-config-file"/>, for information
           about these.
         </para>

@@ -1113,9 +1113,9 @@
       <question>
 
         <para>
-          In the event of a catastrophic failure &mdash; say, for
+          In the event of a catastrophic failure&mdash;say, for
           instance, the whole city loses power <emphasis>and</emphasis>
-          my UPS fails &mdash; would I lose all my data?
+          my UPS fails&mdash;would I lose all my data?
         </para>
 
       </question>

@@ -1643,7 +1643,7 @@
         <para>
           Each of these commands must be run from a system shell on the
           machine housing the affected node. (You do not have to be
-          physically present at the machine &mdash; a remote login shell
+          physically present at the machine&mdash;a remote login shell
           can be used for this purpose.) You can verify that the cluster
           is running by starting the <literal role="se">NDB</literal>
           management client <command>ndb_mgm</command> on the machine

@@ -1967,7 +1967,7 @@
           <command>ndbd</command> process (the primary data node process
           that actually handles the data) is running. If permitted to do
           so (for example, if the <literal>StopOnError</literal>
-          configuration parameter is set to false &mdash; see
+          configuration parameter is set to false&mdash;see
           <xref linkend="mysql-cluster-params-ndbd"/>), the angel
           process tries to restart the primary data node process.
         </para>


Modified: trunk/refman-4.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-management.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-management.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 14, Lines Added: 28, Lines Deleted: 30; 9061 bytes

@@ -44,8 +44,8 @@
     <filename>ndb_<replaceable>node_id</replaceable>_cluster.log</filename>;
     this is usually found in the management server's
     <literal>DataDir</literal> directory, but this location can be
-    overridden using the <literal>LogDestination</literal> option
-    &mdash; see <xref linkend="mysql-cluster-mgm-definition"/>, for
+    overridden using the <literal>LogDestination</literal>
+    option&mdash;see <xref linkend="mysql-cluster-mgm-definition"/>, for
     details. (Recall that <replaceable>node_id</replaceable> represents
     the unique identifier of the node whose activity is being logged.)
     The cluster log contains event reports generated by

@@ -217,9 +217,9 @@
       Normally, in the event of a problem with the node, the node
       disconnects from the management server, the socket used for the
       connection is closed, and the reserved node ID is freed. However,
-      if a node is disconnected abruptly &mdash; for example, due to a
+      if a node is disconnected abruptly&mdash;for example, due to a
       hardware failure in one of the cluster hosts, or because of
-      network issues &mdash; the normal closing of the socket by the
+      network issues&mdash;the normal closing of the socket by the
       operating system may not take place. In this case, the node ID
       continues to be reserved and not released until a TCP timeout
       occurs 10 or so minutes later.

@@ -2007,7 +2007,7 @@
 
       <para>
         Event severity levels can be turned on or off (using
-        <literal>CLUSTERLOG FILTER</literal> &mdash; see above). If a
+        <literal>CLUSTERLOG FILTER</literal>&mdash;see above). If a
         severity level is turned on, then all events with a priority
         less than or equal to the category thresholds are logged. If the
         severity level is turned off then no events belonging to that

@@ -2386,34 +2386,33 @@
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; less than 1/2
-                      nodes left
+                      Arbitration check failed&mdash;less than 1/2 nodes
+                      left
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check succeeded &mdash; node group
+                      Arbitration check succeeded&mdash;node group
                       majority
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; missing node
-                      group
+                      Arbitration check failed&mdash;missing node group
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Network partitioning &mdash; arbitration required
+                      Network partitioning&mdash;arbitration required
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration succeeded &mdash; affirmative response
+                      Arbitration succeeded&mdash;affirmative response
                       from node <replaceable>X</replaceable>
                     </para>
                   </listitem>

@@ -2902,9 +2901,9 @@
                   started in the last reporting interval, including
                   simple reads. This count also includes reads performed
                   as part of unique index operations. A unique index
-                  read operation generates 2 primary key read operations
-                  &mdash; 1 for the hidden unique index table, and 1 for
-                  the table on which the read takes place.
+                  read operation generates 2 primary key read
+                  operations&mdash;1 for the hidden unique index table,
+                  and 1 for the table on which the read takes place.
                 </para>
 
               </formalpara>

@@ -2995,8 +2994,8 @@
                   were not completed. Operations increment this counter
                   when they are started and decrement it when they are
                   completed; this occurs after the transaction commits.
-                  Dirty reads and writes &mdash; as well as failed
-                  operations &mdash; decrement this counter. The maximum
+                  Dirty reads and writes&mdash;as well as failed
+                  operations&mdash;decrement this counter. The maximum
                   value that <literal>Concurrent Operations</literal>
                   can have is the maximum number of operations that a TC
                   block can support; currently, this is <literal>(2 *

@@ -3094,8 +3093,8 @@
           last reporting interval, and includes all types of read and
           write operations (insert, update, write, and delete
           operations). This also includes operations used to replicate
-          writes &mdash; for example, in a 2-replica cluster, the write
-          to the primary replica is recorded in the primary LQH, and the
+          writes&mdash;for example, in a 2-replica cluster, the write to
+          the primary replica is recorded in the primary LQH, and the
           write to the backup will be recorded in the backup LQH. Unique
           key operations may result in multiple local operations;
           however, this does <emphasis>not</emphasis> include local

@@ -3242,7 +3241,7 @@
 
     <section id="mysql-cluster-logs-cluster-log">
 
-      <title>MySQL Cluster &mdash; Messages in the Cluster Log</title>
+      <title>MySQL Cluster: Messages in the Cluster Log</title>
 
       <para>
         The following table lists the most common

@@ -7214,8 +7213,7 @@
 
     <section id="mysql-cluster-ndb-transporter-errors">
 
-      <title>MySQL Cluster &mdash; <literal role="se">NDB</literal> Transporter
-        Errors</title>
+      <title>MySQL Cluster: <literal role="se">NDB</literal> Transporter Errors</title>
 
       <para>
         This section lists error codes, names, and messages that are

@@ -7480,8 +7478,8 @@
     <para>
       The command <command>EXIT SINGLE USER MODE</command> changes the
       state of the cluster's data nodes from single user mode to normal
-      mode. API nodes &mdash; such as MySQL Servers &mdash; waiting for
-      a connection (that is, waiting for the cluster to become ready and
+      mode. API nodes&mdash;such as MySQL Servers&mdash;waiting for a
+      connection (that is, waiting for the cluster to become ready and
       available), are again permitted to connect. The API node denoted
       as the single-user node continues to run (if still connected)
       during and after the state change.

@@ -7955,8 +7953,8 @@
             <para>
               This network setup is safest because no packets can reach
               the cluster's management or data nodes from outside the
-              network &mdash; and none of the cluster's internal
-              communications can reach the outside &mdash; without going
+              network&mdash;and none of the cluster's internal
+              communications can reach the outside&mdash;without going
               through the SQL nodes, as long as the SQL nodes do not
               allow any packets to be forwarded. This means, of course,
               that all SQL nodes must be secured against hacking

@@ -8127,7 +8125,7 @@
 
               It is also possible to employ a combination of the first
               two methods, using both hardware and software to secure
-              the cluster &mdash; that is, using both network-based and
+              the cluster&mdash;that is, using both network-based and
               host-based firewalls. This is between the first two
               schemes in terms of both security level and cost. This
               type of network setup keeps the cluster behind the

@@ -8163,7 +8161,7 @@
 
         Whatever network configuration you use, remember that your
         objective from the viewpoint of keeping the cluster secure
-        remains the same &mdash; to prevent any unessential traffic from
+        remains the same&mdash;to prevent any unessential traffic from
         reaching the cluster while ensuring the most efficient
         communication between the nodes in the cluster.
       </para>

@@ -8645,8 +8643,8 @@
         <para>
           Never run <command>mysqld</command> as the system root user.
           Doing so means that potentially any file on the system can be
-          read by MySQL, and thus &mdash; should MySQL be compromised
-          &mdash; by an attacker.
+          read by MySQL, and thus&mdash;should MySQL be
+          compromised&mdash;by an attacker.
         </para>
       </important>
 


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 11; 3308 bytes

@@ -381,7 +381,7 @@
       version which you are actually using. <emphasis>It is very
       important that all of the Cluster RPMs to be installed have the
       same MySQL version number</emphasis>. The <literal>glibc</literal>
-      version number (if present &mdash; shown here as
+      version number (if present&mdash;shown here as
       <literal>glibc23</literal>), and architecture designation (shown
       here as <literal>i386</literal>) should be appropriate to the
       machine on which the RPM is to be installed.

@@ -407,8 +407,7 @@
 
     <formalpara>
 
-      <title>Data and SQL Node Installation &mdash; <filename>.tar.gz</filename>
-        Binary</title>
+      <title>Data and SQL Node Installation: <filename>.tar.gz</filename> Binary</title>
 
       <para>
         On each of the machines designated to host data or SQL nodes,

@@ -511,7 +510,7 @@
 
             <para>
               (The startup scripts directory may vary depending on your
-              operating system and version &mdash; for example, in some
+              operating system and version&mdash;for example, in some
               Linux distributions, it is
               <filename>/etc/init.d</filename>.)
             </para>

@@ -535,7 +534,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; RPM files</title>
+      <title>SQL node installation: RPM files</title>
 
       <para>
         On each machine to be used for hosting a cluster SQL node,

@@ -566,7 +565,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; building from source</title>
+      <title>SQL node installation: building from source</title>
 
       <para>
         If you compile MySQL with clustering support (for example, by

@@ -594,7 +593,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; RPM Files</title>
+      <title>Data node installation: RPM Files</title>
 
       <para>
         On a computer that is to host a cluster data node it is

@@ -617,7 +616,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; building from source</title>
+      <title>Data node installation: building from source</title>
 
       <para>
         The only executable required on a data node host is

@@ -638,7 +637,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; <filename>.tar.gz</filename> binary</title>
+      <title>Management node installation: <filename>.tar.gz</filename> binary</title>
 
       <para>
         Installation of the management node does not require the

@@ -703,7 +702,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; RPM file</title>
+      <title>Management node installation: RPM file</title>
 
       <para>
         To install the MySQL Cluster management server, it is necessary

@@ -748,7 +747,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; building from source</title>
+      <title>Management node installation: building from source</title>
 
       <para>
         When building from source and running the default <command>make


Modified: trunk/refman-4.1/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-overview.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-overview.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 11; 2877 bytes

@@ -397,11 +397,11 @@
             commands for starting and stopping nodes gracefully,
             starting and stopping message tracing (debug versions only),
             showing node versions and status, starting and stopping
-            backups, and so on. Such clients &mdash; such as the
+            backups, and so on. Such clients&mdash;such as the
             <command>ndb_mgm</command> management client supplied with
             MySQL Cluster (see
-            <xref linkend="mysql-cluster-programs-ndb-mgm"/>) &mdash;
-            are written using the MGM API, a C-language API that
+            <xref linkend="mysql-cluster-programs-ndb-mgm"/>)&mdash;are
+            written using the MGM API, a C-language API that
             communicates directly with one or more MySQL Cluster
             management servers. For more information, see
             <xref linkend="mgm-api"/>.

@@ -704,8 +704,8 @@
 
     <para>
       The data stored by the cluster is divided into four partitions,
-      numbered 0, 1, 2, and 3. Each partition is stored &mdash; in
-      multiple copies &mdash; on the same node group. Partitions are
+      numbered 0, 1, 2, and 3. Each partition is stored&mdash;in
+      multiple copies&mdash;on the same node group. Partitions are
       stored on alternate node groups:
     </para>
 

@@ -1483,10 +1483,10 @@
                 <literal role="type">BLOB</literal> or
                 <literal role="type">TEXT</literal> data types and that
                 is executed within a transaction, a shared read lock is
-                held on the table for the duration of the transaction
-                &mdash; that is, until the transaction is either
-                committed or aborted. This does not occur for queries
-                that use index or table scans.
+                held on the table for the duration of the
+                transaction&mdash;that is, until the transaction is
+                either committed or aborted. This does not occur for
+                queries that use index or table scans.
               </para>
 
               <para>

@@ -1820,8 +1820,8 @@
               MySQL &current-series; is limited to 1792. The maximum
               number of <emphasis>all</emphasis>
               <literal role="se">NDBCLUSTER</literal> database objects
-              in a single MySQL Cluster &mdash; including databases,
-              tables, and indexes &mdash; is limited to 20320.
+              in a single MySQL Cluster&mdash;including databases,
+              tables, and indexes&mdash;is limited to 20320.
             </para>
 
           </formalpara>


Modified: trunk/refman-4.1/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-programs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/mysql-cluster-programs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 8, Lines Added: 19, Lines Deleted: 19; 5470 bytes

@@ -1584,10 +1584,10 @@
 
             <para>
               This is a comma-delimited list of <firstterm>query
-              options</firstterm> &mdash; that is, a list of one or more
+              options</firstterm>&mdash;that is, a list of one or more
               node attributes to be returned. These include
-              <literal>id</literal> (node ID), type (node type &mdash;
-              that is, <literal>ndbd</literal>,
+              <literal>id</literal> (node ID), type (node
+              type&mdash;that is, <literal>ndbd</literal>,
               <literal>mysqld</literal>, or
               <literal>ndb_mgmd</literal>), and any configuration
               parameters whose values are to be obtained.

@@ -2275,7 +2275,7 @@
           <command>ndb_drop_index</command> drops the specified index
           from an <literal role="se">NDB</literal> table. <emphasis>It
           is recommended that you use this utility only as an example
-          for writing NDB API applications</emphasis> &mdash; see the
+          for writing NDB API applications</emphasis>&mdash;see the
           Warning later in this section for details.
         </para>
 

@@ -2399,9 +2399,9 @@
           <literal role="se">NDB</literal> table. (If you try to use
           this on a table created with a storage engine other than NDB,
           it fails with the error <errortext>723: No such table
-          exists</errortext>.) This operation is extremely fast &mdash;
-          in some cases, it can be an order of magnitude faster than
-          using <literal role="stmt">DROP TABLE</literal> on an
+          exists</errortext>.) This operation is extremely fast&mdash;in
+          some cases, it can be an order of magnitude faster than using
+          <literal role="stmt">DROP TABLE</literal> on an
           <literal role="se">NDB</literal> table from MySQL.
         </para>
 

@@ -2929,10 +2929,10 @@
         <para>
           The first time you run the <command>ndb_restore</command>
           restoration program, you also need to restore the metadata. In
-          other words, you must re-create the database tables &mdash;
-          this can be done by running it with the <option>-m</option>
-          option. Note that the cluster should have an empty database
-          when starting to restore a backup. (In other words, you should
+          other words, you must re-create the database tables&mdash;this
+          can be done by running it with the <option>-m</option> option.
+          Note that the cluster should have an empty database when
+          starting to restore a backup. (In other words, you should
           start <command>ndbd</command> with <option>--initial</option>
           prior to performing the restore.)
         </para>

@@ -2998,7 +2998,7 @@
           created in a cluster with two database nodes having the node
           IDs <literal>2</literal> and <literal>3</literal>, is to be
           restored to a cluster with four nodes. Then
-          <command>ndb_restore</command> must be run twice &mdash; once
+          <command>ndb_restore</command> must be run twice&mdash;once
           for each database node in the cluster where the backup was
           taken. However, <command>ndb_restore</command> cannot always
           restore backups made from a cluster running one version of

@@ -3880,9 +3880,9 @@
               which you should be able to find in the
               <filename>share/mysql</filename> directory of your MySQL
               installation. This file should be copied or moved into the
-              same directory as <filename>ndb_size.pl</filename> &mdash;
-              if it is not there already &mdash; before running the
-              script.
+              same directory as
+              <filename>ndb_size.pl</filename>&mdash;if it is not there
+              already&mdash;before running the script.
             </para>
           </listitem>
 

@@ -3891,9 +3891,9 @@
               A MySQL user account having the necessary privileges. If
               you do not wish to use an existing account, then creating
               one using <literal>GRANT USAGE ON
-              <replaceable>db_name</replaceable>.*</literal> &mdash;
-              where <replaceable>db_name</replaceable> is the name of
-              the database to be examined &mdash; is sufficient for this
+              <replaceable>db_name</replaceable>.*</literal>&mdash;where
+              <replaceable>db_name</replaceable> is the name of the
+              database to be examined&mdash;is sufficient for this
               purpose.
             </para>
           </listitem>

@@ -4464,7 +4464,7 @@
           Write a core file if the program dies. The name and location
           of the core file are system-dependent. (For MySQL Cluster
           programs nodes running on Linux, the default location is the
-          program&apos;s working directory &mdash; for a data node, this
+          program&apos;s working directory&mdash;for a data node, this
           is the node&apos;s <literal>DataDir</literal>.) For some
           systems, there may be restrictions or limitations; for
           example, it might be necessary to execute <command>ulimit -c


Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 13, Lines Deleted: 13; 2596 bytes

@@ -912,8 +912,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -6734,10 +6734,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -8708,11 +8708,11 @@
       </para>
 
       <para>
-        The query cache can be useful in an environment where you
-        have tables that do not change very often and for which the
-        server receives many identical queries. This is a typical
-        situation for many Web servers that generate many dynamic pages
-        based on database content.
+        The query cache can be useful in an environment where you have
+        tables that do not change very often and for which the server
+        receives many identical queries. This is a typical situation for
+        many Web servers that generate many dynamic pages based on
+        database content.
       </para>
 
       <para>

@@ -12105,8 +12105,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1194 bytes

@@ -1358,7 +1358,7 @@
       <para>
         You <emphasis>cannot</emphasis> replicate from a master that
         uses a newer binary log format to a slave that uses an older
-        format &mdash; for example, from MySQL 4.1 to MySQL 3.23. (In
+        format&mdash;for example, from MySQL 4.1 to MySQL 3.23. (In
         general, MySQL does not support replication from newer masters
         to older slaves.) This also has significant consequences for
         upgrading servers in a replication setup, as described in

@@ -3956,7 +3956,7 @@
       with the master, but there are some cases where this is not
       strictly true. For example, this can occur if the network
       connection between master and slave is broken but the slave I/O
-      thread has not yet noticed this &mdash; that is,
+      thread has not yet noticed this&mdash;that is,
       <literal role="sysvar">slave_net_timeout</literal> has not yet
       elapsed.
     </para>


Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 1481 bytes

@@ -3270,8 +3270,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
       <literal role="stmt" condition="insert-on-duplicate">INSERT ... ON
       DUPLICATE KEY UPDATE</literal> is available as of MySQL 4.1.0.

@@ -6702,7 +6703,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer


Modified: trunk/refman-4.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/sql-syntax-replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 822 bytes

@@ -517,8 +517,8 @@
           </para>
 
           <para>
-            Setting <literal>MASTER_HOST=''</literal> &mdash; that is,
-            setting its value explicitly to an empty string &mdash; is
+            Setting <literal>MASTER_HOST=''</literal>&mdash;that is,
+            setting its value explicitly to an empty string&mdash;is
             <emphasis>not</emphasis> the same as not setting it at all.
             Setting this option to an empty string causes
             <literal role="stmt">START SLAVE</literal> subsequently to


Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-4.1/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -560,7 +560,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1618,8 +1618,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1075 bytes

@@ -3836,7 +3836,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown

@@ -5150,7 +5150,7 @@
         If you wish to use a number as an enumeration value, you must
         enclose it in quotation marks. If the quotation marks are
         omitted, the number is regarded as an index. For this and other
-        reasons &mdash; as explained later in this section &mdash; we
+        reasons&mdash;as explained later in this section&mdash;we
         strongly recommend that you do <emphasis>not</emphasis> use
         numbers as enumeration values.
       </para>


Modified: trunk/refman-5.0/dba-log-files.xml
===================================================================
--- trunk/refman-5.0/dba-log-files.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/dba-log-files.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 802 bytes

@@ -531,8 +531,8 @@
       it failed, and an
       <literal role="stmt" condition="insert-on-duplicate">INSERT ... ON
       DUPLICATE KEY UPDATE</literal> statement that encountered a
-      duplicate key constraint &mdash; but did not actually change any
-      data &mdash; was not logged. Beginning with MySQL 5.0.54, both of
+      duplicate key constraint&mdash;but did not actually change any
+      data&mdash;was not logged. Beginning with MySQL 5.0.54, both of
       these statements are written to the binary log. (Bug#23333)
     </para>
 


Modified: trunk/refman-5.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.0/dba-privilege-system.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/dba-privilege-system.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1059 bytes

@@ -439,11 +439,10 @@
           <para>
             In some circumstances, the
             <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary &mdash; on slaves where there are no
-            nonreplicated tables, for instance. The MySQL Enterprise
-            Monitor notifies subscribers when accounts have
-            inappropriate privileges. For more information, see
-            &base-url-enterprise;advisors.html.
+            unnecessary&mdash;on slaves where there are no nonreplicated
+            tables, for instance. The MySQL Enterprise Monitor notifies
+            subscribers when accounts have inappropriate privileges. For
+            more information, see &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/errors-problems.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1488 bytes

@@ -1393,9 +1393,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1661,9 +1661,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>


Modified: trunk/refman-5.0/faqs-core.xml
===================================================================
--- trunk/refman-5.0/faqs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/faqs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 526 bytes

@@ -85,7 +85,7 @@
 
     <section id="faqs-replication">
 
-    <title>MySQL &current-series; FAQ &mdash; Replication</title>
+    <title>MySQL &current-series; FAQ: Replication</title>
 
     <remark role="note">
       [js] THIS SECTION COMMENTED OUT PENDING REVIEW OF 5.0 FAQ MATERIAL


Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/installing-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 5, Lines Added: 26, Lines Deleted: 27; 5186 bytes

@@ -1595,10 +1595,10 @@
           <xref linkend="mysql-install-wizard-starting"/>. Rather than
           opening a port, you also have the option of adding MySQL as a
           program that bypasses the Windows Firewall. One or the other
-          option is sufficient &mdash; you need not do both.
-          Additionally, when running the MySQL Server Configuration
-          Wizard on Windows Vista ensure that you are logged in as a
-          user with administrative rights.
+          option is sufficient&mdash;you need not do both. Additionally,
+          when running the MySQL Server Configuration Wizard on Windows
+          Vista ensure that you are logged in as a user with
+          administrative rights.
         </para>
 
         <mediaobject>

@@ -5213,11 +5213,11 @@
 
       <listitem>
         <para>
-          <literal>DIR('/QOpenSys/usr/local/')</literal> &mdash; sets
-          the installation location for the MySQL files. The directory
-          will be created if it does not already exist. This is the
-          directory that the MySQL server will be installed into, inside
-          a directory with a name matching the version and release. For
+          <literal>DIR('/QOpenSys/usr/local/')</literal>: Sets the
+          installation location for the MySQL files. The directory will
+          be created if it does not already exist. This is the directory
+          that the MySQL server will be installed into, inside a
+          directory with a name matching the version and release. For
           example, if installing MySQL 5.0.82 with the
           <literal>DIR</literal> set to
           <filename>/QOpenSys/usr/local/</filename> would result in

@@ -5229,35 +5229,34 @@
 
       <listitem>
         <para>
-          <literal>DATADIR('/QOpenSys/mysql/data')</literal> &mdash;
-          sets the location of the directory that will be upgraded.
+          <literal>DATADIR('/QOpenSys/mysql/data')</literal>: Sets the
+          location of the directory that will be upgraded.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>USRPRF('MYSQL')</literal> &mdash; sets the user
-          profile that will own the files that are installed. The
-          profile will be created if it does not already exist; if it is
-          created as part of the upgrade process, it will be disabled
-          initially. You may wish to enable this user profile so that it
-          can be used to start the MySQL server later. It is best
-          practice to use the one previously created during the first
-          installation.
+          <literal>USRPRF('MYSQL')</literal>: Sets the user profile that
+          will own the files that are installed. The profile will be
+          created if it does not already exist; if it is created as part
+          of the upgrade process, it will be disabled initially. You may
+          wish to enable this user profile so that it can be used to
+          start the MySQL server later. It is best practice to use the
+          one previously created during the first installation.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>MYSQLUSR('root user')</literal> &mdash; any user
-          account in the current MySQL server with
-          <literal>SUPER</literal> privileges.
+          <literal>MYSQLUSR('root user')</literal>: Any user account in
+          the current MySQL server with <literal>SUPER</literal>
+          privileges.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>PASSWORD('root user password')</literal> &mdash; the
+          <literal>PASSWORD('root user password')</literal>: The
           password for the above account. This is necessary as the
           upgrade starts the MySQL server to upgrade the tables and the
           password is need to be able to shutdown the MySQL server.

@@ -5266,8 +5265,8 @@
 
       <listitem>
         <para>
-          <literal>CURINST('path to previous install')</literal> &mdash;
-          the full path to the installation that is being upgraded. For
+          <literal>CURINST('path to previous install')</literal>: The
+          full path to the installation that is being upgraded. For
           example an installation in
           <filename>/QOpenSys/usr/local/</filename> will be
           <filename>/QOpenSys/usr/local/msyql-5.1.30-i5os-power64</filename>.

@@ -11117,8 +11116,8 @@
             created. These are superuser accounts that can do anything.
             The initial <literal>root</literal> account passwords are
             empty, so anyone can connect to the MySQL server as
-            <literal>root</literal> &mdash; <emphasis>without a
-            password</emphasis> &mdash; and be granted all privileges.
+            <literal>root</literal>&mdash;<emphasis>without a
+            password</emphasis>&mdash;and be granted all privileges.
           </para>
 
           <itemizedlist>


Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 13, Lines Deleted: 14; 3382 bytes

@@ -3703,10 +3703,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata. This is also
         true of the contents of tables in
         <literal>INFORMATION_SCHEMA</literal>, because those tables by

@@ -5564,7 +5564,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -5635,8 +5635,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -5676,8 +5676,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -5720,7 +5720,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -7597,10 +7597,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/introduction.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 921 bytes

@@ -543,8 +543,8 @@
               the best possible of all execution plans (this is
               currently being worked on), it can reduce the time spent
               arriving at an execution plan for a join involving a great
-              many tables &mdash; 30, 40, or more &mdash; by a factor of
-              as much as 1,000. This should eliminate most if not all
+              many tables&mdash;30, 40, or more&mdash;by a factor of as
+              much as 1,000. This should eliminate most if not all
               situations where users thought that the optimizer had hung
               when trying to perform joins across many tables.
             </para>


Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/manual.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 631 bytes

@@ -33,7 +33,7 @@
         &es-only;
 
       <para>
-        MySQL &current-series; Features &mdash; This manual describes
+        MySQL &current-series; Features&mdash;This manual describes
         features that are not included in every edition of MySQL
         &current-series; and such features may not be included in the
         edition of MySQL &current-series; licensed to you. If you have


Modified: trunk/refman-5.0/mysql-cluster-configuration-core.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-configuration-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster-configuration-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 15, Lines Added: 42, Lines Deleted: 40; 10423 bytes

@@ -373,7 +373,7 @@
 
     <section id="mysql-cluster-config-example">
 
-      <title>MySQL Cluster Configuration &mdash; Basic Example</title>
+      <title>MySQL Cluster Configuration: Basic Example</title>
 
       <indexterm>
         <primary>MySQL Cluster</primary>

@@ -997,9 +997,10 @@
 
           <para>
             This parameter specifies where to send cluster logging
-            information. There are three options in this regard &mdash;
-            <literal>CONSOLE</literal>, <literal>SYSLOG</literal>, and
-            <literal>FILE</literal> &mdash; with <literal>FILE</literal>
+            information. There are three options in this
+            regard&mdash;<literal>CONSOLE</literal>,
+            <literal>SYSLOG</literal>, and
+            <literal>FILE</literal>&mdash;with <literal>FILE</literal>
             being the default:
           </para>
 

@@ -1825,7 +1826,7 @@
 
           <para>
             In MySQL &current-series;, the default value is
-            <literal>100</literal> &mdash; that is, 100 percent of the
+            <literal>100</literal>&mdash;that is, 100 percent of the
             default maximum, or roughly 5 MB. It is possible to reduce
             this value safely, but it should never be less than 5
             percent. If you encounter Error 773 <errortext>Out of string

@@ -3209,8 +3210,8 @@
           </para>
 
           <para>
-            It is also important to ensure that even the worst of cases
-            &mdash; a complete crash of the cluster &mdash; is handled
+            It is also important to ensure that even the worst of
+            cases&mdash;a complete crash of the cluster&mdash;is handled
             properly. To guarantee that this happens, all transactions
             taking place within a given interval are put into a global
             checkpoint, which can be thought of as a set of committed

@@ -5167,12 +5168,12 @@
         Memory, Index Memory, and String Memory</link> that are used to
         configure local checkpoints for a MySQL Cluster do not exist in
         isolation, but rather are very much interdepedent on each other.
-        In this section, we illustrate how these parameters &mdash;
-        including <literal>DataMemory</literal>,
+        In this section, we illustrate how these
+        parameters&mdash;including <literal>DataMemory</literal>,
         <literal>IndexMemory</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal>, and
-        <literal>NoOfFragmentLogFiles</literal> &mdash; relate to one
+        <literal>NoOfFragmentLogFiles</literal>&mdash;relate to one
         another in a working Cluster.
       </para>
 

@@ -5248,7 +5249,7 @@
         A good starting point is to determine the amount of time that
         should elapse between local checkpoints (LCPs). It is worth
         noting that, in the event of a system restart, it takes 40-60
-        percent of this interval to execute the REDO log &mdash; for
+        percent of this interval to execute the REDO log&mdash;for
         example, if the time between LCPs is 5 minutes (300 seconds),
         then it should take 2 to 3 minutes (120 to 180 seconds) for the
         REDO log to be read.

@@ -5259,8 +5260,8 @@
         size of the <literal>DataMemory</literal> parameter. In this
         example, we assume that this is 2 GB. The
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> parameter
-        represents the amount of data to be checkpointed per unit time
-        &mdash; however, this parameter is actually expressed as the
+        represents the amount of data to be checkpointed per unit
+        time&mdash;however, this parameter is actually expressed as the
         number of 8K memory pages to be checkpointed per 100
         milliseconds. 2 GB per 300 seconds is approximately 6.8 MB per
         second, or 700 KB per 100 milliseconds, which works out to

@@ -5271,24 +5272,25 @@
         Similarly, we can calculate
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> in terms
         of the time for local checkpoints and the amount of memory
-        required for indexes &mdash; that is, the
+        required for indexes&mdash;that is, the
         <literal>IndexMemory</literal>. Assuming that we allow 512 MB
         for indexes, this works out to approximately 20 8-KB pages per
         100 milliseconds for this parameter.
       </para>
 
       <para>
-        Next, we need to determine the number of REDO log files required
-        &mdash; that is, fragment log files &mdash; the corresponding
-        parameter being <literal>NoOfFragmentLogFiles</literal>. We need
-        to make sure that there are sufficient REDO log files for
-        keeping records for at least 3 local checkpoints. In a
-        production setting, there are always uncertainties &mdash; for
-        instance, we cannot be sure that disks always operate at top
-        speed or with maximum throughput. For this reason, it is best to
-        err on the side of caution, so we double our requirement and
-        calculate a number of fragment log files which should be enough
-        to keep records covering 6 local checkpoints.
+        Next, we need to determine the number of REDO log files
+        required&mdash;that is, fragment log files&mdash;the
+        corresponding parameter being
+        <literal>NoOfFragmentLogFiles</literal>. We need to make sure
+        that there are sufficient REDO log files for keeping records for
+        at least 3 local checkpoints. In a production setting, there are
+        always uncertainties&mdash;for instance, we cannot be sure that
+        disks always operate at top speed or with maximum throughput.
+        For this reason, it is best to err on the side of caution, so we
+        double our requirement and calculate a number of fragment log
+        files which should be enough to keep records covering 6 local
+        checkpoints.
       </para>
 
       <para>

@@ -5338,7 +5340,7 @@
             15000 <literal role="stmt">UPDATE</literal> statements per
             hour is roughly the same as 5 updates per second. Each
             update uses 72 bytes, plus 4 bytes per column * 5 columns
-            updated, plus 32 bytes per column * 5 columns &mdash; this
+            updated, plus 32 bytes per column * 5 columns&mdash;this
             works out to 72 + 20 + 160 = 252 bytes per operation, and
             multiplying this by 5 operation per second yields 1260 bytes
             per second.

@@ -5364,7 +5366,7 @@
         by 1800 seconds, this yields 16524000 bytes required for REDO
         logging, or approximately 15.75 MB. The unit used for
         <literal>NoOfFragmentLogFiles</literal> represents a set of 4
-        16-MB log files &mdash; that is, 64 MB. Thus, the minimum value
+        16-MB log files&mdash;that is, 64 MB. Thus, the minimum value
         (3) for this parameter is sufficient for the scenario envisioned
         in this example, since 3 times 64 = 192 MB, or about 12 times
         what is required; the default value of 8 (or 512 MB) is more

@@ -5415,9 +5417,9 @@
 
     <para>
       It is also stated what type of restart is required (node restart
-      or system restart) &mdash; and whether the restart must be done
-      with <option>--initial</option> &mdash; to change the value of a
-      given configuration parameter.
+      or system restart)&mdash;and whether the restart must be done with
+      <option>--initial</option>&mdash;to change the value of a given
+      configuration parameter.
     </para>
 
     <para>

@@ -5425,8 +5427,8 @@
       the cluster's data nodes must be restarted in turn (also referred
       to as a <firstterm>rolling restart</firstterm>). It is possible to
       update cluster configuration parameters marked as
-      <literal>node</literal> online &mdash; that is, without shutting
-      down the cluster &mdash; in this fashion. An initial node restart
+      <literal>node</literal> online&mdash;that is, without shutting
+      down the cluster&mdash;in this fashion. An initial node restart
       requires restarting each <command>ndbd</command> process with the
       <option>--initial</option> option.
     </para>

@@ -5454,11 +5456,11 @@
       </para>
 
       <para>
-        However, decreasing the values of such parameters &mdash;
-        whether this is done via a node restart, node initial restart,
-        or even a complete system restart of the cluster &mdash; is not
-        to be undertaken lightly; it is recommended that you do so only
-        after careful planning and testing. This is especially true with
+        However, decreasing the values of such parameters&mdash;whether
+        this is done via a node restart, node initial restart, or even a
+        complete system restart of the cluster&mdash;is not to be
+        undertaken lightly; it is recommended that you do so only after
+        careful planning and testing. This is especially true with
         regard to those parameters that relate to memory usage and disk
         space, such as <literal>MaxNoOfTables</literal>,
         <literal>MaxNoOfOrderedIndexes</literal>, and

@@ -5477,8 +5479,8 @@
 
     <note>
       <para>
-        <literal>4294967039</literal> &mdash; which often appears as a
-        maximum value in these tables &mdash; is defined in the
+        <literal>4294967039</literal>&mdash;which often appears as a
+        maximum value in these tables&mdash;is defined in the
         <literal role="se">NDBCLUSTER</literal> sources as
         <literal>MAX_INT_RNIL</literal> and is equal to
         <literal>0xFFFFFEFF</literal>, or

@@ -5994,7 +5996,7 @@
           <para>
             Determines the probability of gaps in an autoincremented
             column. Set it to <literal>1</literal> to minimize this.
-            Setting it to a high value for optimization &mdash; makes
+            Setting it to a high value for optimization&mdash;makes
             inserts faster, but decreases the likelihood that
             consecutive autoincrement numbers will be used in a batch of
             inserts. Default value: <literal>32</literal>. Minimum


Modified: trunk/refman-5.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-management.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster-management.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 14, Lines Added: 28, Lines Deleted: 30; 9061 bytes

@@ -44,8 +44,8 @@
     <filename>ndb_<replaceable>node_id</replaceable>_cluster.log</filename>;
     this is usually found in the management server's
     <literal>DataDir</literal> directory, but this location can be
-    overridden using the <literal>LogDestination</literal> option
-    &mdash; see <xref linkend="mysql-cluster-mgm-definition"/>, for
+    overridden using the <literal>LogDestination</literal>
+    option&mdash;see <xref linkend="mysql-cluster-mgm-definition"/>, for
     details. (Recall that <replaceable>node_id</replaceable> represents
     the unique identifier of the node whose activity is being logged.)
     The cluster log contains event reports generated by

@@ -224,9 +224,9 @@
       Normally, in the event of a problem with the node, the node
       disconnects from the management server, the socket used for the
       connection is closed, and the reserved node ID is freed. However,
-      if a node is disconnected abruptly &mdash; for example, due to a
+      if a node is disconnected abruptly&mdash;for example, due to a
       hardware failure in one of the cluster hosts, or because of
-      network issues &mdash; the normal closing of the socket by the
+      network issues&mdash;the normal closing of the socket by the
       operating system may not take place. In this case, the node ID
       continues to be reserved and not released until a TCP timeout
       occurs 10 or so minutes later.

@@ -2059,7 +2059,7 @@
 
       <para>
         Event severity levels can be turned on or off (using
-        <literal>CLUSTERLOG FILTER</literal> &mdash; see above). If a
+        <literal>CLUSTERLOG FILTER</literal>&mdash;see above). If a
         severity level is turned on, then all events with a priority
         less than or equal to the category thresholds are logged. If the
         severity level is turned off then no events belonging to that

@@ -2438,34 +2438,33 @@
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; less than 1/2
-                      nodes left
+                      Arbitration check failed&mdash;less than 1/2 nodes
+                      left
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check succeeded &mdash; node group
+                      Arbitration check succeeded&mdash;node group
                       majority
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; missing node
-                      group
+                      Arbitration check failed&mdash;missing node group
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Network partitioning &mdash; arbitration required
+                      Network partitioning&mdash;arbitration required
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration succeeded &mdash; affirmative response
+                      Arbitration succeeded&mdash;affirmative response
                       from node <replaceable>X</replaceable>
                     </para>
                   </listitem>

@@ -2954,9 +2953,9 @@
                   started in the last reporting interval, including
                   simple reads. This count also includes reads performed
                   as part of unique index operations. A unique index
-                  read operation generates 2 primary key read operations
-                  &mdash; 1 for the hidden unique index table, and 1 for
-                  the table on which the read takes place.
+                  read operation generates 2 primary key read
+                  operations&mdash;1 for the hidden unique index table,
+                  and 1 for the table on which the read takes place.
                 </para>
 
               </formalpara>

@@ -3047,8 +3046,8 @@
                   were not completed. Operations increment this counter
                   when they are started and decrement it when they are
                   completed; this occurs after the transaction commits.
-                  Dirty reads and writes &mdash; as well as failed
-                  operations &mdash; decrement this counter. The maximum
+                  Dirty reads and writes&mdash;as well as failed
+                  operations&mdash;decrement this counter. The maximum
                   value that <literal>Concurrent Operations</literal>
                   can have is the maximum number of operations that a TC
                   block can support; currently, this is <literal>(2 *

@@ -3146,8 +3145,8 @@
           last reporting interval, and includes all types of read and
           write operations (insert, update, write, and delete
           operations). This also includes operations used to replicate
-          writes &mdash; for example, in a 2-replica cluster, the write
-          to the primary replica is recorded in the primary LQH, and the
+          writes&mdash;for example, in a 2-replica cluster, the write to
+          the primary replica is recorded in the primary LQH, and the
           write to the backup will be recorded in the backup LQH. Unique
           key operations may result in multiple local operations;
           however, this does <emphasis>not</emphasis> include local

@@ -3294,7 +3293,7 @@
 
     <section id="mysql-cluster-logs-cluster-log">
 
-      <title>MySQL Cluster &mdash; Messages in the Cluster Log</title>
+      <title>MySQL Cluster: Messages in the Cluster Log</title>
 
       <para>
         The following table lists the most common

@@ -7266,8 +7265,7 @@
 
     <section id="mysql-cluster-ndb-transporter-errors">
 
-      <title>MySQL Cluster &mdash; <literal role="se">NDB</literal> Transporter
-        Errors</title>
+      <title>MySQL Cluster: <literal role="se">NDB</literal> Transporter Errors</title>
 
       <para>
         This section lists error codes, names, and messages that are

@@ -7532,8 +7530,8 @@
     <para>
       The command <command>EXIT SINGLE USER MODE</command> changes the
       state of the cluster's data nodes from single user mode to normal
-      mode. API nodes &mdash; such as MySQL Servers &mdash; waiting for
-      a connection (that is, waiting for the cluster to become ready and
+      mode. API nodes&mdash;such as MySQL Servers&mdash;waiting for a
+      connection (that is, waiting for the cluster to become ready and
       available), are again permitted to connect. The API node denoted
       as the single-user node continues to run (if still connected)
       during and after the state change.

@@ -8007,8 +8005,8 @@
             <para>
               This network setup is safest because no packets can reach
               the cluster's management or data nodes from outside the
-              network &mdash; and none of the cluster's internal
-              communications can reach the outside &mdash; without going
+              network&mdash;and none of the cluster's internal
+              communications can reach the outside&mdash;without going
               through the SQL nodes, as long as the SQL nodes do not
               allow any packets to be forwarded. This means, of course,
               that all SQL nodes must be secured against hacking

@@ -8179,7 +8177,7 @@
 
               It is also possible to employ a combination of the first
               two methods, using both hardware and software to secure
-              the cluster &mdash; that is, using both network-based and
+              the cluster&mdash;that is, using both network-based and
               host-based firewalls. This is between the first two
               schemes in terms of both security level and cost. This
               type of network setup keeps the cluster behind the

@@ -8215,7 +8213,7 @@
 
         Whatever network configuration you use, remember that your
         objective from the viewpoint of keeping the cluster secure
-        remains the same &mdash; to prevent any unessential traffic from
+        remains the same&mdash;to prevent any unessential traffic from
         reaching the cluster while ensuring the most efficient
         communication between the nodes in the cluster.
       </para>

@@ -8699,8 +8697,8 @@
         <para>
           Never run <command>mysqld</command> as the system root user.
           Doing so means that potentially any file on the system can be
-          read by MySQL, and thus &mdash; should MySQL be compromised
-          &mdash; by an attacker.
+          read by MySQL, and thus&mdash;should MySQL be
+          compromised&mdash;by an attacker.
         </para>
       </important>
 


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 11; 3308 bytes

@@ -372,7 +372,7 @@
       version which you are actually using. <emphasis>It is very
       important that all of the Cluster RPMs to be installed have the
       same MySQL version number</emphasis>. The <literal>glibc</literal>
-      version number (if present &mdash; shown here as
+      version number (if present&mdash;shown here as
       <literal>glibc23</literal>), and architecture designation (shown
       here as <literal>i386</literal>) should be appropriate to the
       machine on which the RPM is to be installed.

@@ -398,8 +398,7 @@
 
     <formalpara>
 
-      <title>Data and SQL Node Installation &mdash; <filename>.tar.gz</filename>
-        Binary</title>
+      <title>Data and SQL Node Installation: <filename>.tar.gz</filename> Binary</title>
 
       <para>
         On each of the machines designated to host data or SQL nodes,

@@ -502,7 +501,7 @@
 
             <para>
               (The startup scripts directory may vary depending on your
-              operating system and version &mdash; for example, in some
+              operating system and version&mdash;for example, in some
               Linux distributions, it is
               <filename>/etc/init.d</filename>.)
             </para>

@@ -526,7 +525,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; RPM files</title>
+      <title>SQL node installation: RPM files</title>
 
       <para>
         On each machine to be used for hosting a cluster SQL node,

@@ -556,7 +555,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; building from source</title>
+      <title>SQL node installation: building from source</title>
 
       <para>
         If you compile MySQL with clustering support (for example, by

@@ -584,7 +583,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; RPM Files</title>
+      <title>Data node installation: RPM Files</title>
 
       <para>
         On a computer that is to host a cluster data node it is

@@ -607,7 +606,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; building from source</title>
+      <title>Data node installation: building from source</title>
 
       <para>
         The only executable required on a data node host is

@@ -628,7 +627,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; <filename>.tar.gz</filename> binary</title>
+      <title>Management node installation: <filename>.tar.gz</filename> binary</title>
 
       <para>
         Installation of the management node does not require the

@@ -693,7 +692,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; RPM file</title>
+      <title>Management node installation: RPM file</title>
 
       <para>
         To install the MySQL Cluster management server, it is necessary

@@ -738,7 +737,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; building from source</title>
+      <title>Management node installation: building from source</title>
 
       <para>
         When building from source and running the default <command>make


Modified: trunk/refman-5.0/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-overview.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster-overview.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 16, Lines Deleted: 16; 4080 bytes

@@ -403,11 +403,11 @@
             commands for starting and stopping nodes gracefully,
             starting and stopping message tracing (debug versions only),
             showing node versions and status, starting and stopping
-            backups, and so on. Such clients &mdash; such as the
+            backups, and so on. Such clients&mdash;such as the
             <command>ndb_mgm</command> management client supplied with
             MySQL Cluster (see
-            <xref linkend="mysql-cluster-programs-ndb-mgm"/>) &mdash;
-            are written using the MGM API, a C-language API that
+            <xref linkend="mysql-cluster-programs-ndb-mgm"/>)&mdash;are
+            written using the MGM API, a C-language API that
             communicates directly with one or more MySQL Cluster
             management servers. For more information, see
             <xref linkend="mgm-api"/>.

@@ -710,8 +710,8 @@
 
     <para>
       The data stored by the cluster is divided into four partitions,
-      numbered 0, 1, 2, and 3. Each partition is stored &mdash; in
-      multiple copies &mdash; on the same node group. Partitions are
+      numbered 0, 1, 2, and 3. Each partition is stored&mdash;in
+      multiple copies&mdash;on the same node group. Partitions are
       stored on alternate node groups:
     </para>
 

@@ -1041,8 +1041,8 @@
           <para>
             <emphasis role="bold">Limit On Number of Metadata
             Objects</emphasis>: Beginning with MySQL 5.0.6, each Cluster
-            database may contain a maximum of 20320 metadata objects
-            &mdash; this includes database tables, system tables,
+            database may contain a maximum of 20320 metadata
+            objects&mdash;this includes database tables, system tables,
             indexes and <literal role="type">BLOB</literal> values.
             (Previously, this number was 1600.)
           </para>

@@ -1645,10 +1645,10 @@
                 <literal role="type">BLOB</literal> or
                 <literal role="type">TEXT</literal> data types and that
                 is executed within a transaction, a shared read lock is
-                held on the table for the duration of the transaction
-                &mdash; that is, until the transaction is either
-                committed or aborted. This does not occur for queries
-                that use index or table scans.
+                held on the table for the duration of the
+                transaction&mdash;that is, until the transaction is
+                either committed or aborted. This does not occur for
+                queries that use index or table scans.
               </para>
 
               <para>

@@ -1985,8 +1985,8 @@
               MySQL &current-series; is limited to 1792. The maximum
               number of <emphasis>all</emphasis>
               <literal role="se">NDBCLUSTER</literal> database objects
-              in a single MySQL Cluster &mdash; including databases,
-              tables, and indexes &mdash; is limited to 20320.
+              in a single MySQL Cluster&mdash;including databases,
+              tables, and indexes&mdash;is limited to 20320.
             </para>
 
           </formalpara>

@@ -2695,9 +2695,9 @@
               either the <option role="mysqld">--basedir</option> or
               <option role="mysqld">--character-sets-dir</option>
               options. (Previously, <command>ndbd</command> in MySQL 5.0
-              searched only the default path &mdash; typically
-              <filename>/usr/local/mysql/share/mysql/charsets</filename>
-              &mdash; for character sets.)
+              searched only the default path&mdash;typically
+              <filename>/usr/local/mysql/share/mysql/charsets</filename>&mdash;for
+              character sets.)
             </para>
 
           </formalpara>


Modified: trunk/refman-5.0/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-programs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster-programs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 10, Lines Added: 28, Lines Deleted: 27; 6885 bytes

@@ -610,8 +610,8 @@
             <para>
               Suppose that you have a 4-node cluster whose data nodes
               have the IDs 2, 3, 4, and 5, and you wish to perform a
-              partial initial start using only nodes 2, 4, and 5 &mdash;
-              that is, omitting node 3:
+              partial initial start using only nodes 2, 4, and
+              5&mdash;that is, omitting node 3:
             </para>
 
 <programlisting>

@@ -656,12 +656,13 @@
 
             <para>
               If you wanted to start up the same cluster as in the
-              previous example without one <command>ndbd</command>
-              &mdash; say, for example, that the host machine for node 3
-              has suffered a hardware failure &mdash; then start nodes
-              2, 4, and 5 with <option>--nowait-nodes=3</option>. Then
-              the cluster will start as soon as nodes 2, 4, and 5
-              connect and will not wait for node 3 to start.
+              previous example without one
+              <command>ndbd</command>&mdash;say, for example, that the
+              host machine for node 3 has suffered a hardware
+              failure&mdash;then start nodes 2, 4, and 5 with
+              <option>--nowait-nodes=3</option>. Then the cluster will
+              start as soon as nodes 2, 4, and 5 connect and will not
+              wait for node 3 to start.
             </para>
 
             <para>

@@ -1658,10 +1659,10 @@
 
             <para>
               This is a comma-delimited list of <firstterm>query
-              options</firstterm> &mdash; that is, a list of one or more
+              options</firstterm>&mdash;that is, a list of one or more
               node attributes to be returned. These include
-              <literal>id</literal> (node ID), type (node type &mdash;
-              that is, <literal>ndbd</literal>,
+              <literal>id</literal> (node ID), type (node
+              type&mdash;that is, <literal>ndbd</literal>,
               <literal>mysqld</literal>, or
               <literal>ndb_mgmd</literal>), and any configuration
               parameters whose values are to be obtained.

@@ -2368,7 +2369,7 @@
           <command>ndb_drop_index</command> drops the specified index
           from an <literal role="se">NDB</literal> table. <emphasis>It
           is recommended that you use this utility only as an example
-          for writing NDB API applications</emphasis> &mdash; see the
+          for writing NDB API applications</emphasis>&mdash;see the
           Warning later in this section for details.
         </para>
 

@@ -2492,9 +2493,9 @@
           <literal role="se">NDB</literal> table. (If you try to use
           this on a table created with a storage engine other than NDB,
           it fails with the error <errortext>723: No such table
-          exists</errortext>.) This operation is extremely fast &mdash;
-          in some cases, it can be an order of magnitude faster than
-          using <literal role="stmt">DROP TABLE</literal> on an
+          exists</errortext>.) This operation is extremely fast&mdash;in
+          some cases, it can be an order of magnitude faster than using
+          <literal role="stmt">DROP TABLE</literal> on an
           <literal role="se">NDB</literal> table from MySQL.
         </para>
 

@@ -3023,10 +3024,10 @@
         <para>
           The first time you run the <command>ndb_restore</command>
           restoration program, you also need to restore the metadata. In
-          other words, you must re-create the database tables &mdash;
-          this can be done by running it with the <option>-m</option>
-          option. Note that the cluster should have an empty database
-          when starting to restore a backup. (In other words, you should
+          other words, you must re-create the database tables&mdash;this
+          can be done by running it with the <option>-m</option> option.
+          Note that the cluster should have an empty database when
+          starting to restore a backup. (In other words, you should
           start <command>ndbd</command> with <option>--initial</option>
           prior to performing the restore.)
         </para>

@@ -3094,7 +3095,7 @@
           created in a cluster with two database nodes having the node
           IDs <literal>2</literal> and <literal>3</literal>, is to be
           restored to a cluster with four nodes. Then
-          <command>ndb_restore</command> must be run twice &mdash; once
+          <command>ndb_restore</command> must be run twice&mdash;once
           for each database node in the cluster where the backup was
           taken. However, <command>ndb_restore</command> cannot always
           restore backups made from a cluster running one version of

@@ -4191,9 +4192,9 @@
               which you should be able to find in the
               <filename>share/mysql</filename> directory of your MySQL
               installation. This file should be copied or moved into the
-              same directory as <filename>ndb_size.pl</filename> &mdash;
-              if it is not there already &mdash; before running the
-              script.
+              same directory as
+              <filename>ndb_size.pl</filename>&mdash;if it is not there
+              already&mdash;before running the script.
             </para>
           </listitem>
 

@@ -4202,9 +4203,9 @@
               A MySQL user account having the necessary privileges. If
               you do not wish to use an existing account, then creating
               one using <literal>GRANT USAGE ON
-              <replaceable>db_name</replaceable>.*</literal> &mdash;
-              where <replaceable>db_name</replaceable> is the name of
-              the database to be examined &mdash; is sufficient for this
+              <replaceable>db_name</replaceable>.*</literal>&mdash;where
+              <replaceable>db_name</replaceable> is the name of the
+              database to be examined&mdash;is sufficient for this
               purpose.
             </para>
           </listitem>

@@ -4778,7 +4779,7 @@
           Write a core file if the program dies. The name and location
           of the core file are system-dependent. (For MySQL Cluster
           programs nodes running on Linux, the default location is the
-          program&apos;s working directory &mdash; for a data node, this
+          program&apos;s working directory&mdash;for a data node, this
           is the node&apos;s <literal>DataDir</literal>.) For some
           systems, there may be restrictions or limitations; for
           example, it might be necessary to execute <command>ulimit -c


Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/mysql-cluster.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 964 bytes

@@ -70,9 +70,9 @@
       performance when run using MySQL Cluster (see
       <xref linkend="mysql-cluster-limitations"/>). Most of these issues
       can be overcome, but this also means that you are very unlikely to
-      be able to switch an existing application datastore &mdash; that
+      be able to switch an existing application datastore&mdash;that
       currently uses, for example, <literal role="se">MyISAM</literal>
-      or <literal role="se">InnoDB</literal> &mdash; to use the
+      or <literal role="se">InnoDB</literal>&mdash;to use the
       <literal role="se">NDB</literal> storage engine without allowing
       for the possibility of changes in schemas, queries, and
       applications.


Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 13, Lines Deleted: 13; 2598 bytes

@@ -905,8 +905,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -9083,10 +9083,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -11270,11 +11270,11 @@
       </para>
 
       <para>
-        The query cache can be useful in an environment where you
-        have tables that do not change very often and for which the
-        server receives many identical queries. This is a typical
-        situation for many Web servers that generate many dynamic pages
-        based on database content.
+        The query cache can be useful in an environment where you have
+        tables that do not change very often and for which the server
+        receives many identical queries. This is a typical situation for
+        many Web servers that generate many dynamic pages based on
+        database content.
       </para>
 
       <para>

@@ -14862,8 +14862,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/replication-configuration.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1656 bytes

@@ -1238,10 +1238,10 @@
               slave. (If this option was not set explicitly on the
               existing slave, use
               <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively &mdash; if you have already tried to start
-              the new slave (after following the remaining steps in this
+              Alternatively&mdash;if you have already tried to start the
+              new slave (after following the remaining steps in this
               section) and have encountered errors like those described
-              previously &mdash; then perform the following steps:
+              previously&mdash;then perform the following steps:
 
               <orderedlist>
 

@@ -1487,9 +1487,9 @@
             caught up with the master, but there are some cases where
             this is not strictly true. For example, this can occur if
             the network connection between master and slave is broken
-            but the slave I/O thread has not yet noticed this &mdash;
-            that is, <literal role="sysvar">slave_net_timeout</literal>
-            has not yet elapsed.
+            but the slave I/O thread has not yet noticed this&mdash;that
+            is, <literal role="sysvar">slave_net_timeout</literal> has
+            not yet elapsed.
           </para>
 
           <para>


Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/se-innodb-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 739 bytes

@@ -2304,8 +2304,8 @@
 
         <para>
           Having <literal role="sysvar">innodb_support_xa</literal>
-          enabled on a replication master &mdash; or on any MySQL server
-          where binary logging is in use &mdash; ensures that the binary
+          enabled on a replication master&mdash;or on any MySQL server
+          where binary logging is in use&mdash;ensures that the binary
           log does not get out of sync compared to the table data.
         </para>
 


Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 1352 bytes

@@ -3531,8 +3531,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
     </para>
 

@@ -7613,7 +7614,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer


Modified: trunk/refman-5.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/sql-syntax-replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 822 bytes

@@ -524,8 +524,8 @@
           </para>
 
           <para>
-            Setting <literal>MASTER_HOST=''</literal> &mdash; that is,
-            setting its value explicitly to an empty string &mdash; is
+            Setting <literal>MASTER_HOST=''</literal>&mdash;that is,
+            setting its value explicitly to an empty string&mdash;is
             <emphasis>not</emphasis> the same as not setting it at all.
             Setting this option to an empty string causes
             <literal role="stmt">START SLAVE</literal> subsequently to


Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.0/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -562,7 +562,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1621,8 +1621,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1075 bytes

@@ -3649,7 +3649,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown

@@ -4876,7 +4876,7 @@
         If you wish to use a number as an enumeration value, you must
         enclose it in quotation marks. If the quotation marks are
         omitted, the number is regarded as an index. For this and other
-        reasons &mdash; as explained later in this section &mdash; we
+        reasons&mdash;as explained later in this section&mdash;we
         strongly recommend that you do <emphasis>not</emphasis> use
         numbers as enumeration values.
       </para>


Modified: trunk/refman-5.1/dba-log-files.xml
===================================================================
--- trunk/refman-5.1/dba-log-files.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/dba-log-files.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1369 bytes

@@ -1075,8 +1075,8 @@
       it failed, and an
       <literal role="stmt" condition="insert-on-duplicate">INSERT ... ON
       DUPLICATE KEY UPDATE</literal> statement that encountered a
-      duplicate key constraint &mdash; but did not actually change any
-      data &mdash; was not logged. Beginning with MySQL 5.1.23, both of
+      duplicate key constraint&mdash;but did not actually change any
+      data&mdash;was not logged. Beginning with MySQL 5.1.23, both of
       these statements are written to the binary log. (Bug#23333)
     </para>
 

@@ -1634,9 +1634,9 @@
         <listitem>
           <para>
             When the body of a view requires row-based replication, the
-            statement creating the view also uses it &mdash; for
-            example, this occurs when the statement creating a view uses
-            the <literal role="func">UUID()</literal> function.
+            statement creating the view also uses it. For example, this
+            occurs when the statement creating a view uses the
+            <literal role="func">UUID()</literal> function.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 891 bytes

@@ -8700,9 +8700,9 @@
           The <literal role="sysvar">rand_seed1</literal> and
           <literal role="sysvar">rand_seed2</literal> variables exist as
           session variables only, and can be set but not read. Beginning
-          with MySQL 5.1.18, the variables &mdash; but not their values
-          &mdash; are shown in the output of <literal role="stmt">SHOW
-          VARIABLES</literal>.
+          with MySQL 5.1.18, the variables&mdash;but not their
+          values&mdash;are shown in the output of
+          <literal role="stmt">SHOW VARIABLES</literal>.
         </para>
 
         <para>


Modified: trunk/refman-5.1/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.1/dba-privilege-system.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/dba-privilege-system.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1059 bytes

@@ -449,11 +449,10 @@
           <para>
             In some circumstances, the
             <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary &mdash; on slaves where there are no
-            nonreplicated tables, for instance. The MySQL Enterprise
-            Monitor notifies subscribers when accounts have
-            inappropriate privileges. For more information, see
-            &base-url-enterprise;advisors.html.
+            unnecessary&mdash;on slaves where there are no nonreplicated
+            tables, for instance. The MySQL Enterprise Monitor notifies
+            subscribers when accounts have inappropriate privileges. For
+            more information, see &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/errors-problems-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1897 bytes

@@ -1383,9 +1383,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1651,9 +1651,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>

@@ -5085,7 +5085,7 @@
           been defined as <literal role="type">DECIMAL</literal> rather
           than <literal role="type">DOUBLE</literal>, the result of the
           <literal role="stmt">SELECT</literal> query would have
-          contained only one row &mdash; the last one shown above.
+          contained only one row&mdash;the last one shown above.
         </para>
 
         <para>


Modified: trunk/refman-5.1/faqs-core.xml
===================================================================
--- trunk/refman-5.1/faqs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/faqs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 526 bytes

@@ -85,7 +85,7 @@
 
     <section id="faqs-replication">
 
-    <title>MySQL &current-series; FAQ &mdash; Replication</title>
+    <title>MySQL &current-series; FAQ: Replication</title>
 
     <remark role="note">
       [js] THIS SECTION COMMENTED OUT PENDING REVIEW OF 5.0 FAQ MATERIAL


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/functions-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 9; 2020 bytes

@@ -13855,11 +13855,11 @@
 
         <para>
           If no matching text node is found for the expression
-          (including the implicit <literal>/text()</literal>) &mdash;
-          for whatever reason, as long as
+          (including the implicit <literal>/text()</literal>)&mdash;for
+          whatever reason, as long as
           <replaceable>xpath_expr</replaceable> is valid, and
           <replaceable>xml_frag</replaceable> consists of elements which
-          are properly nested and closed &mdash; an empty string is
+          are properly nested and closed&mdash;an empty string is
           returned. No distinction is made between a match on an empty
           element and no match at all. This is by design.
         </para>

@@ -13955,8 +13955,8 @@
         </para>
 
         <para>
-          (Previously, binary &mdash; that is, case-sensitive &mdash;
-          comparison was always used.)
+          (Previously, binary&mdash;that is,
+          case-sensitive&mdash;comparison was always used.)
         </para>
 
         <para>

@@ -14392,10 +14392,10 @@
           <listitem>
             <para>
               Locators prefixed with expressions that evaluate as scalar
-              values &mdash; including variable references, literals,
-              numbers,and scalar function calls &mdash; are not
-              supported. Beginning with MySQL 5.1.32, they are
-              disallowed, and their use results in an error. (Bug#42495)
+              values&mdash;including variable references, literals,
+              numbers,and scalar function calls&mdash;are not supported.
+              Beginning with MySQL 5.1.32, they are disallowed, and
+              their use results in an error. (Bug#42495)
             </para>
           </listitem>
 


Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/information-schema.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 736 bytes

@@ -4188,8 +4188,8 @@
       <listitem>
         <para>
           <literal>DATA_LENGTH</literal>: The total length of all rows
-          stored in this partition or subpartition, in bytes &mdash;
-          that is, the total number of bytes stored in the partition or
+          stored in this partition or subpartition, in bytes&mdash;that
+          is, the total number of bytes stored in the partition or
           subpartition.
         </para>
       </listitem>


Modified: trunk/refman-5.1/installing-i5os.xml
===================================================================
--- trunk/refman-5.1/installing-i5os.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/installing-i5os.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 16; 3189 bytes

@@ -310,7 +310,7 @@
 
     <listitem>
       <para>
-        <literal>DIR('/QOpenSys/usr/local/')</literal> &mdash; sets the
+        <literal>DIR('/QOpenSys/usr/local/')</literal>: Sets the
         installation location for the MySQL files. The directory will be
         created if it does not already exist. This is the directory that
         the MySQL server will be installed into, inside a directory with

@@ -325,15 +325,15 @@
 
     <listitem>
       <para>
-        <literal>DATADIR('/QOpenSys/mysql/data')</literal> &mdash; sets
-        the location of the directory that will be upgraded.
+        <literal>DATADIR('/QOpenSys/mysql/data')</literal>: Sets the
+        location of the directory that will be upgraded.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <literal>USRPRF('MYSQL')</literal> &mdash; sets the user profile
-        that will own the files that are installed. The profile will be
+        <literal>USRPRF('MYSQL')</literal>: Sets the user profile that
+        will own the files that are installed. The profile will be
         created if it does not already exist; if it is created as part
         of the upgrade process, it will be disabled initially. You may
         wish to enable this user profile so that it can be used to start

@@ -344,27 +344,27 @@
 
     <listitem>
       <para>
-        <literal>MYSQLUSR('root user')</literal> &mdash; any user
-        account in the current MySQL server with
-        <literal>SUPER</literal> privileges.
+        <literal>MYSQLUSR('root user')</literal>: Any user account in
+        the current MySQL server with <literal>SUPER</literal>
+        privileges.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <literal>PASSWORD('root user password')</literal> &mdash; the
-        password for the above account. This is necessary as the upgrade
-        starts the MySQL server to upgrade the tables and the password
-        is need to be able to shutdown the MySQL server.
+        <literal>PASSWORD('root user password')</literal>: The password
+        for the above account. This is necessary as the upgrade starts
+        the MySQL server to upgrade the tables and the password is need
+        to be able to shutdown the MySQL server.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <literal>CURINST('path to previous install')</literal> &mdash;
-        the full path to the installation that is being upgraded. For
-        example an installation in
-        <filename>/QOpenSys/usr/local/</filename> will be
+        <literal>CURINST('path to previous install')</literal>: The full
+        path to the installation that is being upgraded. For example an
+        installation in <filename>/QOpenSys/usr/local/</filename> will
+        be
         <filename>/QOpenSys/usr/local/msyql-5.1.30-i5os-power64</filename>.
         Failure to specify this option may result in corruption of your
         existing data files.


Modified: trunk/refman-5.1/installing-postinstall.xml
===================================================================
--- trunk/refman-5.1/installing-postinstall.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/installing-postinstall.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 805 bytes

@@ -1585,8 +1585,8 @@
           created. These are superuser accounts that can do anything.
           The initial <literal>root</literal> account passwords are
           empty, so anyone can connect to the MySQL server as
-          <literal>root</literal> &mdash; <emphasis>without a
-          password</emphasis> &mdash; and be granted all privileges.
+          <literal>root</literal>&mdash;<emphasis>without a
+          password</emphasis>&mdash;and be granted all privileges.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-5.1/installing-windows.xml
===================================================================
--- trunk/refman-5.1/installing-windows.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/installing-windows.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 6, Lines Deleted: 7; 2273 bytes

@@ -514,8 +514,8 @@
 
       <listitem>
         <para>
-          <emphasis role="bold">Windows Essentials </emphasis> &mdash;
-          this package has a file name similar to
+          <emphasis role="bold">Windows Essentials </emphasis>: This
+          package has a file name similar to
           <filename>mysql-essential-&current-version;-win32.msi</filename>
           and is supplied as a Microsoft Installer (MSI) package. The
           package includes the minimum set of files needed to install

@@ -534,8 +534,7 @@
       <listitem>
         <para>
           <emphasis role="bold">Windows MSI Installer
-          (Complete)</emphasis> &mdash; this package has a file name
-          similar to
+          (Complete)</emphasis>: This package has a file name similar to
           <filename>mysql-&current-version;-win32.zip</filename> and
           contains all files needed for a complete Windows installation,
           including the MySQL Server Instance Config Wizard. This

@@ -551,8 +550,8 @@
 
       <listitem>
         <para>
-          <emphasis role="bold">Without installer</emphasis> &mdash;
-          this package has a file name similar to
+          <emphasis role="bold">Without installer</emphasis>: This
+          package has a file name similar to
           <filename>mysql-noinstall-&current-version;-win32.zip</filename>
           and contains all the files found in the Complete install
           package, with the exception of the MySQL Server Instance

@@ -1414,7 +1413,7 @@
         in <xref linkend="mysql-install-wizard-starting"/>. Rather than
         opening a port, you also have the option of adding MySQL as a
         program that bypasses the Windows Firewall. One or the other
-        option is sufficient &mdash; you need not do both. Additionally,
+        option is sufficient&mdash;you need not do both. Additionally,
         when running the MySQL Server Config Wizard on Windows Vista
         ensure that you are logged in as a user with administrative
         rights.


Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 13, Lines Deleted: 14; 3382 bytes

@@ -3895,10 +3895,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata. This is also
         true of the contents of tables in
         <literal>INFORMATION_SCHEMA</literal>, because those tables by

@@ -5760,7 +5760,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -5831,8 +5831,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -5872,8 +5872,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -5916,7 +5916,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -7792,10 +7792,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-5.1/mysql-cluster-configuration-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-configuration-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 23, Lines Added: 61, Lines Deleted: 60; 15627 bytes

@@ -484,7 +484,7 @@
 
     <section id="mysql-cluster-config-example">
 
-      <title>MySQL Cluster Configuration &mdash; Basic Example</title>
+      <title>MySQL Cluster Configuration: Basic Example</title>
 
       <indexterm>
         <primary>MySQL Cluster</primary>

@@ -1625,9 +1625,10 @@
 
           <para>
             This parameter specifies where to send cluster logging
-            information. There are three options in this regard &mdash;
-            <literal>CONSOLE</literal>, <literal>SYSLOG</literal>, and
-            <literal>FILE</literal> &mdash; with <literal>FILE</literal>
+            information. There are three options in this
+            regard&mdash;<literal>CONSOLE</literal>,
+            <literal>SYSLOG</literal>, and
+            <literal>FILE</literal>&mdash;with <literal>FILE</literal>
             being the default:
           </para>
 

@@ -2640,8 +2641,8 @@
 
           <para>
             Beginning with MySQL Cluster NDB 6.2.18, MySQL Cluster NDB
-            6.3.24, and MySQL Cluster NDB 7.0.5, the default value is 25
-            &mdash; that is, 25 percent of the default maximum, or
+            6.3.24, and MySQL Cluster NDB 7.0.5, the default value is
+            25&mdash;that is, 25 percent of the default maximum, or
             approximately 25 KB. (Previously, the default value was 5
             beginning with MySQL 5.1.6; prior to MySQL 5.1.6, the
             default was 0.)

@@ -3378,7 +3379,7 @@
 
           <para>
             By default, fragment log files are created sparsely when
-            performing an initial start of a data node &mdash; that is,
+            performing an initial start of a data node&mdash;that is,
             depending on the operating system and file system in use,
             not all bytes are necessarily written to disk. Beginning
             with MySQL Cluster NDB 6.3.19, it is possible to override

@@ -4514,8 +4515,8 @@
           </para>
 
           <para>
-            It is also important to ensure that even the worst of cases
-            &mdash; a complete crash of the cluster &mdash; is handled
+            It is also important to ensure that even the worst of
+            cases&mdash;a complete crash of the cluster&mdash;is handled
             properly. To guarantee that this happens, all transactions
             taking place within a given interval are put into a global
             checkpoint, which can be thought of as a set of committed

@@ -5571,8 +5572,8 @@
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration
-            file. The minimum value &mdash; which is also the default
-            value &mdash; is 0, in which case memory reports are logged
+            file. The minimum value&mdash;which is also the default
+            value&mdash;is 0, in which case memory reports are logged
             only when memory usage reaches certain percentages (80%,
             90%, and 100%), as mentioned in the discussion of statistics
             events in <xref linkend="mysql-cluster-log-events"/>.

@@ -5777,8 +5778,8 @@
             This parameter controls how often backup status reports are
             issued in the management client during a backup, as well as
             how often such reports are written to the cluster log
-            (provided cluster event logging is configured to allow it
-            &mdash; see
+            (provided cluster event logging is configured to allow
+            it&mdash;see
             <xref linkend="mysql-cluster-logging-and-checkpointing"/>).
             <literal>BackupReportFrequency</literal> represents the time
             in seconds between backup status reports.

@@ -6131,8 +6132,8 @@
                 exactly one thread was spawned for each Disk Data file,
                 which could lead to performance issues, particularly
                 when using very large data files. With
-                <literal>DiskIOThreadPool</literal>, you can &mdash; for
-                example &mdash; access a single large data file using
+                <literal>DiskIOThreadPool</literal>, you can&mdash;for
+                example&mdash;access a single large data file using
                 several threads working in parallel.
               </para>
 

@@ -6352,10 +6353,10 @@
                 <title>Disk Data object creation parameters</title>
 
                 <para>
-                  The next two parameters enable you &mdash; when
-                  starting the cluster for the first time &mdash; to
-                  cause a Disk Data log file group, tablespace, or both,
-                  to be created without the use of SQL statements.
+                  The next two parameters enable you&mdash;when starting
+                  the cluster for the first time&mdash;to cause a Disk
+                  Data log file group, tablespace, or both, to be
+                  created without the use of SQL statements.
                 </para>
 
               </formalpara>

@@ -7318,7 +7319,7 @@
             6.4.0, if this parameter is set explicitly, then the memory
             is not dedicated to each transporter; instead, the value
             used denotes the hard limit for how much memory (out of the
-            total available memory &mdash; that is,
+            total available memory&mdash;that is,
             <literal>TotalSendBufferMemory</literal>) that may be used
             by a single transporter. For more information about
             configuring dynamic transporter send buffer memory

@@ -7982,12 +7983,12 @@
         Memory, Index Memory, and String Memory</link> that are used to
         configure local checkpoints for a MySQL Cluster do not exist in
         isolation, but rather are very much interdepedent on each other.
-        In this section, we illustrate how these parameters &mdash;
-        including <literal>DataMemory</literal>,
+        In this section, we illustrate how these
+        parameters&mdash;including <literal>DataMemory</literal>,
         <literal>IndexMemory</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal>,
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal>, and
-        <literal>NoOfFragmentLogFiles</literal> &mdash; relate to one
+        <literal>NoOfFragmentLogFiles</literal>&mdash;relate to one
         another in a working Cluster.
       </para>
 

@@ -8079,7 +8080,7 @@
         A good starting point is to determine the amount of time that
         should elapse between local checkpoints (LCPs). It is worth
         noting that, in the event of a system restart, it takes 40-60
-        percent of this interval to execute the REDO log &mdash; for
+        percent of this interval to execute the REDO log&mdash;for
         example, if the time between LCPs is 5 minutes (300 seconds),
         then it should take 2 to 3 minutes (120 to 180 seconds) for the
         REDO log to be read.

@@ -8090,8 +8091,8 @@
         size of the <literal>DataMemory</literal> parameter. In this
         example, we assume that this is 2 GB. The
         <literal>NoOfDiskPagesToDiskAfterRestartTUP</literal> parameter
-        represents the amount of data to be checkpointed per unit time
-        &mdash; however, this parameter is actually expressed as the
+        represents the amount of data to be checkpointed per unit
+        time&mdash;however, this parameter is actually expressed as the
         number of 8K memory pages to be checkpointed per 100
         milliseconds. 2 GB per 300 seconds is approximately 6.8 MB per
         second, or 700 KB per 100 milliseconds, which works out to

@@ -8102,28 +8103,28 @@
         Similarly, we can calculate
         <literal>NoOfDiskPagesToDiskAfterRestartACC</literal> in terms
         of the time for local checkpoints and the amount of memory
-        required for indexes &mdash; that is, the
+        required for indexes&mdash;that is, the
         <literal>IndexMemory</literal>. Assuming that we allow 512 MB
         for indexes, this works out to approximately 20 8-KB pages per
         100 milliseconds for this parameter.
       </para>
 
       <para>
-        Next, we need to determine the number of REDO log files required
-        &mdash; that is, fragment log files &mdash; the corresponding
-        parameter being <literal>NoOfFragmentLogFiles</literal>. We need
-        to make sure that there are sufficient REDO log files for
-        keeping records for at least 3 local checkpoints (in MySQL
-        Cluster NDB 6.3.8 and later, we need only allow for 2 local
-        checkpoints). In a production setting, there are always
-        uncertainties &mdash; for instance, we cannot be sure that disks
-        always operate at top speed or with maximum throughput. For this
-        reason, it is best to err on the side of caution, so we double
-        our requirement and calculate a number of fragment log files
-        which should be enough to keep records covering 6 local
-        checkpoints (in MySQL Cluster NDB 6.3.8 and later, a number of
-        fragment log files accommodating 4 local checkpoints should be
-        sufficient).
+        Next, we need to determine the number of REDO log files
+        required&mdash;that is, fragment log files&mdash;the
+        corresponding parameter being
+        <literal>NoOfFragmentLogFiles</literal>. We need to make sure
+        that there are sufficient REDO log files for keeping records for
+        at least 3 local checkpoints (in MySQL Cluster NDB 6.3.8 and
+        later, we need only allow for 2 local checkpoints). In a
+        production setting, there are always uncertainties&mdash;for
+        instance, we cannot be sure that disks always operate at top
+        speed or with maximum throughput. For this reason, it is best to
+        err on the side of caution, so we double our requirement and
+        calculate a number of fragment log files which should be enough
+        to keep records covering 6 local checkpoints (in MySQL Cluster
+        NDB 6.3.8 and later, a number of fragment log files
+        accommodating 4 local checkpoints should be sufficient).
       </para>
 
       <para>

@@ -8175,7 +8176,7 @@
             15000 <literal role="stmt">UPDATE</literal> statements per
             hour is roughly the same as 5 updates per second. Each
             update uses 72 bytes, plus 4 bytes per column * 5 columns
-            updated, plus 32 bytes per column * 5 columns &mdash; this
+            updated, plus 32 bytes per column * 5 columns&mdash;this
             works out to 72 + 20 + 160 = 252 bytes per operation, and
             multiplying this by 5 operation per second yields 1260 bytes
             per second.

@@ -8201,7 +8202,7 @@
         by 1800 seconds, this yields 16524000 bytes required for REDO
         logging, or approximately 15.75 MB. The unit used for
         <literal>NoOfFragmentLogFiles</literal> represents a set of 4
-        16-MB log files &mdash; that is, 64 MB. Thus, the minimum value
+        16-MB log files&mdash;that is, 64 MB. Thus, the minimum value
         (3) for this parameter is sufficient for the scenario envisioned
         in this example, since 3 times 64 = 192 MB, or about 12 times
         what is required; the default value of 8 (or 512 MB) is more

@@ -8244,7 +8245,7 @@
 
             <para>
               This parameter can be set for all types of MySQL Cluster
-              nodes &mdash; that is, it can be set in the
+              nodes&mdash;that is, it can be set in the
               <literal>[ndbd]</literal>, <literal>[mgm]</literal>, and
               <literal>[api]</literal> (or <literal>[mysql]</literal>)
               sections of the <filename>config.ini</filename> file. It

@@ -8415,9 +8416,9 @@
 
     <para>
       It is also stated what type of restart is required (node restart
-      or system restart) &mdash; and whether the restart must be done
-      with <option>--initial</option> &mdash; to change the value of a
-      given configuration parameter.
+      or system restart)&mdash;and whether the restart must be done with
+      <option>--initial</option>&mdash;to change the value of a given
+      configuration parameter.
     </para>
 
     <para>

@@ -8425,8 +8426,8 @@
       the cluster's data nodes must be restarted in turn (also referred
       to as a <firstterm>rolling restart</firstterm>). It is possible to
       update cluster configuration parameters marked as
-      <literal>node</literal> online &mdash; that is, without shutting
-      down the cluster &mdash; in this fashion. An initial node restart
+      <literal>node</literal> online&mdash;that is, without shutting
+      down the cluster&mdash;in this fashion. An initial node restart
       requires restarting each <command>ndbd</command> process with the
       <option>--initial</option> option.
     </para>

@@ -8454,11 +8455,11 @@
       </para>
 
       <para>
-        However, decreasing the values of such parameters &mdash;
-        whether this is done via a node restart, node initial restart,
-        or even a complete system restart of the cluster &mdash; is not
-        to be undertaken lightly; it is recommended that you do so only
-        after careful planning and testing. This is especially true with
+        However, decreasing the values of such parameters&mdash;whether
+        this is done via a node restart, node initial restart, or even a
+        complete system restart of the cluster&mdash;is not to be
+        undertaken lightly; it is recommended that you do so only after
+        careful planning and testing. This is especially true with
         regard to those parameters that relate to memory usage and disk
         space, such as <literal>MaxNoOfTables</literal>,
         <literal>MaxNoOfOrderedIndexes</literal>, and

@@ -8477,8 +8478,8 @@
 
     <note>
       <para>
-        <literal>4294967039</literal> &mdash; which often appears as a
-        maximum value in these tables &mdash; is defined in the
+        <literal>4294967039</literal>&mdash;which often appears as a
+        maximum value in these tables&mdash;is defined in the
         <literal role="se">NDBCLUSTER</literal> sources as
         <literal>MAX_INT_RNIL</literal> and is equal to
         <literal>0xFFFFFEFF</literal>, or

@@ -8880,8 +8881,8 @@
           <important>
             <para>
               Because each SQL node using connection pooling occupies
-              multiple API node slots &mdash; each slot having its own
-              node ID in the cluster &mdash; you must
+              multiple API node slots&mdash;each slot having its own
+              node ID in the cluster&mdash;you must
               <emphasis>not</emphasis> use a node ID as part of the
               cluster connect string when starting any
               <command>mysqld</command> process that employs connection

@@ -9132,7 +9133,7 @@
           <para>
             Determines the probability of gaps in an autoincremented
             column. Set it to <literal>1</literal> to minimize this.
-            Setting it to a high value for optimization &mdash; makes
+            Setting it to a high value for optimization&mdash;makes
             inserts faster, but decreases the likelihood that
             consecutive autoincrement numbers will be used in a batch of
             inserts. Default value: <literal>32</literal>. Minimum


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 24, Lines Added: 62, Lines Deleted: 64; 16071 bytes

@@ -44,8 +44,8 @@
     <filename>ndb_<replaceable>node_id</replaceable>_cluster.log</filename>;
     this is usually found in the management server's
     <literal>DataDir</literal> directory, but this location can be
-    overridden using the <literal>LogDestination</literal> option
-    &mdash; see <xref linkend="mysql-cluster-mgm-definition"/>, for
+    overridden using the <literal>LogDestination</literal>
+    option&mdash;see <xref linkend="mysql-cluster-mgm-definition"/>, for
     details. (Recall that <replaceable>node_id</replaceable> represents
     the unique identifier of the node whose activity is being logged.)
     The cluster log contains event reports generated by

@@ -234,9 +234,9 @@
       Normally, in the event of a problem with the node, the node
       disconnects from the management server, the socket used for the
       connection is closed, and the reserved node ID is freed. However,
-      if a node is disconnected abruptly &mdash; for example, due to a
+      if a node is disconnected abruptly&mdash;for example, due to a
       hardware failure in one of the cluster hosts, or because of
-      network issues &mdash; the normal closing of the socket by the
+      network issues&mdash;the normal closing of the socket by the
       operating system may not take place. In this case, the node ID
       continues to be reserved and not released until a TCP timeout
       occurs 10 or so minutes later.

@@ -964,14 +964,14 @@
           This command is used after adding new data nodes online to a
           MySQL Cluster, and causes them to join a new node group and
           thus to begin participating fully in the cluster. The command
-          takes as its sole parameter a comma-separated list of node IDs
-          &mdash; these are the IDs of the nodes just added and started
-          that are to join the new node group. The number of nodes must
-          be the same as the number of nodes in each node group that is
-          already part of the cluster (each MySQL Cluster node group
-          must have the same number of nodes). In other words, if the
-          MySQL Cluster has 2 node groups of 2 data nodes each, then the
-          new node group must also have 2 data nodes.
+          takes as its sole parameter a comma-separated list of node
+          IDs&mdash;these are the IDs of the nodes just added and
+          started that are to join the new node group. The number of
+          nodes must be the same as the number of nodes in each node
+          group that is already part of the cluster (each MySQL Cluster
+          node group must have the same number of nodes). In other
+          words, if the MySQL Cluster has 2 node groups of 2 data nodes
+          each, then the new node group must also have 2 data nodes.
         </para>
 
         <para>

@@ -1423,7 +1423,7 @@
           If you use the <literal>SNAPSHOTSTART</literal> option with
           <literal>START BACKUP</literal>, and the
           <literal>CompressedBackup</literal> parameter is enabled, only
-          the data and control files are compressed &mdash; the log file
+          the data and control files are compressed&mdash;the log file
           is not compressed.
         </para>
       </note>

@@ -2348,7 +2348,7 @@
 
       <para>
         Event severity levels can be turned on or off (using
-        <literal>CLUSTERLOG FILTER</literal> &mdash; see above). If a
+        <literal>CLUSTERLOG FILTER</literal>&mdash;see above). If a
         severity level is turned on, then all events with a priority
         less than or equal to the category thresholds are logged. If the
         severity level is turned off then no events belonging to that

@@ -2739,34 +2739,33 @@
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; less than 1/2
-                      nodes left
+                      Arbitration check failed&mdash;less than 1/2 nodes
+                      left
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check succeeded &mdash; node group
+                      Arbitration check succeeded&mdash;node group
                       majority
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration check failed &mdash; missing node
-                      group
+                      Arbitration check failed&mdash;missing node group
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Network partitioning &mdash; arbitration required
+                      Network partitioning&mdash;arbitration required
                     </para>
                   </listitem>
 
                   <listitem>
                     <para>
-                      Arbitration succeeded &mdash; affirmative response
+                      Arbitration succeeded&mdash;affirmative response
                       from node <replaceable>X</replaceable>
                     </para>
                   </listitem>

@@ -3272,9 +3271,9 @@
                   started in the last reporting interval, including
                   simple reads. This count also includes reads performed
                   as part of unique index operations. A unique index
-                  read operation generates 2 primary key read operations
-                  &mdash; 1 for the hidden unique index table, and 1 for
-                  the table on which the read takes place.
+                  read operation generates 2 primary key read
+                  operations&mdash;1 for the hidden unique index table,
+                  and 1 for the table on which the read takes place.
                 </para>
 
               </formalpara>

@@ -3365,8 +3364,8 @@
                   were not completed. Operations increment this counter
                   when they are started and decrement it when they are
                   completed; this occurs after the transaction commits.
-                  Dirty reads and writes &mdash; as well as failed
-                  operations &mdash; decrement this counter. The maximum
+                  Dirty reads and writes&mdash;as well as failed
+                  operations&mdash;decrement this counter. The maximum
                   value that <literal>Concurrent Operations</literal>
                   can have is the maximum number of operations that a TC
                   block can support; currently, this is <literal>(2 *

@@ -3464,8 +3463,8 @@
           last reporting interval, and includes all types of read and
           write operations (insert, update, write, and delete
           operations). This also includes operations used to replicate
-          writes &mdash; for example, in a 2-replica cluster, the write
-          to the primary replica is recorded in the primary LQH, and the
+          writes&mdash;for example, in a 2-replica cluster, the write to
+          the primary replica is recorded in the primary LQH, and the
           write to the backup will be recorded in the backup LQH. Unique
           key operations may result in multiple local operations;
           however, this does <emphasis>not</emphasis> include local

@@ -3612,7 +3611,7 @@
 
     <section id="mysql-cluster-logs-cluster-log">
 
-      <title>MySQL Cluster &mdash; Messages in the Cluster Log</title>
+      <title>MySQL Cluster: Messages in the Cluster Log</title>
 
       <para>
         The following table lists the most common

@@ -7584,8 +7583,7 @@
 
     <section id="mysql-cluster-ndb-transporter-errors">
 
-      <title>MySQL Cluster &mdash; <literal role="se">NDB</literal> Transporter
-        Errors</title>
+      <title>MySQL Cluster: <literal role="se">NDB</literal> Transporter Errors</title>
 
       <para>
         This section lists error codes, names, and messages that are

@@ -7855,8 +7853,8 @@
     <para>
       The command <command>EXIT SINGLE USER MODE</command> changes the
       state of the cluster's data nodes from single user mode to normal
-      mode. API nodes &mdash; such as MySQL Servers &mdash; waiting for
-      a connection (that is, waiting for the cluster to become ready and
+      mode. API nodes&mdash;such as MySQL Servers&mdash;waiting for a
+      connection (that is, waiting for the cluster to become ready and
       available), are again permitted to connect. The API node denoted
       as the single-user node continues to run (if still connected)
       during and after the state change.

@@ -9502,7 +9500,7 @@
         <literal>node_id</literal> is that of a data nodes which is not
         currently connected are not shown in this table. (This is
         similar omission of disconnected nodes in the
-        <literal>ndbinfo.nodes</literal> table &mdash; see
+        <literal>ndbinfo.nodes</literal> table&mdash;see
         <xref linkend="mysql-cluster-ndbinfo-nodes"/>, for more
         information).
       </para>

@@ -9532,9 +9530,10 @@
 </programlisting>
 
       <para>
-        There are 10 rows in the <literal>transporters</literal> table
-        &mdash; 5 for the first data node, and 5 for the second &mdash;
-        assuming that all data nodes are running, as shown here:
+        There are 10 rows in the <literal>transporters</literal>
+        table&mdash;5 for the first data node, and 5 for the
+        second&mdash;assuming that all data nodes are running, as shown
+        here:
       </para>
 
 <programlisting>

@@ -9559,10 +9558,10 @@
       <para>
         If you shut down one of the data nodes in this cluster using the
         <command>ndb_mgm</command> client <literal>STOP</literal>
-        command, then repeat the query, this table now shows only 5 rows
-        &mdash; 1 row for each connection from the remaining data node
-        to another node, including both itself and the data node that is
-        currently offline, as shown here:
+        command, then repeat the query, this table now shows only 5
+        rows&mdash;1 row for each connection from the remaining data
+        node to another node, including both itself and the data node
+        that is currently offline, as shown here:
       </para>
 
 <programlisting>

@@ -9815,8 +9814,8 @@
             <para>
               This network setup is safest because no packets can reach
               the cluster's management or data nodes from outside the
-              network &mdash; and none of the cluster's internal
-              communications can reach the outside &mdash; without going
+              network&mdash;and none of the cluster's internal
+              communications can reach the outside&mdash;without going
               through the SQL nodes, as long as the SQL nodes do not
               allow any packets to be forwarded. This means, of course,
               that all SQL nodes must be secured against hacking

@@ -9987,7 +9986,7 @@
 
               It is also possible to employ a combination of the first
               two methods, using both hardware and software to secure
-              the cluster &mdash; that is, using both network-based and
+              the cluster&mdash;that is, using both network-based and
               host-based firewalls. This is between the first two
               schemes in terms of both security level and cost. This
               type of network setup keeps the cluster behind the

@@ -10023,7 +10022,7 @@
 
         Whatever network configuration you use, remember that your
         objective from the viewpoint of keeping the cluster secure
-        remains the same &mdash; to prevent any unessential traffic from
+        remains the same&mdash;to prevent any unessential traffic from
         reaching the cluster while ensuring the most efficient
         communication between the nodes in the cluster.
       </para>

@@ -10507,8 +10506,8 @@
         <para>
           Never run <command>mysqld</command> as the system root user.
           Doing so means that potentially any file on the system can be
-          read by MySQL, and thus &mdash; should MySQL be compromised
-          &mdash; by an attacker.
+          read by MySQL, and thus&mdash;should MySQL be
+          compromised&mdash;by an attacker.
         </para>
       </important>
 

@@ -11491,11 +11490,10 @@
 
     <para>
       This section describes how to add MySQL Cluster data nodes
-      <quote>online</quote> &mdash; that is, without needing to shut
-      down the cluster completely and restart it as part of the process.
-      This capability is available in MySQL Cluster NDB 7.0 (beginning
-      with MySQL Cluster NDB 6.4.0) and later MySQL Cluster release
-      series.
+      <quote>online</quote>&mdash;that is, without needing to shut down
+      the cluster completely and restart it as part of the process. This
+      capability is available in MySQL Cluster NDB 7.0 (beginning with
+      MySQL Cluster NDB 6.4.0) and later MySQL Cluster release series.
     </para>
 
     <important>

@@ -11549,11 +11547,11 @@
         <para>
           It is possible to add a new node group without all of the new
           data nodes being started. It is also possible to add a new
-          node group to a degraded cluster &mdash; that is, a cluster
-          that is only partially started, or where one or more data
-          nodes are not running. In the latter case, the cluster must
-          have enough nodes running to be viable before the new node
-          group can be added.
+          node group to a degraded cluster&mdash;that is, a cluster that
+          is only partially started, or where one or more data nodes are
+          not running. In the latter case, the cluster must have enough
+          nodes running to be viable before the new node group can be
+          added.
         </para>
 
       </formalpara>

@@ -11566,8 +11564,8 @@
           Normal DML operations using MySQL Cluster data are not
           prevented by the creation or addition of a new node group, or
           by table reorganization. However, it is not possible to
-          perform DDL concurrently with table reorganization &mdash;
-          that is, no other DDL statements can be issued while an
+          perform DDL concurrently with table reorganization&mdash;that
+          is, no other DDL statements can be issued while an
           <literal role="stmt" condition="alter-table">ALTER TABLE ...
           REORGANIZE PARTITION</literal> statement is executing. In
           addition, during the execution of <literal>ALTER TABLE ...

@@ -12227,8 +12225,8 @@
         <para>
           In this example, we show the single-threaded
           <command>ndbd</command> being used for the data node
-          processes. However &mdash; beginning with MySQL Cluster NDB
-          7.0.4 (Bug#43108) &mdash; you can also apply this example, if
+          processes. However&mdash;beginning with MySQL Cluster NDB
+          7.0.4 (Bug#43108)&mdash;you can also apply this example, if
           you are using the multi-threaded <command>ndbmtd</command> by
           substituting <command>ndbmtd</command> for
           <command>ndbd</command> wherever it appears in the steps that

@@ -12790,9 +12788,9 @@
           file to <literal>65536</literal> for each of the affected data
           nodes, as shown in the next example (note the section with
           bold text). We assume, as before, that you wish to start with
-          two data nodes &mdash; nodes 1 and 2 &mdash; in one node group
-          and later to expand the cluster to four data nodes, by adding
-          a second node group consisting of nodes 3 and 4:
+          two data nodes&mdash;nodes 1 and 2&mdash;in one node group and
+          later to expand the cluster to four data nodes, by adding a
+          second node group consisting of nodes 3 and 4:
         </para>
 
       </formalpara>


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 17, Lines Added: 19, Lines Deleted: 22; 5926 bytes

@@ -476,8 +476,7 @@
 
     <formalpara>
 
-      <title>Data and SQL Node Installation &mdash; <filename>.tar.gz</filename>
-        Binary</title>
+      <title>Data and SQL Node Installation: <filename>.tar.gz</filename> Binary</title>
 
       <para>
         On each of the machines designated to host data or SQL nodes,

@@ -580,7 +579,7 @@
 
             <para>
               (The startup scripts directory may vary depending on your
-              operating system and version &mdash; for example, in some
+              operating system and version&mdash;for example, in some
               Linux distributions, it is
               <filename>/etc/init.d</filename>.)
             </para>

@@ -604,7 +603,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; RPM files</title>
+      <title>SQL node installation: RPM files</title>
 
       <para>
         On each machine to be used for hosting a cluster SQL node,

@@ -648,7 +647,7 @@
 
     <formalpara>
 
-      <title>SQL node installation &mdash; building from source</title>
+      <title>SQL node installation: building from source</title>
 
       <para>
         If you compile MySQL with clustering support (for example, by

@@ -676,7 +675,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; RPM Files</title>
+      <title>Data node installation: RPM Files</title>
 
       <para>
         On a computer that is to host a cluster data node it is

@@ -699,7 +698,7 @@
 
     <formalpara>
 
-      <title>Data node installation &mdash; building from source</title>
+      <title>Data node installation: building from source</title>
 
       <para>
         The only executable required on a data node host is

@@ -728,7 +727,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; <filename>.tar.gz</filename> binary</title>
+      <title>Management node installation: <filename>.tar.gz</filename> binary</title>
 
       <para>
         Installation of the management node does not require the

@@ -794,7 +793,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; RPM file</title>
+      <title>Management node installation: RPM file</title>
 
       <para>
         To install the MySQL Cluster management server, it is necessary

@@ -855,7 +854,7 @@
 
     <formalpara>
 
-      <title>Management node installation &mdash; building from source</title>
+      <title>Management node installation: building from source</title>
 
       <para>
         When building from source and running the default <command>make

@@ -2152,7 +2151,7 @@
 
       <formalpara id="mysql-cluster-upgrade-downgrade-compatibility-7.x">
 
-        <title>Upgrade and downgrade compatibility &mdash; MySQL Cluster NDB 7.x</title>
+        <title>Upgrade and downgrade compatibility: MySQL Cluster NDB 7.x</title>
 
         <para>
           The table shown here provides information on MySQL Cluster

@@ -2176,8 +2175,7 @@
       </mediaobject>
 
       <para>
-        <emphasis role="bold">Notes &mdash; MySQL Cluster NDB
-        6.x:</emphasis>
+        <emphasis role="bold">Notes: MySQL Cluster NDB 6.x:</emphasis>
       </para>
 
       <itemizedlist>

@@ -2353,7 +2351,7 @@
 
       <formalpara id="mysql-cluster-upgrade-downgrade-compatibility-6.x">
 
-        <title>Upgrade and downgrade compatibility &mdash; MySQL Cluster NDB 6.x</title>
+        <title>Upgrade and downgrade compatibility: MySQL Cluster NDB 6.x</title>
 
         <para>
           The table shown here provides information on MySQL Cluster

@@ -2377,8 +2375,7 @@
       </mediaobject>
 
       <para>
-        <emphasis role="bold">Notes &mdash; MySQL Cluster NDB
-        6.x:</emphasis>
+        <emphasis role="bold">Notes: MySQL Cluster NDB 6.x:</emphasis>
       </para>
 
       <itemizedlist>

@@ -2561,7 +2558,7 @@
 
       <formalpara id="mysql-cluster-upgrade-downgrade-compatibility-5.1">
 
-        <title>Upgrade and downgrade compatibility &mdash; MySQL 5.1</title>
+        <title>Upgrade and downgrade compatibility: MySQL 5.1</title>
 
         <para>
           The table shown here provides information on MySQL Cluster

@@ -2584,7 +2581,7 @@
       </mediaobject>
 
       <para>
-        <emphasis role="bold">Notes &mdash; MySQL 5.1:</emphasis>
+        <emphasis role="bold">Notes: MySQL 5.1:</emphasis>
       </para>
 
       <itemizedlist>

@@ -2697,11 +2694,11 @@
                 server software, but <emphasis>there must be a time when
                 none of them is running before starting any of them
                 again using the 5.1.18 (or later)
-                <command>mysqld</command></emphasis>. Otherwise &mdash;
-                due to the fact that
+                <command>mysqld</command></emphasis>.
+                Otherwise&mdash;due to the fact that
                 <literal>mysql.ndb_apply_status</literal> uses the
                 <literal role="se">NDB</literal> storage engine and is
-                thus shared between all SQL nodes &mdash; there may be
+                thus shared between all SQL nodes&mdash;there may be
                 conflicts between the old and new versions of the table
                 on different SQL nodes.
               </para>

@@ -2739,7 +2736,7 @@
             In order to make tables created in MySQL 5.1.17 and earlier
             compatible with online adding and dropping of columns
             (available beginning with beginning with MySQL Cluster NDB
-            6.2.5 and MySQL Cluster NDB 6.3.3 &mdash; see
+            6.2.5 and MySQL Cluster NDB 6.3.3&mdash;see
             <xref linkend="alter-table"/>, for more information), it is
             necessary to force MySQL 5.1.18 and later to convert the
             tables to the new format by following this procedure:


Modified: trunk/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-news-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-news-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 934 bytes

@@ -1524,8 +1524,8 @@
       </para>
 
       <para>
-        You can obtain the GPL source code and GPL binaries for supported
-        platforms for MySQL Cluster NDB 6.3.33 from 
+        You can obtain the GPL source code and GPL binaries for
+        supported platforms for MySQL Cluster NDB 6.3.33 from
         <ulink url="&base-url-cluster-downloads;"/>.
       </para>
 

@@ -4906,7 +4906,7 @@
 
   <section id="mysql-cluster-news-series">
 
-    <title>Release Series Changelogs &mdash; MySQL Cluster NDB 6.X and 7.X</title>
+    <title>Release Series Changelogs: MySQL Cluster NDB 6.X and 7.X</title>
 
     <indexterm>
       <primary>changes</primary>


Modified: trunk/refman-5.1/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-overview.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-overview.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 15, Lines Added: 32, Lines Deleted: 31; 9231 bytes

@@ -427,11 +427,11 @@
             commands for starting and stopping nodes gracefully,
             starting and stopping message tracing (debug versions only),
             showing node versions and status, starting and stopping
-            backups, and so on. Such clients &mdash; such as the
+            backups, and so on. Such clients&mdash;such as the
             <command>ndb_mgm</command> management client supplied with
             MySQL Cluster (see
-            <xref linkend="mysql-cluster-programs-ndb-mgm"/>) &mdash;
-            are written using the MGM API, a C-language API that
+            <xref linkend="mysql-cluster-programs-ndb-mgm"/>)&mdash;are
+            written using the MGM API, a C-language API that
             communicates directly with one or more MySQL Cluster
             management servers. For more information, see
             <xref linkend="mgm-api"/>.

@@ -678,7 +678,7 @@
           cluster completely and reloading all of its data. In MySQL
           Cluster NDB 7.0 (beginning with MySQL Cluster version NDB
           6.4.0), you can add new node groups (and thus new data nodes)
-          to a running MySQL Cluster &mdash; see
+          to a running MySQL Cluster&mdash;see
           <xref linkend="mysql-cluster-online-add-node"/>, for
           information about how this can be done.
         </para>

@@ -783,8 +783,8 @@
 
     <para>
       The data stored by the cluster is divided into four partitions,
-      numbered 0, 1, 2, and 3. Each partition is stored &mdash; in
-      multiple copies &mdash; on the same node group. Partitions are
+      numbered 0, 1, 2, and 3. Each partition is stored&mdash;in
+      multiple copies&mdash;on the same node group. Partitions are
       stored on alternate node groups:
     </para>
 

@@ -879,7 +879,7 @@
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
       data storage is done in memory. (It is possible to reduce this
-      requirement using Disk Data tables &mdash; see
+      requirement using Disk Data tables&mdash;see
       <xref linkend="mysql-cluster-disk-data"/>, for more information
       about these.) Naturally, multiple and faster CPUs can enhance
       performance. Memory requirements for other Cluster processes are

@@ -1572,7 +1572,7 @@
               MySQL Cluster is now available on an experimental basis
               for Windows operating systems. Features and behavior
               comparable to those found on platforms that are already
-              supported &mdash; such as Linux and Solaris &mdash; are
+              supported&mdash;such as Linux and Solaris&mdash;are
               planned for MySQL Cluster on Windows. Currently, you must
               build from source, although we intend to start making
               Windows binaries available in the near future. To enable

@@ -1647,10 +1647,10 @@
             <title>Configuration cache</title>
 
             <para>
-              Formerly, MySQL Cluster configuration was stateless
-              &mdash; that is, configuration information was reloaded
-              from the cluster&apos;s global configuration file (usually
-              <filename>config.ini</filename>) each time
+              Formerly, MySQL Cluster configuration was
+              stateless&mdash;that is, configuration information was
+              reloaded from the cluster&apos;s global configuration file
+              (usually <filename>config.ini</filename>) each time
               <command>ndb_mgmd</command> was started. Beginning with
               MySQL Cluster NDB 6.4.0, the cluster&apos;s configuration
               is cached internally, and the global configuration file is

@@ -2548,7 +2548,7 @@
                 key. (Recall that for a partitioned table having one or
                 more unique keys, all columns of the table&apos;s
                 partitioning key must also be part of all of the unique
-                keys &mdash; for more information and examples, see
+                keys&mdash;for more information and examples, see
                 <xref linkend="partitioning-limitations-partitioning-keys-unique-keys"/>.)
                 In other words, the table schema should be equivalent to
                 the following <literal role="stmt">CREATE

@@ -3499,7 +3499,7 @@
               only the portion of the column actually taken up by the
               record is stored. This makes possible a significant
               reduction in space requirements for such columns as
-              compared to previous release series &mdash; by a factor of
+              compared to previous release series&mdash;by a factor of
               up to 5 in many cases.
             </para>
 

@@ -4073,11 +4073,12 @@
               <literal role="se">NDB</literal> tables using
               <literal>ALTER TABLE ... DROP PARTITION</literal>. The
               other partitioning extensions to
-              <literal role="stmt">ALTER TABLE</literal> &mdash;
-              <literal>ADD PARTITION</literal>, <literal>REORGANIZE
-              PARTITION</literal>, and <literal>COALESCE
-              PARTITION</literal> &mdash; are supported for Cluster
-              tables, but use copying and so are not optimised. See
+              <literal role="stmt">ALTER
+              TABLE</literal>&mdash;<literal>ADD PARTITION</literal>,
+              <literal>REORGANIZE PARTITION</literal>, and
+              <literal>COALESCE PARTITION</literal>&mdash;are supported
+              for Cluster tables, but use copying and so are not
+              optimised. See
               <xref linkend="partitioning-management-range-list"/> and
               <xref linkend="alter-table"/>.
             </para>

@@ -4440,7 +4441,7 @@
                 <literal role="type">TEXT</literal> data types and that
                 was executed within a transaction, a shared read lock
                 was held on the table for the duration of the
-                transaction &mdash; that is, until the transaction was
+                transaction&mdash;that is, until the transaction was
                 either committed or aborted.
               </para>
 

@@ -4773,8 +4774,8 @@
             <para>
               The maximum number of <emphasis>all</emphasis>
               <literal role="se">NDB</literal> database objects in a
-              single MySQL Cluster &mdash; including databases, tables,
-              and indexes &mdash; is limited to 20320.
+              single MySQL Cluster&mdash;including databases, tables,
+              and indexes&mdash;is limited to 20320.
             </para>
 
           </formalpara>

@@ -5542,8 +5543,8 @@
               6.x releases required that a given
               <command>mysqld</command> was already running and
               connected to the cluster at the time that the database was
-              created on a different <command>mysqld</command> &mdash;
-              in other words, when a <command>mysqld</command> process
+              created on a different <command>mysqld</command>&mdash;in
+              other words, when a <command>mysqld</command> process
               connected to the cluster after a database named
               <replaceable>db_name</replaceable> was created, it was
               necessary to issue a <literal>CREATE DATABASE

@@ -5578,7 +5579,7 @@
             <para>
               Beginning with MySQL 5.1.10, it is possible to perform a
               Cluster backup and restore between different
-              architectures. Previously &mdash; for example &mdash; you
+              architectures. Previously&mdash;for example&mdash;you
               could not back up a cluster running on a big-endian
               platform and then restore from that backup to a cluster
               running on a little-endian system. (Bug#19255)

@@ -5604,9 +5605,9 @@
               either the <option role="mysqld">--basedir</option> or
               <option role="mysqld">--character-sets-dir</option>
               options. (Previously, <command>ndbd</command> in MySQL 5.1
-              searched only the default path &mdash; typically
-              <filename>/usr/local/mysql/share/mysql/charsets</filename>
-              &mdash; for character sets.)
+              searched only the default path&mdash;typically
+              <filename>/usr/local/mysql/share/mysql/charsets</filename>&mdash;for
+              character sets.)
             </para>
 
           </formalpara>

@@ -5752,9 +5753,9 @@
 
             <para>
               In MySQL 5.1.10 and earlier versions, the maximum number
-              of tables having <literal>AUTO_INCREMENT</literal> columns
-              &mdash; including those belonging to hidden primary keys
-              &mdash; was 2048.
+              of tables having <literal>AUTO_INCREMENT</literal>
+              columns&mdash;including those belonging to hidden primary
+              keys&mdash;was 2048.
             </para>
 
           </formalpara>


Modified: trunk/refman-5.1/mysql-cluster-programs-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-programs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-programs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 12, Lines Added: 29, Lines Deleted: 28; 7912 bytes

@@ -502,8 +502,8 @@
         <note>
           <para>
             All of these options also apply to the multi-threaded
-            version of this program &mdash; <command>ndbmtd</command>,
-            which is available in MySQL Cluster NDB 7.0 &mdash; and you
+            version of this program&mdash;<command>ndbmtd</command>,
+            which is available in MySQL Cluster NDB 7.0&mdash;and you
             may substitute <quote><command>ndbmtd</command></quote> for
             <quote><command>ndbd</command></quote> wherever the latter
             occurs in this section.

@@ -693,8 +693,8 @@
             <para>
               Suppose that you have a 4-node cluster whose data nodes
               have the IDs 2, 3, 4, and 5, and you wish to perform a
-              partial initial start using only nodes 2, 4, and 5 &mdash;
-              that is, omitting node 3:
+              partial initial start using only nodes 2, 4, and
+              5&mdash;that is, omitting node 3:
             </para>
 
 <programlisting>

@@ -766,12 +766,13 @@
 
             <para>
               If you wanted to start up the same cluster as in the
-              previous example without one <command>ndbd</command>
-              &mdash; say, for example, that the host machine for node 3
-              has suffered a hardware failure &mdash; then start nodes
-              2, 4, and 5 with <option>--nowait-nodes=3</option>. Then
-              the cluster will start as soon as nodes 2, 4, and 5
-              connect and will not wait for node 3 to start.
+              previous example without one
+              <command>ndbd</command>&mdash;say, for example, that the
+              host machine for node 3 has suffered a hardware
+              failure&mdash;then start nodes 2, 4, and 5 with
+              <option>--nowait-nodes=3</option>. Then the cluster will
+              start as soon as nodes 2, 4, and 5 connect and will not
+              wait for node 3 to start.
             </para>
 
             <para>

@@ -1191,7 +1192,7 @@
               <literal>MaxNoOfExecutionThreads</literal> configuration
               parameter in the <filename>config.ini</filename> file. If
               you do not do so, <command>ndbmtd</command> runs in
-              single-threaded mode &mdash; that is, it behaves like
+              single-threaded mode&mdash;that is, it behaves like
               <command>ndbd</command>.
             </para>
           </listitem>

@@ -1636,7 +1637,7 @@
               in the <replaceable>directory</replaceable> indicated. By
               default, this is a directory named
               <filename>mysql-cluster</filename> in the MySQL
-              installation directory &mdash; for example, if you compile
+              installation directory&mdash;for example, if you compile
               and install MySQL Cluster on a Unix system using the
               default location, this is
               <filename>/usr/local/mysql-cluster</filename>.

@@ -2559,10 +2560,10 @@
 
             <para>
               This is a comma-delimited list of <firstterm>query
-              options</firstterm> &mdash; that is, a list of one or more
+              options</firstterm>&mdash;that is, a list of one or more
               node attributes to be returned. These include
-              <literal>id</literal> (node ID), type (node type &mdash;
-              that is, <literal>ndbd</literal>,
+              <literal>id</literal> (node ID), type (node
+              type&mdash;that is, <literal>ndbd</literal>,
               <literal>mysqld</literal>, or
               <literal>ndb_mgmd</literal>), and any configuration
               parameters whose values are to be obtained.

@@ -3729,7 +3730,7 @@
           <command>ndb_drop_index</command> drops the specified index
           from an <literal role="se">NDB</literal> table. <emphasis>It
           is recommended that you use this utility only as an example
-          for writing NDB API applications</emphasis> &mdash; see the
+          for writing NDB API applications</emphasis>&mdash;see the
           Warning later in this section for details.
         </para>
 

@@ -3853,9 +3854,9 @@
           <literal role="se">NDB</literal> table. (If you try to use
           this on a table created with a storage engine other than NDB,
           it fails with the error <errortext>723: No such table
-          exists</errortext>.) This operation is extremely fast &mdash;
-          in some cases, it can be an order of magnitude faster than
-          using <literal role="stmt">DROP TABLE</literal> on an
+          exists</errortext>.) This operation is extremely fast&mdash;in
+          some cases, it can be an order of magnitude faster than using
+          <literal role="stmt">DROP TABLE</literal> on an
           <literal role="se">NDB</literal> table from MySQL.
         </para>
 

@@ -4577,10 +4578,10 @@
         <para>
           The first time you run the <command>ndb_restore</command>
           restoration program, you also need to restore the metadata. In
-          other words, you must re-create the database tables &mdash;
-          this can be done by running it with the <option>-m</option>
-          option. Note that the cluster should have an empty database
-          when starting to restore a backup. (In other words, you should
+          other words, you must re-create the database tables&mdash;this
+          can be done by running it with the <option>-m</option> option.
+          Note that the cluster should have an empty database when
+          starting to restore a backup. (In other words, you should
           start <command>ndbd</command> with <option>--initial</option>
           prior to performing the restore. You should also remove
           manually any Disk Data files present in the data node's

@@ -4801,7 +4802,7 @@
           created in a cluster with two database nodes having the node
           IDs <literal>2</literal> and <literal>3</literal>, is to be
           restored to a cluster with four nodes. Then
-          <command>ndb_restore</command> must be run twice &mdash; once
+          <command>ndb_restore</command> must be run twice&mdash;once
           for each database node in the cluster where the backup was
           taken. However, <command>ndb_restore</command> cannot always
           restore backups made from a cluster running one version of

@@ -6390,9 +6391,9 @@
               A MySQL user account having the necessary privileges. If
               you do not wish to use an existing account, then creating
               one using <literal>GRANT USAGE ON
-              <replaceable>db_name</replaceable>.*</literal> &mdash;
-              where <replaceable>db_name</replaceable> is the name of
-              the database to be examined &mdash; is sufficient for this
+              <replaceable>db_name</replaceable>.*</literal>&mdash;where
+              <replaceable>db_name</replaceable> is the name of the
+              database to be examined&mdash;is sufficient for this
               purpose.
             </para>
           </listitem>

@@ -7185,7 +7186,7 @@
           Write a core file if the program dies. The name and location
           of the core file are system-dependent. (For MySQL Cluster
           programs nodes running on Linux, the default location is the
-          program&apos;s working directory &mdash; for a data node, this
+          program&apos;s working directory&mdash;for a data node, this
           is the node&apos;s <literal>DataDir</literal>.) For some
           systems, there may be restrictions or limitations; for
           example, it might be necessary to execute <command>ulimit -c


Modified: trunk/refman-5.1/mysql-cluster-replication-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster-replication-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 18, Lines Added: 49, Lines Deleted: 49; 10607 bytes

@@ -81,12 +81,12 @@
     This process is accomplished by a special thread known as the NDB
     binlog injector thread, which runs on each MySQL server and produces
     a binary log (<literal>binlog</literal>). This thread ensures that
-    all changes in the cluster producing the binary log &mdash; and not
-    just those changes that are effected via the MySQL Server &mdash;
-    are inserted into the binary log with the correct serialization
-    order. We refer to the MySQL replication master and replication
-    slave servers as replication servers or replication nodes, and the
-    data flow or line of communication between them as a
+    all changes in the cluster producing the binary log&mdash;and not
+    just those changes that are effected via the MySQL Server&mdash;are
+    inserted into the binary log with the correct serialization order.
+    We refer to the MySQL replication master and replication slave
+    servers as replication servers or replication nodes, and the data
+    flow or line of communication between them as a
     <firstterm>replication channel</firstterm>.
   </para>
 

@@ -98,7 +98,7 @@
 
   <section id="mysql-cluster-replication-abbreviations">
 
-    <title>MySQL Cluster Replication &mdash; Abbreviations and Symbols</title>
+    <title>MySQL Cluster Replication: Abbreviations and Symbols</title>
 
     <indexterm>
       <primary>MySQL Cluster replication</primary>

@@ -180,7 +180,7 @@
 
   <section id="mysql-cluster-replication-general">
 
-    <title>MySQL Cluster Replication &mdash; Assumptions and General Requirements</title>
+    <title>MySQL Cluster Replication: Assumptions and General Requirements</title>
 
     <indexterm>
       <primary>MySQL Cluster replication</primary>

@@ -255,7 +255,7 @@
       case is to use the same MySQL version for all servers involved.
       Note that in many cases it is not possible to replicate to a slave
       running a version of MySQL with a lower version number than that
-      of the master &mdash; see
+      of the master&mdash;see
       <xref linkend="replication-compatibility"/>, for details.
     </para>
 

@@ -967,11 +967,11 @@
           <para>
             Currently, the NDB API and MGM API do not support IPv6.
             However, beginning with MySQL Cluster NDB 6.4.1, MySQL
-            Servers &mdash; including those acting as SQL nodes in a
-            MySQL Cluster &mdash; can use IPv6 to contact other MySQL
-            Servers. This means that you can replicate between MySQL
-            Clusters using IPv6 to connect the master and slave SQL
-            nodes as shown by the dotted arrow in the following diagram:
+            Servers&mdash;including those acting as SQL nodes in a MySQL
+            Cluster&mdash;can use IPv6 to contact other MySQL Servers.
+            This means that you can replicate between MySQL Clusters
+            using IPv6 to connect the master and slave SQL nodes as
+            shown by the dotted arrow in the following diagram:
 
             <mediaobject>
               <imageobject>

@@ -984,8 +984,8 @@
             </mediaobject>
 
             However, all connections originating
-            <emphasis>within</emphasis> the MySQL Cluster &mdash; shown
-            in the diagram by solid arrows &mdash; must use IPv4.
+            <emphasis>within</emphasis> the MySQL Cluster&mdash;shown in
+            the diagram by solid arrows&mdash;must use IPv4.
           </para>
 
         </formalpara>

@@ -1436,8 +1436,8 @@
 
         <para>
           For security reasons, it is preferable to use a unique user
-          account &mdash; not employed for any other purpose &mdash; for
-          the replication slave account.
+          account&mdash;not employed for any other purpose&mdash;for the
+          replication slave account.
         </para>
       </listitem>
 

@@ -1699,9 +1699,9 @@
 
         <para>
           This instructs the slave to begin reading the master's binary
-          log from the log's starting point. Otherwise &mdash; that is,
-          if you are loading data from the master using a backup &mdash;
-          see <xref linkend="mysql-cluster-replication-failover"/>, for
+          log from the log's starting point. Otherwise&mdash;that is, if
+          you are loading data from the master using a backup&mdash;see
+          <xref linkend="mysql-cluster-replication-failover"/>, for
           information on how to obtain the correct values to use for
           <literal>MASTER_LOG_FILE</literal> and
           <literal>MASTER_LOG_POS</literal> in such cases.

@@ -2441,8 +2441,8 @@
 
     <section id="mysql-cluster-replication-auto-sync">
 
-      <title>MySQL Cluster Replication &mdash; Automating Synchronization of the
-        Replication Slave to the Master Binary Log</title>
+      <title>MySQL Cluster Replication: Automating Synchronization of the Replication
+        Slave to the Master Binary Log</title>
 
       <indexterm>
         <primary>MySQL Cluster replication</primary>

@@ -2676,14 +2676,14 @@
       </indexterm>
 
       <para>
-        <firstterm>Point-in-time</firstterm> recovery &mdash; that is,
-        recovery of data changes made since a given point in time
-        &mdash; is performed after restoring a full backup that returns
-        the server to its state when the backup was made. Performing
-        point-in-time recovery of MySQL Cluster tables with MySQL
-        Cluster and MySQL Cluster Replication can be accomplished using
-        a native <literal role="se">NDB</literal> data backup (taken by
-        issuing <literal>CREATE BACKUP</literal> in the
+        <firstterm>Point-in-time</firstterm> recovery&mdash;that is,
+        recovery of data changes made since a given point in
+        time&mdash;is performed after restoring a full backup that
+        returns the server to its state when the backup was made.
+        Performing point-in-time recovery of MySQL Cluster tables with
+        MySQL Cluster and MySQL Cluster Replication can be accomplished
+        using a native <literal role="se">NDB</literal> data backup
+        (taken by issuing <literal>CREATE BACKUP</literal> in the
         <command>ndb_mgm</command> client) and restoring the
         <literal>ndb_binlog_index</literal> table (from a dump made
         using <command>mysqldump</command>).

@@ -2715,8 +2715,8 @@
           </para>
 
           <para>
-            This backup should be updated regularly &mdash; perhaps even
-            hourly &mdash; depending on your needs.
+            This backup should be updated regularly&mdash;perhaps even
+            hourly&mdash;depending on your needs.
           </para>
         </listitem>
 

@@ -2781,10 +2781,10 @@
 
         <listitem>
           <para>
-            Find the epoch applied most recently &mdash; that is, the
+            Find the epoch applied most recently&mdash;that is, the
             maximum <literal>epoch</literal> column value in the
-            <literal>ndb_apply_status</literal> table &mdash; as the
-            user variable <literal>@LATEST_EPOCH</literal> (emphasized):
+            <literal>ndb_apply_status</literal> table&mdash;as the user
+            variable <literal>@LATEST_EPOCH</literal> (emphasized):
           </para>
 
 <programlisting>

@@ -2831,7 +2831,7 @@
 
   <section id="mysql-cluster-replication-multi-master">
 
-    <title>MySQL Cluster Replication &mdash; Multi-Master and Circular Replication</title>
+    <title>MySQL Cluster Replication: Multi-Master and Circular Replication</title>
 
     <indexterm>
       <primary>MySQL Cluster replication</primary>

@@ -3252,8 +3252,8 @@
 
       <para>
         We can see update operations in terms of <quote>before</quote>
-        and <quote>after</quote> images &mdash; that is, the states of
-        the table before and after the update is applied. Normally, when
+        and <quote>after</quote> images&mdash;that is, the states of the
+        table before and after the update is applied. Normally, when
         updating a table with a primary key, the <quote>before</quote>
         image is not of great interest; however, when we need to
         determine on a per-update basis whether or not to use the

@@ -3307,7 +3307,7 @@
 
       <listitem>
         <para>
-          Log only column data that has been updated &mdash; that is,
+          Log only column data that has been updated&mdash;that is,
           column data whose value has been set, regardless of whether or
           not this value was actually changed. This is the default
           behavior.

@@ -3498,7 +3498,7 @@
                         <entry><literal>NBT_USE_UPDATE</literal></entry>
                         <entry>(For generating <literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> and
                           <literal>NBT_FULL_USE_UPDATE</literal> values
-                          only &mdash; not intended for separate use)</entry>
+                          only&mdash;not intended for separate use)</entry>
                       </row>
                       <row>
                         <entry>5</entry>

@@ -3942,11 +3942,11 @@
 
             <note>
               <para>
-                Other <literal>binlog_type</literal> options &mdash;
-                such as <literal>NBT_UPDATED_ONLY_USE_UPDATE</literal>
-                should be used in order to control logging on the master
-                via the <literal>ndb_replication</literal> table rather
-                than by using command-line options.
+                Other <literal>binlog_type</literal> options&mdash;such
+                as <literal>NBT_UPDATED_ONLY_USE_UPDATE</literal> should
+                be used in order to control logging on the master via
+                the <literal>ndb_replication</literal> table rather than
+                by using command-line options.
               </para>
             </note>
           </listitem>

@@ -3979,9 +3979,9 @@
 
                   <listitem>
                     <para>
-                      First &mdash; and <emphasis>prior</emphasis> to
-                      creating <literal>test.t2</literal> &mdash; you
-                      must insert a row into the
+                      First&mdash;and <emphasis>prior</emphasis> to
+                      creating <literal>test.t2</literal>&mdash;you must
+                      insert a row into the
                       <literal>mysql.ndb_replication</literal> table, as
                       shown here:
 


Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/mysql-cluster.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 10, Lines Deleted: 10; 3034 bytes

@@ -53,7 +53,7 @@
     from the standard MySQL server binaries built by MySQL. Instead,
     users of MySQL Cluster binaries built by MySQL should upgrade to the
     most recent binary release of MySQL Cluster NDB 7.0 or MySQL Cluster
-    7.1 for supported platforms &mdash; these include RPMs that should
+    7.1 for supported platforms&mdash;these include RPMs that should
     work with most Linux distributions. MySQL Cluster users who build
     from source should be aware that, also beginning with MySQL 5.1.24,
     <literal role="se">NDBCLUSTER</literal> sources in the standard

@@ -67,11 +67,11 @@
       MySQL Cluster NDB 6.1, 6.2, and 6.3 were formerly known as
       <quote>MySQL Cluster Carrier Grade Edition</quote>. Beginning with
       MySQL Cluster NDB 6.2.15 and MySQL Cluster NDB 6.3.14, this term
-      is no longer applied to the MySQL Cluster software &mdash; which
-      is now known simply as <quote>MySQL Cluster</quote> &mdash; but
-      rather to a commercial licensing and support package. You can
-      learn more about available options for commercial licensing of
-      MySQL Cluster from
+      is no longer applied to the MySQL Cluster software&mdash;which is
+      now known simply as <quote>MySQL Cluster</quote>&mdash;but rather
+      to a commercial licensing and support package. You can learn more
+      about available options for commercial licensing of MySQL Cluster
+      from
       <citetitle><ulink url="http://mysql.com/products/database/cluster/features.html">MySQL
       Cluster Features</ulink></citetitle>, on the MySQL web site.
     </para>

@@ -295,9 +295,9 @@
       performance when run using MySQL Cluster (see
       <xref linkend="mysql-cluster-limitations"/>). Most of these issues
       can be overcome, but this also means that you are very unlikely to
-      be able to switch an existing application datastore &mdash; that
+      be able to switch an existing application datastore&mdash;that
       currently uses, for example, <literal role="se">MyISAM</literal>
-      or <literal role="se">InnoDB</literal> &mdash; to use the
+      or <literal role="se">InnoDB</literal>&mdash;to use the
       <literal role="se">NDB</literal> storage engine without allowing
       for the possibility of changes in schemas, queries, and
       applications. Moreover, from MySQL 5.1.24 onwards, the MySQL

@@ -324,8 +324,8 @@
         <listitem>
           <para>
             <literal><ulink url="https://code.launchpad.net/~mysql/mysql-server/mysql-5.1-telco-6.1">MySQL
-            Cluster NDB 6.1</ulink></literal> (<emphasis>OBSOLETE
-            &mdash; no longer maintained</emphasis>)
+            Cluster NDB 6.1</ulink></literal>
+            (<emphasis>OBSOLETE&mdash;no longer maintained</emphasis>)
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 13, Lines Deleted: 13; 2600 bytes

@@ -954,8 +954,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -10106,10 +10106,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -12528,11 +12528,11 @@
       </para>
 
       <para>
-        The query cache can be useful in an environment where you
-        have tables that do not change very often and for which the
-        server receives many identical queries. This is a typical
-        situation for many Web servers that generate many dynamic pages
-        based on database content.
+        The query cache can be useful in an environment where you have
+        tables that do not change very often and for which the server
+        receives many identical queries. This is a typical situation for
+        many Web servers that generate many dynamic pages based on
+        database content.
       </para>
 
       <para>

@@ -16195,8 +16195,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/partitioning.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 14, Lines Added: 46, Lines Deleted: 45; 9415 bytes

@@ -339,13 +339,14 @@
     </para>
 
     <para>
-      This is known as <firstterm>horizontal partitioning</firstterm>
-      &mdash; that is, different rows of a table may be assigned to
-      different physical partitions. MySQL &current-series; does not
-      support <firstterm>vertical partitioning</firstterm>, in which
-      different columns of a table are assigned to different physical
-      partitions. There are not at this time any plans to introduce
-      vertical partitioning into MySQL &current-series;.
+      This is known as <firstterm>horizontal
+      partitioning</firstterm>&mdash;that is, different rows of a table
+      may be assigned to different physical partitions. MySQL
+      &current-series; does not support <firstterm>vertical
+      partitioning</firstterm>, in which different columns of a table
+      are assigned to different physical partitions. There are not at
+      this time any plans to introduce vertical partitioning into MySQL
+      &current-series;.
     </para>
 
     <para>

@@ -784,8 +785,8 @@
     </para>
 
     <para>
-      It is important to remember &mdash; regardless of the type of
-      partitioning that you use &mdash; that partitions are always
+      It is important to remember&mdash;regardless of the type of
+      partitioning that you use&mdash;that partitions are always
       numbered automatically and in sequence when created, starting with
       <literal>0</literal>. When a new row is inserted into a
       partitioned table, it is these partition numbers that are used in

@@ -968,23 +969,23 @@
         bound</firstterm>). Now, any rows whose
         <literal>store_id</literal> column value is greater than or
         equal to 16 (the highest value defined) are stored in partition
-        <literal>p3</literal>. At some point in the future &mdash; when
-        the number of stores has increased to 25, 30, or more &mdash;
-        you can use an <literal role="stmt">ALTER TABLE</literal>
-        statement to add new partitions for stores 21-25, 26-30, and so
-        on (see <xref linkend="partitioning-management"/>, for details
-        of how to do this).
+        <literal>p3</literal>. At some point in the future&mdash;when
+        the number of stores has increased to 25, 30, or more&mdash;you
+        can use an <literal role="stmt">ALTER TABLE</literal> statement
+        to add new partitions for stores 21-25, 26-30, and so on (see
+        <xref linkend="partitioning-management"/>, for details of how to
+        do this).
       </para>
 
       <para>
         In much the same fashion, you could partition the table based on
-        employee job codes &mdash; that is, based on ranges of
-        <literal>job_code</literal> column values. For example &mdash;
-        assuming that two-digit job codes are used for regular
-        (in-store) workers, three-digit codes are used for office and
-        support personnel, and four-digit codes are used for management
-        positions &mdash; you could create the partitioned table using
-        the following:
+        employee job codes&mdash;that is, based on ranges of
+        <literal>job_code</literal> column values. For
+        example&mdash;assuming that two-digit job codes are used for
+        regular (in-store) workers, three-digit codes are used for
+        office and support personnel, and four-digit codes are used for
+        management positions&mdash;you could create the partitioned
+        table using the following:
       </para>
 
 <programlisting>

@@ -1188,9 +1189,10 @@
       <note>
         <para>
           In MySQL &current-series;, it is possible to match against
-          only a list of integers (and possibly <literal>NULL</literal>
-          &mdash; see <xref linkend="partitioning-handling-nulls"/>)
-          when partitioning by <literal>LIST</literal>.
+          only a list of integers (and possibly
+          <literal>NULL</literal>&mdash;see
+          <xref linkend="partitioning-handling-nulls"/>) when
+          partitioning by <literal>LIST</literal>.
         </para>
       </note>
 

@@ -1617,8 +1619,8 @@
 
       <para>
         The user function is evaluated each time a record is inserted or
-        updated. It may also &mdash; depending on the circumstances
-        &mdash; be evaluated when records are deleted.
+        updated. It may also&mdash;depending on the
+        circumstances&mdash;be evaluated when records are deleted.
       </para>
 
       <note>

@@ -1952,10 +1954,9 @@
               must have an explicit primary key, and any columns used in
               the partitioning expression must be part of this key.
               However, if the table uses an <quote>empty</quote>
-              partitioning expression &mdash; that is,
-              <literal>PARTITION BY KEY()</literal> with no column
-              references &mdash; then no explicit primary key is
-              required.
+              partitioning expression&mdash;that is, <literal>PARTITION
+              BY KEY()</literal> with no column references&mdash;then no
+              explicit primary key is required.
             </para>
           </note>
 

@@ -2026,8 +2027,8 @@
       </indexterm>
 
       <para>
-        Subpartitioning &mdash; also known as <firstterm>composite
-        partitioning</firstterm> &mdash; is the further division of each
+        Subpartitioning&mdash;also known as <firstterm>composite
+        partitioning</firstterm>&mdash;is the further division of each
         partition in a partitioned table. For example, consider the
         following <literal role="stmt">CREATE TABLE</literal> statement:
       </para>

@@ -2045,9 +2046,9 @@
 
       <para>
         Table <literal>ts</literal> has 3 <literal>RANGE</literal>
-        partitions. Each of these partitions &mdash;
-        <literal>p0</literal>, <literal>p1</literal>, and
-        <literal>p2</literal> &mdash; is further divided into 2
+        partitions. Each of these
+        partitions&mdash;<literal>p0</literal>, <literal>p1</literal>,
+        and <literal>p2</literal>&mdash;is further divided into 2
         subpartitions. In effect, the entire table is divided into
         <literal>3 * 2 = 6</literal> partitions. However, due to the
         action of the <literal>PARTITION BY RANGE</literal> clause, the

@@ -2341,7 +2342,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 first subpartition (<literal>s1a</literal>) are stored
-                on <filename>/disk4</filename> &mdash; the data in
+                on <filename>/disk4</filename>&mdash;the data in
                 <filename>/disk4/data</filename>, and the indexes in
                 <filename>/disk4/idx</filename>.
               </para>

@@ -2351,7 +2352,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 second subpartition (<literal>s1b</literal>) are stored
-                on <filename>/disk5</filename> &mdash; the data in
+                on <filename>/disk5</filename>&mdash;the data in
                 <filename>/disk5/data</filename>, and the indexes in
                 <filename>/disk5/idx</filename>.
               </para>

@@ -3299,7 +3300,7 @@
         <literal>p1</literal>, and add <literal>np</literal> and then a
         new <literal>p1</literal> with a modified definition. However,
         as discussed earlier, this would result in the loss of all data
-        stored in <literal>p1</literal> &mdash; and it is often the case
+        stored in <literal>p1</literal>&mdash;and it is often the case
         that this is not what you really want to do. Another solution
         might appear to be to make a copy of the table with the new
         partitioning and to copy the data into it using

@@ -3666,7 +3667,7 @@
       <para>
         Note that the number following <literal>COALESCE
         PARTITION</literal> is the number of partitions to merge into
-        the remainder &mdash; in other words, it is the number of
+        the remainder&mdash;in other words, it is the number of
         partitions to remove from the table.
       </para>
 

@@ -4655,7 +4656,7 @@
             permitted in partitioning expressions. However, the result
             must be an integer value or <literal>NULL</literal> (except
             in the case of <literal>[LINEAR] KEY</literal> partitioning,
-            as discussed elswhere in this chapter &mdash; see
+            as discussed elswhere in this chapter; see
             <xref linkend="partitioning-types"/>, for more information).
           </para>
 

@@ -5683,10 +5684,10 @@
 </programlisting>
 
       <para>
-        If a table has no unique keys &mdash; this includes having no
-        primary key &mdash; then this restriction does not apply, and
-        you may use any column or columns in the partitioning expression
-        as long as the column type is compatible with the partitioning
+        If a table has no unique keys&mdash;this includes having no
+        primary key&mdash;then this restriction does not apply, and you
+        may use any column or columns in the partitioning expression as
+        long as the column type is compatible with the partitioning
         type.
       </para>
 


Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/replication-configuration.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 5, Lines Added: 22, Lines Deleted: 22; 4568 bytes

@@ -1250,10 +1250,10 @@
               slave. (If this option was not set explicitly on the
               existing slave, use
               <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively &mdash; if you have already tried to start
-              the new slave (after following the remaining steps in this
+              Alternatively&mdash;if you have already tried to start the
+              new slave (after following the remaining steps in this
               section) and have encountered errors like those described
-              previously &mdash; then perform the following steps:
+              previously&mdash;then perform the following steps:
 
               <orderedlist>
 

@@ -1471,12 +1471,12 @@
       setting the <literal role="sysvar">binlog_format</literal> server
       system variable. This variable can be set with session or global
       scope. The rules governing when and how the new setting takes
-      effect are the same as for other MySQL server system variables
-      &mdash; setting the variable for the current session lasts only
-      until the end of that session, and the change is not visible to
-      other sessions; setting the variable globally requires a restart
-      of the server in order to take effect. For more information, see
-      <xref linkend="set-option"/>.
+      effect are the same as for other MySQL server system
+      variables&mdash;setting the variable for the current session lasts
+      only until the end of that session, and the change is not visible
+      to other sessions; setting the variable globally requires a
+      restart of the server in order to take effect. For more
+      information, see <xref linkend="set-option"/>.
     </para>
 
     <para>

@@ -1856,11 +1856,11 @@
             database is instead seen as a node-specific database.
             Row-based replication is not supported on tables in this
             database. Instead, statements that would normally update
-            this information &mdash; such as
+            this information&mdash;such as
             <literal role="stmt">GRANT</literal>,
             <literal role="stmt">REVOKE</literal> and the manipulation
             of triggers, stored routines (including stored procedures),
-            and views &mdash; are all replicated to slaves using
+            and views&mdash;are all replicated to slaves using
             statement-based replication.
           </para>
 

@@ -2101,14 +2101,14 @@
             <para>
               When many rows are affected, the set of changes is split
               into several events; when the statement commits, all of
-              these events are written to the binary log if the statement is
-an initial
-nontransactional statement (occuring in the transaction before any
-transactional statements). When executing
-              on the slave, a table lock is taken on all tables
-              involved, and then the rows are applied in batch mode.
-              (This may or may not be effective, depending on the engine
-              used for the slave's copy of the table.)
+              these events are written to the binary log if the
+              statement is an initial nontransactional statement
+              (occuring in the transaction before any transactional
+              statements). When executing on the slave, a table lock is
+              taken on all tables involved, and then the rows are
+              applied in batch mode. (This may or may not be effective,
+              depending on the engine used for the slave's copy of the
+              table.)
             </para>
 
           </formalpara>

@@ -2407,9 +2407,9 @@
             caught up with the master, but there are some cases where
             this is not strictly true. For example, this can occur if
             the network connection between master and slave is broken
-            but the slave I/O thread has not yet noticed this &mdash;
-            that is, <literal role="sysvar">slave_net_timeout</literal>
-            has not yet elapsed.
+            but the slave I/O thread has not yet noticed this&mdash;that
+            is, <literal role="sysvar">slave_net_timeout</literal> has
+            not yet elapsed.
           </para>
 
           <para>


Modified: trunk/refman-5.1/replication-notes.xml
===================================================================
--- trunk/refman-5.1/replication-notes.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/replication-notes.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 16; 3827 bytes

@@ -1043,9 +1043,9 @@
 
             <para>
               Promotion between <literal role="type">INT</literal>
-              subtypes &mdash; for example, from
-              <literal>SMALLINT</literal> to <literal>BIGINT</literal>
-              &mdash; is also not supported.
+              subtypes&mdash;for example, from
+              <literal>SMALLINT</literal> to
+              <literal>BIGINT</literal>&mdash;is also not supported.
             </para>
           </listitem>
 

@@ -1578,7 +1578,7 @@
                 <errortext>Statement may not be safe to log in statement
                 format</errortext>. (Prior to MySQL 5.1.36, this was
                 <errortext>Statement is not safe to log in statement
-                format</errortext> &mdash; see Bug#42415.) For example,
+                format</errortext>&mdash;see Bug#42415.) For example,
                 trying to replicate a UDF with statement-based
                 replication generates this warning because it currently
                 cannot be determined by the MySQL server whether the UDF

@@ -2397,12 +2397,12 @@
         <para>
           Temporary tables are replicated except in the case where you
           stop the slave server (not just the slave threads) and you
-          have replicated temporary tables that are open for use in updates that
-          have not yet been executed on the slave. If you stop the slave
-          server, the temporary tables needed by those updates are no
-          longer available when the slave is restarted. To avoid this
-          problem, do not shut down the slave while it has temporary
-          tables open. Instead, use the following procedure:
+          have replicated temporary tables that are open for use in
+          updates that have not yet been executed on the slave. If you
+          stop the slave server, the temporary tables needed by those
+          updates are no longer available when the slave is restarted.
+          To avoid this problem, do not shut down the slave while it has
+          temporary tables open. Instead, use the following procedure:
         </para>
 
       </formalpara>

@@ -2509,10 +2509,10 @@
           the value of <literal role="sysvar">binlog_format</literal>;
           if this value is <literal>MIXED</literal>, these statement are
           replicated using the row-based format. However, statements
-          that would normally update this information indirectly &mdash;
-          such <literal role="stmt">GRANT</literal>,
+          that would normally update this information
+          indirectly&mdash;such <literal role="stmt">GRANT</literal>,
           <literal role="stmt">REVOKE</literal>, and statements
-          manipulating triggers, stored routines, and views &mdash; are
+          manipulating triggers, stored routines, and views&mdash;are
           replicated to slaves using statement-based replication.
         </para>
 

@@ -3058,9 +3058,9 @@
       </para>
 
       <para>
-        If you want triggers to execute on both the master and the slave
-        &mdash; perhaps because you have different triggers on the
-        master and slave &mdash; then you must use statement-based
+        If you want triggers to execute on both the master and the
+        slave&mdash;perhaps because you have different triggers on the
+        master and slave&mdash;then you must use statement-based
         replication. However, it is not necessary to use statement-based
         replication exclusively if you want to enable slave-side
         triggers; it is sufficient in such cases to switch to


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/replication-options-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 8; 2851 bytes

@@ -863,9 +863,9 @@
         <para>
           When using MySQL Cluster Replication prior to MySQL Cluster
           NDB 6.2.16 and MySQL Cluster NDB 6.3.13, records for
-          <quote>empty</quote> epochs &mdash; that is, epochs in which
-          no changes to <literal role="se">NDBCLUSTER</literal> data or
-          tables took place &mdash; were inserted into the
+          <quote>empty</quote> epochs&mdash;that is, epochs in which no
+          changes to <literal role="se">NDBCLUSTER</literal> data or
+          tables took place&mdash;were inserted into the
           <literal>ndb_apply_status</literal> and
           <literal>ndb_binlog_index</literal> tables on the slave even
           when <option role="mysqld">--log-slave-updates</option> was

@@ -1659,8 +1659,8 @@
           row-based replication, the
           <literal role="stmt">UPDATE</literal> would change
           <literal>table1</literal> on the slave, but not
-          <literal>table2</literal> &mdash; in other words, only tables
-          in the database named by
+          <literal>table2</literal>&mdash;in other words, only tables in
+          the database named by
           <option role="mysqld">--replicate-do-db</option> are changed,
           and the choice of default database has no effect on this
           behavior.

@@ -3014,7 +3014,7 @@
           statement is not written to the binary log when using
           statement-based logging. However, when using row-based
           logging, the change to <literal>table1</literal> is logged,
-          but not that to <literal>table2</literal> &mdash; in other
+          but not that to <literal>table2</literal>&mdash;in other
           words, only changes to tables in the database named by
           <option role="mysqld">--binlog-do-db</option> are logged, and
           the choice of default database has no effect on this behavior.

@@ -3546,8 +3546,8 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_binlog</literal> is 0, which does
-          no synchronizing to disk &mdash; in this case, the server
-          relies on the operating system to flush the binary log&apos;s
+          no synchronizing to disk&mdash;in this case, the server relies
+          on the operating system to flush the binary log&apos;s
           contents from to time as for any other file. A value of 1 is
           the safest choice because in the event of a crash you lose at
           most one statement or transaction from the binary log.


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/restrictions.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1755 bytes

@@ -402,8 +402,8 @@
         <para>
           Beginning with MySQL 5.1.8, event names are handled in
           case-insensitive fashion. For example, this means that you
-          cannot have two events in the same database (and &mdash; prior
-          to MySQL 5.1.12 &mdash; with the same definer) with the names
+          cannot have two events in the same database (and&mdash;prior
+          to MySQL 5.1.12&mdash;with the same definer) with the names
           <literal>anEvent</literal> and <literal>AnEvent</literal>.
         </para>
 

@@ -435,11 +435,11 @@
           <literal>YEAR_MONTH</literal> are resolved in months; those
           using any other interval are resolved in seconds. There is no
           way to cause events scheduled to occur at the same second to
-          execute in a given order. In addition &mdash; due to rounding,
+          execute in a given order. In addition&mdash;due to rounding,
           the nature of threaded applications, and the fact that a
           nonzero length of time is required to create events and to
-          signal their execution &mdash; events may be delayed by as
-          much as 1 or 2 seconds. However, the time shown in the
+          signal their execution&mdash;events may be delayed by as much
+          as 1 or 2 seconds. However, the time shown in the
           <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table's
           <literal>LAST_EXECUTED</literal> column or the
           <literal>mysql.event</literal> table's


Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 10, Lines Added: 23, Lines Deleted: 24; 6172 bytes

@@ -1004,8 +1004,8 @@
           <literal role="se">NDBCLUSTER</literal> table that uses a
           table-level <literal>STORAGE DISK</literal> option, you must
           declare the new column as using memory-based storage
-          explicitly. For example &mdash; assuming that you have already
-          created tablespace <literal>ts1</literal> &mdash; suppose that
+          explicitly. For example&mdash;assuming that you have already
+          created tablespace <literal>ts1</literal>&mdash;suppose that
           you create table <literal>t1</literal> as follows:
         </para>
 

@@ -2331,7 +2331,7 @@
 
             <para>
               You cannot perform other DDL concurrently with online
-              table reorganization &mdash; that is, no other DDL
+              table reorganization&mdash;that is, no other DDL
               statements can be issued while an <literal>ALTER ONLINE
               TABLE ... REORGANIZE PARTITION</literal> statement is
               executing. For more information about adding MySQL Cluster

@@ -2379,8 +2379,8 @@
           statements such as <literal role="stmt">CHECK TABLE</literal>
           and <literal role="stmt">REPAIR TABLE</literal> (which are
           also supported for partitioned tables, beginning with MySQL
-          5.1.27 &mdash; see note at the end of this item). These
-          include <literal>ANALYZE PARTITION</literal>, <literal>CHECK
+          5.1.27&mdash;see note at the end of this item). These include
+          <literal>ANALYZE PARTITION</literal>, <literal>CHECK
           PARTITION</literal>, <literal>OPTIMIZE PARTITION</literal>,
           <literal>REBUILD PARTITION</literal>, and <literal>REPAIR
           PARTITION</literal>. Each of these options takes a

@@ -3183,11 +3183,10 @@
 
     <para>
       The previous statement creates an event named
-      <literal>myevent</literal>. This event executes once &mdash; one
-      hour following its creation &mdash; by running an SQL statement
-      that increments the value of the
-      <literal>myschema.mytable</literal> table's
-      <literal>mycol</literal> column by 1.
+      <literal>myevent</literal>. This event executes once&mdash;one
+      hour following its creation&mdash;by running an SQL statement that
+      increments the value of the <literal>myschema.mytable</literal>
+      table's <literal>mycol</literal> column by 1.
     </para>
 
     <para>

@@ -3338,8 +3337,8 @@
 
         <para>
           <literal role="stmt">CREATE EVENT</literal> statements which
-          are themselves invalid &mdash; for whatever reason &mdash;
-          fail with an error.
+          are themselves invalid&mdash;for whatever reason&mdash;fail
+          with an error.
         </para>
 
         <para>

@@ -3350,10 +3349,10 @@
 
         <para>
           To create an event which occurs at some point in the future
-          relative to the current date and time &mdash; such as that
-          expressed by the phrase <quote>three weeks from now</quote>
-          &mdash; you can use the optional clause <literal>+ INTERVAL
-          <replaceable>interval</replaceable></literal>. The
+          relative to the current date and time&mdash;such as that
+          expressed by the phrase <quote>three weeks from
+          now</quote>&mdash;you can use the optional clause <literal>+
+          INTERVAL <replaceable>interval</replaceable></literal>. The
           <replaceable>interval</replaceable> portion consists of two
           parts, a quantity and a unit of time, and follows the same
           syntax rules that govern intervals used in the

@@ -3409,7 +3408,7 @@
           STARTS CURRENT_TIMESTAMP + INTERVAL '6:15'
           HOUR_MINUTE</literal>. Not specifying
           <literal>STARTS</literal> is the same as using <literal>STARTS
-          CURRENT_TIMESTAMP</literal> &mdash; that is, the action
+          CURRENT_TIMESTAMP</literal>&mdash;that is, the action
           specified for the event begins repeating immediately upon
           creation of the event.
         </para>

@@ -6720,10 +6719,10 @@
       <replaceable>num</replaceable>, where
       <replaceable>num</replaceable> is the number of partitions. (The
       maximum number of user-defined partitions which a table may
-      contain is 1024; the number of subpartitions &mdash; discussed
-      later in this section &mdash; is included in this maximum.) The
-      choices that are available for this function in MySQL
-      &current-series; are shown in the following list:
+      contain is 1024; the number of subpartitions&mdash;discussed later
+      in this section&mdash;is included in this maximum.) The choices
+      that are available for this function in MySQL &current-series; are
+      shown in the following list:
     </para>
 
     <itemizedlist>

@@ -7770,7 +7769,7 @@
       can contain before another extent is used. In theory, up to 65,535
       (64K) extents may used per data file; however, the recommended
       maximum is 32,768 (32K). The recommended maximum size for a single
-      data file is 32G &mdash; that is, 32K extents &times; 1 MB per
+      data file is 32G&mdash;that is, 32K extents &times; 1 MB per
       extent. In addition, once an extent is allocated to a given
       partition, it cannot be used to store data from a different
       partition; an extent cannot store data from more than one

@@ -9677,8 +9676,8 @@
     <note>
       <para>
         When upgrading from a version of MySQL older than MySQL 5.0.10
-        to 5.0.10 or newer &mdash; including all MySQL &current-series;
-        releases &mdash; you must drop all triggers <emphasis>before
+        to 5.0.10 or newer&mdash;including all MySQL &current-series;
+        releases&mdash;you must drop all triggers <emphasis>before
         upgrading</emphasis> and re-create them afterward, or else
         <literal role="stmt">DROP TRIGGER</literal> does not work after
         the upgrade. See


Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1925 bytes

@@ -3624,8 +3624,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
     </para>
 

@@ -7880,7 +7881,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer

@@ -8130,7 +8131,7 @@
       Beginning with MySQL 5.1.32, <literal role="stmt">TRUNCATE
       TABLE</literal> is treated for purposes of binary logging and
       replication as <literal role="stmt">DROP TABLE</literal> followed
-      by <literal role="stmt">CREATE TABLE</literal> &mdash; that is, as
+      by <literal role="stmt">CREATE TABLE</literal>&mdash;that is, as
       DDL rather than DML. This is due to the fact that, when using
       <literal role="se">InnoDB</literal> and other transactional
       storage engines where the transaction isolation level does not


Modified: trunk/refman-5.1/storage-engines-core.xml
===================================================================
--- trunk/refman-5.1/storage-engines-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/storage-engines-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 13, Lines Added: 98, Lines Deleted: 103; 18005 bytes

@@ -159,9 +159,9 @@
 
     <listitem>
       <para>
-        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>
-        &mdash; The default MySQL storage engine and the one that is
-        used the most in Web, data warehousing, and other application
+        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>:
+        The default MySQL storage engine and the one that is used the
+        most in Web, data warehousing, and other application
         environments. <literal>MyISAM</literal> is supported in all
         MySQL configurations, and is the default storage engine unless
         you have configured MySQL to use a different one by default.

@@ -170,15 +170,15 @@
 
     <listitem>
       <para>
-        <link linkend="innodb"><literal>InnoDB</literal></link> &mdash;
-        A transaction-safe (ACID compliant) storage engine for MySQL
-        that has commit, rollback, and crash-recovery capabilities to
-        protect user data. <literal>InnoDB</literal> row-level locking
-        (without escalation to coarser granularity locks) and
-        Oracle-style consistent nonlocking reads increase multi-user
-        concurrency and performance. <literal>InnoDB</literal> stores
-        user data in clustered indexes to reduce I/O for common queries
-        based on primary keys. To maintain data integrity,
+        <link linkend="innodb"><literal>InnoDB</literal></link>: A
+        transaction-safe (ACID compliant) storage engine for MySQL that
+        has commit, rollback, and crash-recovery capabilities to protect
+        user data. <literal>InnoDB</literal> row-level locking (without
+        escalation to coarser granularity locks) and Oracle-style
+        consistent nonlocking reads increase multi-user concurrency and
+        performance. <literal>InnoDB</literal> stores user data in
+        clustered indexes to reduce I/O for common queries based on
+        primary keys. To maintain data integrity,
         <literal>InnoDB</literal> also supports <literal>FOREIGN
         KEY</literal> referential-integrity constraints.
       </para>

@@ -186,46 +186,45 @@
 
     <listitem>
       <para>
-        <link linkend="memory-storage-engine"><literal>Memory</literal></link>
-        &mdash; Stores all data in RAM for extremely fast access in
-        environments that require quick lookups of reference and other
-        like data. This engine was formerly known as the
-        <literal>HEAP</literal> engine.
+        <link linkend="memory-storage-engine"><literal>Memory</literal></link>:
+        Stores all data in RAM for extremely fast access in environments
+        that require quick lookups of reference and other like data.
+        This engine was formerly known as the <literal>HEAP</literal>
+        engine.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="merge-storage-engine"><literal>Merge</literal></link>
-        &mdash; Allows a MySQL DBA or developer to logically group a
-        series of identical <literal>MyISAM</literal> tables and
-        reference them as one object. Good for VLDB environments such as
-        data warehousing.
+        <link linkend="merge-storage-engine"><literal>Merge</literal></link>:
+        Allows a MySQL DBA or developer to logically group a series of
+        identical <literal>MyISAM</literal> tables and reference them as
+        one object. Good for VLDB environments such as data warehousing.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="archive-storage-engine"><literal>Archive</literal></link>
-        &mdash; Provides the perfect solution for storing and retrieving
-        large amounts of seldom-referenced historical, archived, or
-        security audit information.
+        <link linkend="archive-storage-engine"><literal>Archive</literal></link>:
+        Provides the perfect solution for storing and retrieving large
+        amounts of seldom-referenced historical, archived, or security
+        audit information.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="federated-storage-engine"><literal>Federated</literal></link>
-        &mdash; Offers the ability to link separate MySQL servers to
-        create one logical database from many physical servers. Very
-        good for distributed or data mart environments.
+        <link linkend="federated-storage-engine"><literal>Federated</literal></link>:
+        Offers the ability to link separate MySQL servers to create one
+        logical database from many physical servers. Very good for
+        distributed or data mart environments.
       </para>
     </listitem>
 
     <listitem>
       <para>
         <link linkend="mysql-cluster"><literal role="se">NDBCLUSTER</literal></link>
-        (also known as <literal role="se">NDB</literal>) &mdash; This
+        (also known as <literal role="se">NDB</literal>)&mdash;This
         clustered database engine is particularly suited for
         applications that require the highest possible degree of uptime
         and availability.

@@ -245,8 +244,8 @@
 
     <listitem>
       <para>
-        <link linkend="csv-storage-engine"><literal>CSV</literal></link>
-        &mdash; The CSV storage engine stores data in text files using
+        <link linkend="csv-storage-engine"><literal>CSV</literal></link>:
+        The CSV storage engine stores data in text files using
         comma-separated values format. You can use the CSV engine to
         easily exchange data between other software and applications
         that can import and export in CSV format.

@@ -255,23 +254,23 @@
 
     <listitem>
       <para>
-        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>
-        &mdash; The Blackhole storage engine accepts but does not store
-        data and retrievals always return an empty set. The
-        functionality can be used in distributed database design where
-        data is automatically replicated, but not stored locally.
+        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>:
+        The Blackhole storage engine accepts but does not store data and
+        retrievals always return an empty set. The functionality can be
+        used in distributed database design where data is automatically
+        replicated, but not stored locally.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="example-storage-engine"><literal>Example</literal></link>
-        &mdash; The Example storage engine is <quote>stub</quote> engine
-        that does nothing. You can create tables with this engine, but
-        no data can be stored in them or retrieved from them. The
-        purpose of this engine is to serve as an example in the MySQL
-        source code that illustrates how to begin writing new storage
-        engines. As such, it is primarily of interest to developers.
+        <link linkend="example-storage-engine"><literal>Example</literal></link>:
+        The Example storage engine is <quote>stub</quote> engine that
+        does nothing. You can create tables with this engine, but no
+        data can be stored in them or retrieved from them. The purpose
+        of this engine is to serve as an example in the MySQL source
+        code that illustrates how to begin writing new storage engines.
+        As such, it is primarily of interest to developers.
       </para>
     </listitem>
 

@@ -431,16 +430,16 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=43">PrimeBase
-          XT (PBXT)</ulink></emphasis> &mdash; PBXT has been designed
-          for modern, web-based, high concurrency environments.
+          XT (PBXT)</ulink></emphasis>: PBXT has been designed for
+          modern, web-based, high concurrency environments.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>
-          &mdash; RitmarkFS allows you to access and manipulate the file
-          system using SQL queries. RitmarkFS also supports file system
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>:
+          RitmarkFS allows you to access and manipulate the file system
+          using SQL queries. RitmarkFS also supports file system
           replication and directory change tracking.
         </para>
       </listitem>

@@ -448,54 +447,51 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=91">Distributed
-          Data Engine</ulink></emphasis> &mdash; The Distributed Data
-          Engine is an Open Source project that is dedicated to provide
-          a Storage Engine for distributed data according to workload
-          statistics.
+          Data Engine</ulink></emphasis>: The Distributed Data Engine is
+          an Open Source project that is dedicated to provide a Storage
+          Engine for distributed data according to workload statistics.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>
-          &mdash; A pluggable storage engine that allows read-only
-          access to Microsoft Access <filename>.mdb</filename> database
-          files.
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>:
+          A pluggable storage engine that allows read-only access to
+          Microsoft Access <filename>.mdb</filename> database files.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=139">solidDB
-          for MySQL</ulink></emphasis> &mdash; solidDB Storage Engine
-          for MySQL is an open source, transactional storage engine for
-          MySQL Server. It is designed for mission-critical
-          implementations that require a robust, transactional database.
-          solidDB Storage Engine for MySQL is a multi-threaded storage
-          engine that supports full ACID compliance with all expected
-          transaction isolation levels, row-level locking, and
-          Multi-Version Concurrency Control (MVCC) with nonblocking
-          reads and writes.
+          for MySQL</ulink></emphasis>: solidDB Storage Engine for MySQL
+          is an open source, transactional storage engine for MySQL
+          Server. It is designed for mission-critical implementations
+          that require a robust, transactional database. solidDB Storage
+          Engine for MySQL is a multi-threaded storage engine that
+          supports full ACID compliance with all expected transaction
+          isolation levels, row-level locking, and Multi-Version
+          Concurrency Control (MVCC) with nonblocking reads and writes.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://www.blobstreaming.org/">BLOB
-          Streaming Engine (MyBS)</ulink></emphasis> &mdash; The
-          Scalable BLOB Streaming infrastructure for MySQL will
-          transform MySQL into a scalable media server capable of
-          streaming pictures, films, MP3 files and other binary and text
-          objects (BLOBs) directly in and out of the database.
+          Streaming Engine (MyBS)</ulink></emphasis>: The Scalable BLOB
+          Streaming infrastructure for MySQL will transform MySQL into a
+          scalable media server capable of streaming pictures, films,
+          MP3 files and other binary and text objects (BLOBs) directly
+          in and out of the database.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://www.innodb.com/innodb_plugin/features/">The
-          <literal>InnoDB</literal> Plugin</ulink></emphasis> &mdash;
-          The <literal>InnoDB</literal> Plugin for MySQL permits users
-          to replace the <quote>built-in</quote> version of
+          <literal>InnoDB</literal> Plugin</ulink></emphasis>: The
+          <literal>InnoDB</literal> Plugin for MySQL permits users to
+          replace the <quote>built-in</quote> version of
           <literal>InnoDB</literal> in MySQL 5.1 with a new release of
           <literal>InnoDB</literal> that offers new features, improved
           performance, enhanced reliability and new capabilities for

@@ -669,9 +665,9 @@
 
     <para>
       This efficient and modular architecture provides huge benefits for
-      those wishing to specifically target a particular application need
-      &mdash; such as data warehousing, transaction processing, or high
-      availability situations &mdash; while enjoying the advantage of
+      those wishing to specifically target a particular application
+      need&mdash;such as data warehousing, transaction processing, or
+      high availability situations&mdash;while enjoying the advantage of
       utilizing a set of interfaces and services that are independent of
       any one storage engine.
     </para>

@@ -791,11 +787,11 @@
 
         <listitem>
           <para>
-            <emphasis>Concurrency</emphasis> &mdash; some applications
-            have more granular lock requirements (such as row-level
-            locks) than others. Choosing the right locking strategy can
-            reduce overhead and therefore improve overall performance.
-            This area also includes support for capabilities such as
+            <emphasis>Concurrency</emphasis>: Some applications have
+            more granular lock requirements (such as row-level locks)
+            than others. Choosing the right locking strategy can reduce
+            overhead and therefore improve overall performance. This
+            area also includes support for capabilities such as
             multi-version concurrency control or <quote>snapshot</quote>
             read.
           </para>

@@ -803,7 +799,7 @@
 
         <listitem>
           <para>
-            <emphasis>Transaction Support</emphasis> &mdash; Not every
+            <emphasis>Transaction Support</emphasis>: Not every
             application needs transactions, but for those that do, there
             are very well defined requirements such as ACID compliance
             and more.

@@ -812,15 +808,15 @@
 
         <listitem>
           <para>
-            <emphasis>Referential Integrity</emphasis> &mdash; The need
-            to have the server enforce relational database referential
-            integrity through DDL defined foreign keys.
+            <emphasis>Referential Integrity</emphasis>: The need to have
+            the server enforce relational database referential integrity
+            through DDL defined foreign keys.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Physical Storage</emphasis> &mdash; This involves
+            <emphasis>Physical Storage</emphasis>: This involves
             everything from the overall page size for tables and indexes
             as well as the format used for storing data to physical
             disk.

@@ -829,29 +825,28 @@
 
         <listitem>
           <para>
-            <emphasis>Index Support</emphasis> &mdash; Different
-            application scenarios tend to benefit from different index
-            strategies. Each storage engine generally has its own
-            indexing methods, although some (such as B-tree indexes) are
-            common to nearly all engines.
+            <emphasis>Index Support</emphasis>: Different application
+            scenarios tend to benefit from different index strategies.
+            Each storage engine generally has its own indexing methods,
+            although some (such as B-tree indexes) are common to nearly
+            all engines.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Memory Caches</emphasis> &mdash; Different
-            applications respond better to some memory caching
-            strategies than others, so although some memory caches are
-            common to all storage engines (such as those used for user
-            connections or MySQL's high-speed Query Cache), others are
-            uniquely defined only when a particular storage engine is
-            put in play.
+            <emphasis>Memory Caches</emphasis>: Different applications
+            respond better to some memory caching strategies than
+            others, so although some memory caches are common to all
+            storage engines (such as those used for user connections or
+            MySQL's high-speed Query Cache), others are uniquely defined
+            only when a particular storage engine is put in play.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Performance Aids</emphasis> &mdash; This includes
+            <emphasis>Performance Aids</emphasis>: This includes
             multiple I/O threads for parallel operations, thread
             concurrency, database checkpointing, bulk insert handling,
             and more.

@@ -860,8 +855,8 @@
 
         <listitem>
           <para>
-            <emphasis>Miscellaneous Target Features</emphasis> &mdash;
-            This may include support for geospatial operations, security
+            <emphasis>Miscellaneous Target Features</emphasis>: This may
+            include support for geospatial operations, security
             restrictions for certain data manipulation operations, and
             other similar features.
           </para>


Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.1/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -557,7 +557,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1610,8 +1610,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Modified: trunk/refman-5.4/data-types.xml
===================================================================
--- trunk/refman-5.4/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1075 bytes

@@ -3645,7 +3645,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown

@@ -4871,7 +4871,7 @@
         If you wish to use a number as an enumeration value, you must
         enclose it in quotation marks. If the quotation marks are
         omitted, the number is regarded as an index. For this and other
-        reasons &mdash; as explained later in this section &mdash; we
+        reasons&mdash;as explained later in this section&mdash;we
         strongly recommend that you do <emphasis>not</emphasis> use
         numbers as enumeration values.
       </para>


Modified: trunk/refman-5.4/dba-log-files.xml
===================================================================
--- trunk/refman-5.4/dba-log-files.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/dba-log-files.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 824 bytes

@@ -1456,9 +1456,9 @@
         <listitem>
           <para>
             When the body of a view requires row-based replication, the
-            statement creating the view also uses it &mdash; for
-            example, this occurs when the statement creating a view uses
-            the <literal role="func">UUID()</literal> function.
+            statement creating the view also uses it. For example, this
+            occurs when the statement creating a view uses the
+            <literal role="func">UUID()</literal> function.
           </para>
         </listitem>
 


Modified: trunk/refman-5.4/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.4/dba-mysqld-server-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/dba-mysqld-server-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 819 bytes

@@ -8281,8 +8281,8 @@
           The <literal role="sysvar">rand_seed1</literal> and
           <literal role="sysvar">rand_seed2</literal> variables exist as
           session variables only, and can be set but not read. The
-          variables &mdash; but not their values &mdash; are shown in
-          the output of <literal role="stmt">SHOW VARIABLES</literal>.
+          variables&mdash;but not their values&mdash;are shown in the
+          output of <literal role="stmt">SHOW VARIABLES</literal>.
         </para>
 
         <para>


Modified: trunk/refman-5.4/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.4/dba-privilege-system.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/dba-privilege-system.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1059 bytes

@@ -449,11 +449,10 @@
           <para>
             In some circumstances, the
             <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary &mdash; on slaves where there are no
-            nonreplicated tables, for instance. The MySQL Enterprise
-            Monitor notifies subscribers when accounts have
-            inappropriate privileges. For more information, see
-            &base-url-enterprise;advisors.html.
+            unnecessary&mdash;on slaves where there are no nonreplicated
+            tables, for instance. The MySQL Enterprise Monitor notifies
+            subscribers when accounts have inappropriate privileges. For
+            more information, see &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>


Modified: trunk/refman-5.4/errors-problems-core.xml
===================================================================
--- trunk/refman-5.4/errors-problems-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/errors-problems-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1897 bytes

@@ -1382,9 +1382,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1641,9 +1641,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>

@@ -5064,7 +5064,7 @@
           been defined as <literal role="type">DECIMAL</literal> rather
           than <literal role="type">DOUBLE</literal>, the result of the
           <literal role="stmt">SELECT</literal> query would have
-          contained only one row &mdash; the last one shown above.
+          contained only one row&mdash;the last one shown above.
         </para>
 
         <para>


Modified: trunk/refman-5.4/faqs-core.xml
===================================================================
--- trunk/refman-5.4/faqs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/faqs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 526 bytes

@@ -85,7 +85,7 @@
 
     <section id="faqs-replication">
 
-    <title>MySQL &current-series; FAQ &mdash; Replication</title>
+    <title>MySQL &current-series; FAQ: Replication</title>
 
     <remark role="note">
       [js] THIS SECTION COMMENTED OUT PENDING REVIEW OF 5.0 FAQ MATERIAL


Modified: trunk/refman-5.4/functions-core.xml
===================================================================
--- trunk/refman-5.4/functions-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/functions-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1810 bytes

@@ -13800,11 +13800,11 @@
 
         <para>
           If no matching text node is found for the expression
-          (including the implicit <literal>/text()</literal>) &mdash;
-          for whatever reason, as long as
+          (including the implicit <literal>/text()</literal>)&mdash;for
+          whatever reason, as long as
           <replaceable>xpath_expr</replaceable> is valid, and
           <replaceable>xml_frag</replaceable> consists of elements which
-          are properly nested and closed &mdash; an empty string is
+          are properly nested and closed&mdash;an empty string is
           returned. No distinction is made between a match on an empty
           element and no match at all. This is by design.
         </para>

@@ -13899,8 +13899,8 @@
         </para>
 
         <para>
-          (Previously, binary &mdash; that is, case-sensitive &mdash;
-          comparison was always used.)
+          (Previously, binary&mdash;that is,
+          case-sensitive&mdash;comparison was always used.)
         </para>
 
         <para>

@@ -14328,8 +14328,8 @@
           <listitem>
             <para>
               Locators prefixed with expressions that evaluate as scalar
-              values &mdash; including variable references, literals,
-              numbers,and scalar function calls &mdash; are disallowed,
+              values&mdash;including variable references, literals,
+              numbers,and scalar function calls&mdash;are disallowed,
               and their use results in an error.
             </para>
           </listitem>


Modified: trunk/refman-5.4/information-schema.xml
===================================================================
--- trunk/refman-5.4/information-schema.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/information-schema.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 736 bytes

@@ -4161,8 +4161,8 @@
       <listitem>
         <para>
           <literal>DATA_LENGTH</literal>: The total length of all rows
-          stored in this partition or subpartition, in bytes &mdash;
-          that is, the total number of bytes stored in the partition or
+          stored in this partition or subpartition, in bytes&mdash;that
+          is, the total number of bytes stored in the partition or
           subpartition.
         </para>
       </listitem>


Modified: trunk/refman-5.4/installing-core.xml
===================================================================
--- trunk/refman-5.4/installing-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/installing-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1560 bytes

@@ -2685,10 +2685,10 @@
           <xref linkend="mysql-install-wizard-starting"/>. Rather than
           opening a port, you also have the option of adding MySQL as a
           program that bypasses the Windows Firewall. One or the other
-          option is sufficient &mdash; you need not do both.
-          Additionally, when running the MySQL Server Configuration
-          Wizard on Windows Vista ensure that you are logged in as a
-          user with administrative rights.
+          option is sufficient&mdash;you need not do both. Additionally,
+          when running the MySQL Server Configuration Wizard on Windows
+          Vista ensure that you are logged in as a user with
+          administrative rights.
         </para>
 
         <mediaobject>

@@ -11929,8 +11929,8 @@
             created. These are superuser accounts that can do anything.
             The initial <literal>root</literal> account passwords are
             empty, so anyone can connect to the MySQL server as
-            <literal>root</literal> &mdash; <emphasis>without a
-            password</emphasis> &mdash; and be granted all privileges.
+            <literal>root</literal>&mdash;<emphasis>without a
+            password</emphasis>&mdash;and be granted all privileges.
           </para>
 
           <itemizedlist>


Modified: trunk/refman-5.4/internationalization.xml
===================================================================
--- trunk/refman-5.4/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 13, Lines Deleted: 14; 3382 bytes

@@ -3894,10 +3894,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata. This is also
         true of the contents of tables in
         <literal>INFORMATION_SCHEMA</literal>, because those tables by

@@ -5753,7 +5753,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -5824,8 +5824,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -5865,8 +5865,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -5909,7 +5909,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -7784,10 +7784,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-5.4/optimization.xml
===================================================================
--- trunk/refman-5.4/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 13, Lines Deleted: 13; 2600 bytes

@@ -953,8 +953,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -10267,10 +10267,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -12483,11 +12483,11 @@
       </para>
 
       <para>
-        The query cache can be useful in an environment where you
-        have tables that do not change very often and for which the
-        server receives many identical queries. This is a typical
-        situation for many Web servers that generate many dynamic pages
-        based on database content.
+        The query cache can be useful in an environment where you have
+        tables that do not change very often and for which the server
+        receives many identical queries. This is a typical situation for
+        many Web servers that generate many dynamic pages based on
+        database content.
       </para>
 
       <para>

@@ -16107,8 +16107,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-5.4/partitioning.xml
===================================================================
--- trunk/refman-5.4/partitioning.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/partitioning.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 13, Lines Added: 43, Lines Deleted: 41; 8744 bytes

@@ -312,13 +312,14 @@
     </para>
 
     <para>
-      This is known as <firstterm>horizontal partitioning</firstterm>
-      &mdash; that is, different rows of a table may be assigned to
-      different physical partitions. MySQL &current-series; does not
-      support <firstterm>vertical partitioning</firstterm>, in which
-      different columns of a table are assigned to different physical
-      partitions. There are not at this time any plans to introduce
-      vertical partitioning into MySQL &current-series;.
+      This is known as <firstterm>horizontal
+      partitioning</firstterm>&mdash;that is, different rows of a table
+      may be assigned to different physical partitions. MySQL
+      &current-series; does not support <firstterm>vertical
+      partitioning</firstterm>, in which different columns of a table
+      are assigned to different physical partitions. There are not at
+      this time any plans to introduce vertical partitioning into MySQL
+      &current-series;.
     </para>
 
     <para>

@@ -724,8 +725,8 @@
     </para>
 
     <para>
-      It is important to remember &mdash; regardless of the type of
-      partitioning that you use &mdash; that partitions are always
+      It is important to remember&mdash;regardless of the type of
+      partitioning that you use&mdash;that partitions are always
       numbered automatically and in sequence when created, starting with
       <literal>0</literal>. When a new row is inserted into a
       partitioned table, it is these partition numbers that are used in

@@ -906,23 +907,23 @@
         bound</firstterm>). Now, any rows whose
         <literal>store_id</literal> column value is greater than or
         equal to 16 (the highest value defined) are stored in partition
-        <literal>p3</literal>. At some point in the future &mdash; when
-        the number of stores has increased to 25, 30, or more &mdash;
-        you can use an <literal role="stmt">ALTER TABLE</literal>
-        statement to add new partitions for stores 21-25, 26-30, and so
-        on (see <xref linkend="partitioning-management"/>, for details
-        of how to do this).
+        <literal>p3</literal>. At some point in the future&mdash;when
+        the number of stores has increased to 25, 30, or more&mdash;you
+        can use an <literal role="stmt">ALTER TABLE</literal> statement
+        to add new partitions for stores 21-25, 26-30, and so on (see
+        <xref linkend="partitioning-management"/>, for details of how to
+        do this).
       </para>
 
       <para>
         In much the same fashion, you could partition the table based on
-        employee job codes &mdash; that is, based on ranges of
-        <literal>job_code</literal> column values. For example &mdash;
-        assuming that two-digit job codes are used for regular
-        (in-store) workers, three-digit codes are used for office and
-        support personnel, and four-digit codes are used for management
-        positions &mdash; you could create the partitioned table using
-        the following:
+        employee job codes&mdash;that is, based on ranges of
+        <literal>job_code</literal> column values. For
+        example&mdash;assuming that two-digit job codes are used for
+        regular (in-store) workers, three-digit codes are used for
+        office and support personnel, and four-digit codes are used for
+        management positions&mdash;you could create the partitioned
+        table using the following:
       </para>
 
 <programlisting>

@@ -1082,9 +1083,10 @@
       <note>
         <para>
           In MySQL &current-series;, it is possible to match against
-          only a list of integers (and possibly <literal>NULL</literal>
-          &mdash; see <xref linkend="partitioning-handling-nulls"/>)
-          when partitioning by <literal>LIST</literal>.
+          only a list of integers (and possibly
+          <literal>NULL</literal>&mdash;see
+          <xref linkend="partitioning-handling-nulls"/>) when
+          partitioning by <literal>LIST</literal>.
         </para>
       </note>
 

@@ -1511,8 +1513,8 @@
 
       <para>
         The user function is evaluated each time a record is inserted or
-        updated. It may also &mdash; depending on the circumstances
-        &mdash; be evaluated when records are deleted.
+        updated. It may also&mdash;depending on the
+        circumstances&mdash;be evaluated when records are deleted.
       </para>
 
       <note>

@@ -1905,8 +1907,8 @@
       </indexterm>
 
       <para>
-        Subpartitioning &mdash; also known as <firstterm>composite
-        partitioning</firstterm> &mdash; is the further division of each
+        Subpartitioning&mdash;also known as <firstterm>composite
+        partitioning</firstterm>&mdash;is the further division of each
         partition in a partitioned table. For example, consider the
         following <literal role="stmt">CREATE TABLE</literal> statement:
       </para>

@@ -1924,9 +1926,9 @@
 
       <para>
         Table <literal>ts</literal> has 3 <literal>RANGE</literal>
-        partitions. Each of these partitions &mdash;
-        <literal>p0</literal>, <literal>p1</literal>, and
-        <literal>p2</literal> &mdash; is further divided into 2
+        partitions. Each of these
+        partitions&mdash;<literal>p0</literal>, <literal>p1</literal>,
+        and <literal>p2</literal>&mdash;is further divided into 2
         subpartitions. In effect, the entire table is divided into
         <literal>3 * 2 = 6</literal> partitions. However, due to the
         action of the <literal>PARTITION BY RANGE</literal> clause, the

@@ -2214,7 +2216,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 first subpartition (<literal>s1a</literal>) are stored
-                on <filename>/disk4</filename> &mdash; the data in
+                on <filename>/disk4</filename>&mdash;the data in
                 <filename>/disk4/data</filename>, and the indexes in
                 <filename>/disk4/idx</filename>.
               </para>

@@ -2224,7 +2226,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 second subpartition (<literal>s1b</literal>) are stored
-                on <filename>/disk5</filename> &mdash; the data in
+                on <filename>/disk5</filename>&mdash;the data in
                 <filename>/disk5/data</filename>, and the indexes in
                 <filename>/disk5/idx</filename>.
               </para>

@@ -3146,7 +3148,7 @@
         <literal>p1</literal>, and add <literal>np</literal> and then a
         new <literal>p1</literal> with a modified definition. However,
         as discussed earlier, this would result in the loss of all data
-        stored in <literal>p1</literal> &mdash; and it is often the case
+        stored in <literal>p1</literal>&mdash;and it is often the case
         that this is not what you really want to do. Another solution
         might appear to be to make a copy of the table with the new
         partitioning and to copy the data into it using

@@ -3502,7 +3504,7 @@
       <para>
         Note that the number following <literal>COALESCE
         PARTITION</literal> is the number of partitions to merge into
-        the remainder &mdash; in other words, it is the number of
+        the remainder&mdash;in other words, it is the number of
         partitions to remove from the table.
       </para>
 

@@ -4455,7 +4457,7 @@
             permitted in partitioning expressions. However, the result
             must be an integer value or <literal>NULL</literal> (except
             in the case of <literal>[LINEAR] KEY</literal> partitioning,
-            as discussed elswhere in this chapter &mdash; see
+            as discussed elswhere in this chapter; see
             <xref linkend="partitioning-types"/>, for more information).
           </para>
 

@@ -5478,10 +5480,10 @@
 </programlisting>
 
       <para>
-        If a table has no unique keys &mdash; this includes having no
-        primary key &mdash; then this restriction does not apply, and
-        you may use any column or columns in the partitioning expression
-        as long as the column type is compatible with the partitioning
+        If a table has no unique keys&mdash;this includes having no
+        primary key&mdash;then this restriction does not apply, and you
+        may use any column or columns in the partitioning expression as
+        long as the column type is compatible with the partitioning
         type.
       </para>
 


Modified: trunk/refman-5.4/replication-configuration.xml
===================================================================
--- trunk/refman-5.4/replication-configuration.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/replication-configuration.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 5, Lines Added: 22, Lines Deleted: 22; 4620 bytes

@@ -1250,10 +1250,10 @@
               slave. (If this option was not set explicitly on the
               existing slave, use
               <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively &mdash; if you have already tried to start
-              the new slave (after following the remaining steps in this
+              Alternatively&mdash;if you have already tried to start the
+              new slave (after following the remaining steps in this
               section) and have encountered errors like those described
-              previously &mdash; then perform the following steps:
+              previously&mdash;then perform the following steps:
 
               <orderedlist>
 

@@ -1468,12 +1468,12 @@
       setting the <literal role="sysvar">binlog_format</literal> server
       system variable. This variable can be set with session or global
       scope. The rules governing when and how the new setting takes
-      effect are the same as for other MySQL server system variables
-      &mdash; setting the variable for the current session lasts only
-      until the end of that session, and the change is not visible to
-      other sessions; setting the variable globally requires a restart
-      of the server in order to take effect. For more information, see
-      <xref linkend="set-option"/>.
+      effect are the same as for other MySQL server system
+      variables&mdash;setting the variable for the current session lasts
+      only until the end of that session, and the change is not visible
+      to other sessions; setting the variable globally requires a
+      restart of the server in order to take effect. For more
+      information, see <xref linkend="set-option"/>.
     </para>
 
     <para>

@@ -1797,11 +1797,11 @@
             <literal>mysql</literal> database is instead seen as a
             node-specific database. Row-based replication is not
             supported on tables in this database. Instead, statements
-            that would normally update this information &mdash; such as
+            that would normally update this information&mdash;such as
             <literal role="stmt">GRANT</literal>,
             <literal role="stmt">REVOKE</literal> and the manipulation
             of triggers, stored routines (including stored procedures),
-            and views &mdash; are all replicated to slaves using
+            and views&mdash;are all replicated to slaves using
             statement-based replication.
           </para>
 

@@ -1987,14 +1987,14 @@
             <para>
               When many rows are affected, the set of changes is split
               into several events; when the statement commits, all of
-              these events are written to the binary log if the statement is
-an initial
-nontransactional statement (occuring in the transaction before any
-transactional statements). When executing
-              on the slave, a table lock is taken on all tables
-              involved, and then the rows are applied in batch mode.
-              (This may or may not be effective, depending on the engine
-              used for the slave's copy of the table.)
+              these events are written to the binary log if the
+              statement is an initial nontransactional statement
+              (occuring in the transaction before any transactional
+              statements). When executing on the slave, a table lock is
+              taken on all tables involved, and then the rows are
+              applied in batch mode. (This may or may not be effective,
+              depending on the engine used for the slave's copy of the
+              table.)
             </para>
 
           </formalpara>

@@ -2303,9 +2303,9 @@
             caught up with the master, but there are some cases where
             this is not strictly true. For example, this can occur if
             the network connection between master and slave is broken
-            but the slave I/O thread has not yet noticed this &mdash;
-            that is, <literal role="sysvar">slave_net_timeout</literal>
-            has not yet elapsed.
+            but the slave I/O thread has not yet noticed this&mdash;that
+            is, <literal role="sysvar">slave_net_timeout</literal> has
+            not yet elapsed.
           </para>
 
           <para>


Modified: trunk/refman-5.4/replication-notes.xml
===================================================================
--- trunk/refman-5.4/replication-notes.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/replication-notes.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3165 bytes

@@ -984,9 +984,9 @@
 
             <para>
               Promotion between <literal role="type">INT</literal>
-              subtypes &mdash; for example, from
-              <literal>SMALLINT</literal> to <literal>BIGINT</literal>
-              &mdash; is also not supported.
+              subtypes&mdash;for example, from
+              <literal>SMALLINT</literal> to
+              <literal>BIGINT</literal>&mdash;is also not supported.
             </para>
           </listitem>
 

@@ -1977,12 +1977,12 @@
         <para>
           Temporary tables are replicated except in the case where you
           stop the slave server (not just the slave threads) and you
-          have replicated temporary tables that are open for use in updates that
-          have not yet been executed on the slave. If you stop the slave
-          server, the temporary tables needed by those updates are no
-          longer available when the slave is restarted. To avoid this
-          problem, do not shut down the slave while it has temporary
-          tables open. Instead, use the following procedure:
+          have replicated temporary tables that are open for use in
+          updates that have not yet been executed on the slave. If you
+          stop the slave server, the temporary tables needed by those
+          updates are no longer available when the slave is restarted.
+          To avoid this problem, do not shut down the slave while it has
+          temporary tables open. Instead, use the following procedure:
         </para>
 
       </formalpara>

@@ -2085,10 +2085,10 @@
         the value of <literal role="sysvar">binlog_format</literal>; if
         this value is <literal>MIXED</literal>, these statements are
         replicated using row-based format. However, statements that
-        would normally update this information indirectly &mdash; such
+        would normally update this information indirectly&mdash;such
         <literal role="stmt">GRANT</literal>,
         <literal role="stmt">REVOKE</literal>, and statements
-        manipulating triggers, stored routines, and views &mdash; are
+        manipulating triggers, stored routines, and views&mdash;are
         replicated to slaves using statement-based replication.
       </para>
 

@@ -2561,9 +2561,9 @@
       </para>
 
       <para>
-        If you want triggers to execute on both the master and the slave
-        &mdash; perhaps because you have different triggers on the
-        master and slave &mdash; then you must use statement-based
+        If you want triggers to execute on both the master and the
+        slave&mdash;perhaps because you have different triggers on the
+        master and slave&mdash;then you must use statement-based
         replication. However, it is not necessary to use statement-based
         replication exclusively if you want to enable slave-side
         triggers; it is sufficient in such cases to switch to


Modified: trunk/refman-5.4/replication-options-core.xml
===================================================================
--- trunk/refman-5.4/replication-options-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/replication-options-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 5; 2093 bytes

@@ -1537,8 +1537,8 @@
           row-based replication, the
           <literal role="stmt">UPDATE</literal> would change
           <literal>table1</literal> on the slave, but not
-          <literal>table2</literal> &mdash; in other words, only tables
-          in the database named by
+          <literal>table2</literal>&mdash;in other words, only tables in
+          the database named by
           <option role="mysqld">--replicate-do-db</option> are changed,
           and the choice of default database has no effect on this
           behavior.

@@ -2913,7 +2913,7 @@
           statement is not written to the binary log when using
           statement-based logging. However, when using row-based
           logging, the change to <literal>table1</literal> is logged,
-          but not that to <literal>table2</literal> &mdash; in other
+          but not that to <literal>table2</literal>&mdash;in other
           words, only changes to tables in the database named by
           <option role="mysqld">--binlog-do-db</option> are logged, and
           the choice of default database has no effect on this behavior.

@@ -3361,8 +3361,8 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_binlog</literal> is 0, which does
-          no synchronizing to disk &mdash; in this case, the server
-          relies on the operating system to flush the binary log&apos;s
+          no synchronizing to disk&mdash;in this case, the server relies
+          on the operating system to flush the binary log&apos;s
           contents from to time as for any other file. A value of 1 is
           the safest choice because in the event of a crash you lose at
           most one statement or transaction from the binary log.


Modified: trunk/refman-5.4/restrictions.xml
===================================================================
--- trunk/refman-5.4/restrictions.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/restrictions.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1215 bytes

@@ -407,11 +407,11 @@
           <literal>YEAR_MONTH</literal> are resolved in months; those
           using any other interval are resolved in seconds. There is no
           way to cause events scheduled to occur at the same second to
-          execute in a given order. In addition &mdash; due to rounding,
+          execute in a given order. In addition&mdash;due to rounding,
           the nature of threaded applications, and the fact that a
           nonzero length of time is required to create events and to
-          signal their execution &mdash; events may be delayed by as
-          much as 1 or 2 seconds. However, the time shown in the
+          signal their execution&mdash;events may be delayed by as much
+          as 1 or 2 seconds. However, the time shown in the
           <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table's
           <literal>LAST_EXECUTED</literal> column or the
           <literal>mysql.event</literal> table's


Modified: trunk/refman-5.4/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-data-definition.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/sql-syntax-data-definition.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 17, Lines Deleted: 18; 3860 bytes

@@ -2273,11 +2273,10 @@
 
     <para>
       The previous statement creates an event named
-      <literal>myevent</literal>. This event executes once &mdash; one
-      hour following its creation &mdash; by running an SQL statement
-      that increments the value of the
-      <literal>myschema.mytable</literal> table's
-      <literal>mycol</literal> column by 1.
+      <literal>myevent</literal>. This event executes once&mdash;one
+      hour following its creation&mdash;by running an SQL statement that
+      increments the value of the <literal>myschema.mytable</literal>
+      table's <literal>mycol</literal> column by 1.
     </para>
 
     <para>

@@ -2421,8 +2420,8 @@
 
         <para>
           <literal role="stmt">CREATE EVENT</literal> statements which
-          are themselves invalid &mdash; for whatever reason &mdash;
-          fail with an error.
+          are themselves invalid&mdash;for whatever reason&mdash;fail
+          with an error.
         </para>
 
         <para>

@@ -2433,10 +2432,10 @@
 
         <para>
           To create an event which occurs at some point in the future
-          relative to the current date and time &mdash; such as that
-          expressed by the phrase <quote>three weeks from now</quote>
-          &mdash; you can use the optional clause <literal>+ INTERVAL
-          <replaceable>interval</replaceable></literal>. The
+          relative to the current date and time&mdash;such as that
+          expressed by the phrase <quote>three weeks from
+          now</quote>&mdash;you can use the optional clause <literal>+
+          INTERVAL <replaceable>interval</replaceable></literal>. The
           <replaceable>interval</replaceable> portion consists of two
           parts, a quantity and a unit of time, and follows the same
           syntax rules that govern intervals used in the

@@ -2492,7 +2491,7 @@
           STARTS CURRENT_TIMESTAMP + INTERVAL '6:15'
           HOUR_MINUTE</literal>. Not specifying
           <literal>STARTS</literal> is the same as using <literal>STARTS
-          CURRENT_TIMESTAMP</literal> &mdash; that is, the action
+          CURRENT_TIMESTAMP</literal>&mdash;that is, the action
           specified for the event begins repeating immediately upon
           creation of the event.
         </para>

@@ -5412,10 +5411,10 @@
       <replaceable>num</replaceable>, where
       <replaceable>num</replaceable> is the number of partitions. (The
       maximum number of user-defined partitions which a table may
-      contain is 1024; the number of subpartitions &mdash; discussed
-      later in this section &mdash; is included in this maximum.) The
-      choices that are available for this function in MySQL
-      &current-series; are shown in the following list:
+      contain is 1024; the number of subpartitions&mdash;discussed later
+      in this section&mdash;is included in this maximum.) The choices
+      that are available for this function in MySQL &current-series; are
+      shown in the following list:
     </para>
 
     <itemizedlist>

@@ -7887,8 +7886,8 @@
     <note>
       <para>
         When upgrading from a version of MySQL older than MySQL 5.0.10
-        to 5.0.10 or newer &mdash; including all MySQL &current-series;
-        releases &mdash; you must drop all triggers <emphasis>before
+        to 5.0.10 or newer&mdash;including all MySQL &current-series;
+        releases&mdash;you must drop all triggers <emphasis>before
         upgrading</emphasis> and re-create them afterward, or else
         <literal role="stmt">DROP TRIGGER</literal> does not work after
         the upgrade.


Modified: trunk/refman-5.4/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 5; 2016 bytes

@@ -3570,8 +3570,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
     </para>
 

@@ -7806,7 +7807,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer

@@ -8055,8 +8056,8 @@
       <literal role="stmt">TRUNCATE TABLE</literal> is treated for
       purposes of binary logging and replication as
       <literal role="stmt">DROP TABLE</literal> followed by
-      <literal role="stmt">CREATE TABLE</literal> &mdash; that is, as
-      DDL rather than DML. This is due to the fact that, when using
+      <literal role="stmt">CREATE TABLE</literal>&mdash;that is, as DDL
+      rather than DML. This is due to the fact that, when using
       <literal role="se">InnoDB</literal> and other transactional
       storage engines where the transaction isolation level does not
       allow for statement-based logging (<literal>READ


Modified: trunk/refman-5.4/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/sql-syntax-replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 809 bytes

@@ -1057,8 +1057,8 @@
       </note>
 
       <para>
-        In MySQL 5.4 &mdash; unlike the case in MySQL 5.1 and earlier
-        &mdash; <literal>RESET SLAVE</literal> no longer changes
+        In MySQL 5.4&mdash;unlike the case in MySQL 5.1 and
+        earlier&mdash;<literal>RESET SLAVE</literal> no longer changes
         replication connection parameters such as master host, master
         port, master user, and master password. (This means that
         <literal role="stmt">START SLAVE</literal> can be issued without


Modified: trunk/refman-5.4/storage-engines-core.xml
===================================================================
--- trunk/refman-5.4/storage-engines-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/storage-engines-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 12, Lines Added: 94, Lines Deleted: 99; 16842 bytes

@@ -159,9 +159,9 @@
 
     <listitem>
       <para>
-        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>
-        &mdash; The default MySQL storage engine and the one that is
-        used the most in Web, data warehousing, and other application
+        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>:
+        The default MySQL storage engine and the one that is used the
+        most in Web, data warehousing, and other application
         environments. <literal>MyISAM</literal> is supported in all
         MySQL configurations, and is the default storage engine unless
         you have configured MySQL to use a different one by default.

@@ -170,15 +170,15 @@
 
     <listitem>
       <para>
-        <link linkend="innodb"><literal>InnoDB</literal></link> &mdash;
-        A transaction-safe (ACID compliant) storage engine for MySQL
-        that has commit, rollback, and crash-recovery capabilities to
-        protect user data. <literal>InnoDB</literal> row-level locking
-        (without escalation to coarser granularity locks) and
-        Oracle-style consistent nonlocking reads increase multi-user
-        concurrency and performance. <literal>InnoDB</literal> stores
-        user data in clustered indexes to reduce I/O for common queries
-        based on primary keys. To maintain data integrity,
+        <link linkend="innodb"><literal>InnoDB</literal></link>: A
+        transaction-safe (ACID compliant) storage engine for MySQL that
+        has commit, rollback, and crash-recovery capabilities to protect
+        user data. <literal>InnoDB</literal> row-level locking (without
+        escalation to coarser granularity locks) and Oracle-style
+        consistent nonlocking reads increase multi-user concurrency and
+        performance. <literal>InnoDB</literal> stores user data in
+        clustered indexes to reduce I/O for common queries based on
+        primary keys. To maintain data integrity,
         <literal>InnoDB</literal> also supports <literal>FOREIGN
         KEY</literal> referential-integrity constraints.
       </para>

@@ -186,46 +186,45 @@
 
     <listitem>
       <para>
-        <link linkend="memory-storage-engine"><literal>Memory</literal></link>
-        &mdash; Stores all data in RAM for extremely fast access in
-        environments that require quick lookups of reference and other
-        like data. This engine was formerly known as the
-        <literal>HEAP</literal> engine.
+        <link linkend="memory-storage-engine"><literal>Memory</literal></link>:
+        Stores all data in RAM for extremely fast access in environments
+        that require quick lookups of reference and other like data.
+        This engine was formerly known as the <literal>HEAP</literal>
+        engine.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="merge-storage-engine"><literal>Merge</literal></link>
-        &mdash; Allows a MySQL DBA or developer to logically group a
-        series of identical <literal>MyISAM</literal> tables and
-        reference them as one object. Good for VLDB environments such as
-        data warehousing.
+        <link linkend="merge-storage-engine"><literal>Merge</literal></link>:
+        Allows a MySQL DBA or developer to logically group a series of
+        identical <literal>MyISAM</literal> tables and reference them as
+        one object. Good for VLDB environments such as data warehousing.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="archive-storage-engine"><literal>Archive</literal></link>
-        &mdash; Provides the perfect solution for storing and retrieving
-        large amounts of seldom-referenced historical, archived, or
-        security audit information.
+        <link linkend="archive-storage-engine"><literal>Archive</literal></link>:
+        Provides the perfect solution for storing and retrieving large
+        amounts of seldom-referenced historical, archived, or security
+        audit information.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="federated-storage-engine"><literal>Federated</literal></link>
-        &mdash; Offers the ability to link separate MySQL servers to
-        create one logical database from many physical servers. Very
-        good for distributed or data mart environments.
+        <link linkend="federated-storage-engine"><literal>Federated</literal></link>:
+        Offers the ability to link separate MySQL servers to create one
+        logical database from many physical servers. Very good for
+        distributed or data mart environments.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="csv-storage-engine"><literal>CSV</literal></link>
-        &mdash; The CSV storage engine stores data in text files using
+        <link linkend="csv-storage-engine"><literal>CSV</literal></link>:
+        The CSV storage engine stores data in text files using
         comma-separated values format. You can use the CSV engine to
         easily exchange data between other software and applications
         that can import and export in CSV format.

@@ -234,23 +233,23 @@
 
     <listitem>
       <para>
-        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>
-        &mdash; The Blackhole storage engine accepts but does not store
-        data and retrievals always return an empty set. The
-        functionality can be used in distributed database design where
-        data is automatically replicated, but not stored locally.
+        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>:
+        The Blackhole storage engine accepts but does not store data and
+        retrievals always return an empty set. The functionality can be
+        used in distributed database design where data is automatically
+        replicated, but not stored locally.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="example-storage-engine"><literal>Example</literal></link>
-        &mdash; The Example storage engine is <quote>stub</quote> engine
-        that does nothing. You can create tables with this engine, but
-        no data can be stored in them or retrieved from them. The
-        purpose of this engine is to serve as an example in the MySQL
-        source code that illustrates how to begin writing new storage
-        engines. As such, it is primarily of interest to developers.
+        <link linkend="example-storage-engine"><literal>Example</literal></link>:
+        The Example storage engine is <quote>stub</quote> engine that
+        does nothing. You can create tables with this engine, but no
+        data can be stored in them or retrieved from them. The purpose
+        of this engine is to serve as an example in the MySQL source
+        code that illustrates how to begin writing new storage engines.
+        As such, it is primarily of interest to developers.
       </para>
     </listitem>
 

@@ -410,16 +409,16 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=43">PrimeBase
-          XT (PBXT)</ulink></emphasis> &mdash; PBXT has been designed
-          for modern, web-based, high concurrency environments.
+          XT (PBXT)</ulink></emphasis>: PBXT has been designed for
+          modern, web-based, high concurrency environments.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>
-          &mdash; RitmarkFS allows you to access and manipulate the file
-          system using SQL queries. RitmarkFS also supports file system
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>:
+          RitmarkFS allows you to access and manipulate the file system
+          using SQL queries. RitmarkFS also supports file system
           replication and directory change tracking.
         </para>
       </listitem>

@@ -427,45 +426,42 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=91">Distributed
-          Data Engine</ulink></emphasis> &mdash; The Distributed Data
-          Engine is an Open Source project that is dedicated to provide
-          a Storage Engine for distributed data according to workload
-          statistics.
+          Data Engine</ulink></emphasis>: The Distributed Data Engine is
+          an Open Source project that is dedicated to provide a Storage
+          Engine for distributed data according to workload statistics.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>
-          &mdash; A pluggable storage engine that allows read-only
-          access to Microsoft Access <filename>.mdb</filename> database
-          files.
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>:
+          A pluggable storage engine that allows read-only access to
+          Microsoft Access <filename>.mdb</filename> database files.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=139">solidDB
-          for MySQL</ulink></emphasis> &mdash; solidDB Storage Engine
-          for MySQL is an open source, transactional storage engine for
-          MySQL Server. It is designed for mission-critical
-          implementations that require a robust, transactional database.
-          solidDB Storage Engine for MySQL is a multi-threaded storage
-          engine that supports full ACID compliance with all expected
-          transaction isolation levels, row-level locking, and
-          Multi-Version Concurrency Control (MVCC) with nonblocking
-          reads and writes.
+          for MySQL</ulink></emphasis>: solidDB Storage Engine for MySQL
+          is an open source, transactional storage engine for MySQL
+          Server. It is designed for mission-critical implementations
+          that require a robust, transactional database. solidDB Storage
+          Engine for MySQL is a multi-threaded storage engine that
+          supports full ACID compliance with all expected transaction
+          isolation levels, row-level locking, and Multi-Version
+          Concurrency Control (MVCC) with nonblocking reads and writes.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://www.blobstreaming.org/">BLOB
-          Streaming Engine (MyBS)</ulink></emphasis> &mdash; The
-          Scalable BLOB Streaming infrastructure for MySQL will
-          transform MySQL into a scalable media server capable of
-          streaming pictures, films, MP3 files and other binary and text
-          objects (BLOBs) directly in and out of the database.
+          Streaming Engine (MyBS)</ulink></emphasis>: The Scalable BLOB
+          Streaming infrastructure for MySQL will transform MySQL into a
+          scalable media server capable of streaming pictures, films,
+          MP3 files and other binary and text objects (BLOBs) directly
+          in and out of the database.
         </para>
       </listitem>
 

@@ -631,9 +627,9 @@
 
     <para>
       This efficient and modular architecture provides huge benefits for
-      those wishing to specifically target a particular application need
-      &mdash; such as data warehousing, transaction processing, or high
-      availability situations &mdash; while enjoying the advantage of
+      those wishing to specifically target a particular application
+      need&mdash;such as data warehousing, transaction processing, or
+      high availability situations&mdash;while enjoying the advantage of
       utilizing a set of interfaces and services that are independent of
       any one storage engine.
     </para>

@@ -753,11 +749,11 @@
 
         <listitem>
           <para>
-            <emphasis>Concurrency</emphasis> &mdash; some applications
-            have more granular lock requirements (such as row-level
-            locks) than others. Choosing the right locking strategy can
-            reduce overhead and therefore improve overall performance.
-            This area also includes support for capabilities such as
+            <emphasis>Concurrency</emphasis>: Some applications have
+            more granular lock requirements (such as row-level locks)
+            than others. Choosing the right locking strategy can reduce
+            overhead and therefore improve overall performance. This
+            area also includes support for capabilities such as
             multi-version concurrency control or <quote>snapshot</quote>
             read.
           </para>

@@ -765,7 +761,7 @@
 
         <listitem>
           <para>
-            <emphasis>Transaction Support</emphasis> &mdash; Not every
+            <emphasis>Transaction Support</emphasis>: Not every
             application needs transactions, but for those that do, there
             are very well defined requirements such as ACID compliance
             and more.

@@ -774,15 +770,15 @@
 
         <listitem>
           <para>
-            <emphasis>Referential Integrity</emphasis> &mdash; The need
-            to have the server enforce relational database referential
-            integrity through DDL defined foreign keys.
+            <emphasis>Referential Integrity</emphasis>: The need to have
+            the server enforce relational database referential integrity
+            through DDL defined foreign keys.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Physical Storage</emphasis> &mdash; This involves
+            <emphasis>Physical Storage</emphasis>: This involves
             everything from the overall page size for tables and indexes
             as well as the format used for storing data to physical
             disk.

@@ -791,29 +787,28 @@
 
         <listitem>
           <para>
-            <emphasis>Index Support</emphasis> &mdash; Different
-            application scenarios tend to benefit from different index
-            strategies. Each storage engine generally has its own
-            indexing methods, although some (such as B-tree indexes) are
-            common to nearly all engines.
+            <emphasis>Index Support</emphasis>: Different application
+            scenarios tend to benefit from different index strategies.
+            Each storage engine generally has its own indexing methods,
+            although some (such as B-tree indexes) are common to nearly
+            all engines.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Memory Caches</emphasis> &mdash; Different
-            applications respond better to some memory caching
-            strategies than others, so although some memory caches are
-            common to all storage engines (such as those used for user
-            connections or MySQL's high-speed Query Cache), others are
-            uniquely defined only when a particular storage engine is
-            put in play.
+            <emphasis>Memory Caches</emphasis>: Different applications
+            respond better to some memory caching strategies than
+            others, so although some memory caches are common to all
+            storage engines (such as those used for user connections or
+            MySQL's high-speed Query Cache), others are uniquely defined
+            only when a particular storage engine is put in play.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Performance Aids</emphasis> &mdash; This includes
+            <emphasis>Performance Aids</emphasis>: This includes
             multiple I/O threads for parallel operations, thread
             concurrency, database checkpointing, bulk insert handling,
             and more.

@@ -822,8 +817,8 @@
 
         <listitem>
           <para>
-            <emphasis>Miscellaneous Target Features</emphasis> &mdash;
-            This may include support for geospatial operations, security
+            <emphasis>Miscellaneous Target Features</emphasis>: This may
+            include support for geospatial operations, security
             restrictions for certain data manipulation operations, and
             other similar features.
           </para>


Modified: trunk/refman-5.4/tutorial.xml
===================================================================
--- trunk/refman-5.4/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.4/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -557,7 +557,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1610,8 +1610,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Modified: trunk/refman-5.5/data-types.xml
===================================================================
--- trunk/refman-5.5/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1075 bytes

@@ -3645,7 +3645,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown

@@ -4871,7 +4871,7 @@
         If you wish to use a number as an enumeration value, you must
         enclose it in quotation marks. If the quotation marks are
         omitted, the number is regarded as an index. For this and other
-        reasons &mdash; as explained later in this section &mdash; we
+        reasons&mdash;as explained later in this section&mdash;we
         strongly recommend that you do <emphasis>not</emphasis> use
         numbers as enumeration values.
       </para>


Modified: trunk/refman-5.5/dba-log-files.xml
===================================================================
--- trunk/refman-5.5/dba-log-files.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/dba-log-files.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 824 bytes

@@ -1454,9 +1454,9 @@
         <listitem>
           <para>
             When the body of a view requires row-based replication, the
-            statement creating the view also uses it &mdash; for
-            example, this occurs when the statement creating a view uses
-            the <literal role="func">UUID()</literal> function.
+            statement creating the view also uses it. For example, this
+            occurs when the statement creating a view uses the
+            <literal role="func">UUID()</literal> function.
           </para>
         </listitem>
 


Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 819 bytes

@@ -8611,8 +8611,8 @@
           The <literal role="sysvar">rand_seed1</literal> and
           <literal role="sysvar">rand_seed2</literal> variables exist as
           session variables only, and can be set but not read. The
-          variables &mdash; but not their values &mdash; are shown in
-          the output of <literal role="stmt">SHOW VARIABLES</literal>.
+          variables&mdash;but not their values&mdash;are shown in the
+          output of <literal role="stmt">SHOW VARIABLES</literal>.
         </para>
 
         <para>


Modified: trunk/refman-5.5/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.5/dba-privilege-system.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/dba-privilege-system.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1059 bytes

@@ -454,11 +454,10 @@
           <para>
             In some circumstances, the
             <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary &mdash; on slaves where there are no
-            nonreplicated tables, for instance. The MySQL Enterprise
-            Monitor notifies subscribers when accounts have
-            inappropriate privileges. For more information, see
-            &base-url-enterprise;advisors.html.
+            unnecessary&mdash;on slaves where there are no nonreplicated
+            tables, for instance. The MySQL Enterprise Monitor notifies
+            subscribers when accounts have inappropriate privileges. For
+            more information, see &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>


Modified: trunk/refman-5.5/errors-problems-core.xml
===================================================================
--- trunk/refman-5.5/errors-problems-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/errors-problems-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1897 bytes

@@ -1382,9 +1382,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1641,9 +1641,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>

@@ -5074,7 +5074,7 @@
           been defined as <literal role="type">DECIMAL</literal> rather
           than <literal role="type">DOUBLE</literal>, the result of the
           <literal role="stmt">SELECT</literal> query would have
-          contained only one row &mdash; the last one shown above.
+          contained only one row&mdash;the last one shown above.
         </para>
 
         <para>


Modified: trunk/refman-5.5/faqs-core.xml
===================================================================
--- trunk/refman-5.5/faqs-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/faqs-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 526 bytes

@@ -85,7 +85,7 @@
 
     <section id="faqs-replication">
 
-    <title>MySQL &current-series; FAQ &mdash; Replication</title>
+    <title>MySQL &current-series; FAQ: Replication</title>
 
     <remark role="note">
       [js] THIS SECTION COMMENTED OUT PENDING REVIEW OF 5.0 FAQ MATERIAL


Modified: trunk/refman-5.5/functions-core.xml
===================================================================
--- trunk/refman-5.5/functions-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/functions-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1810 bytes

@@ -14057,11 +14057,11 @@
 
         <para>
           If no matching text node is found for the expression
-          (including the implicit <literal>/text()</literal>) &mdash;
-          for whatever reason, as long as
+          (including the implicit <literal>/text()</literal>)&mdash;for
+          whatever reason, as long as
           <replaceable>xpath_expr</replaceable> is valid, and
           <replaceable>xml_frag</replaceable> consists of elements which
-          are properly nested and closed &mdash; an empty string is
+          are properly nested and closed&mdash;an empty string is
           returned. No distinction is made between a match on an empty
           element and no match at all. This is by design.
         </para>

@@ -14156,8 +14156,8 @@
         </para>
 
         <para>
-          (Previously, binary &mdash; that is, case-sensitive &mdash;
-          comparison was always used.)
+          (Previously, binary&mdash;that is,
+          case-sensitive&mdash;comparison was always used.)
         </para>
 
         <para>

@@ -14585,8 +14585,8 @@
           <listitem>
             <para>
               Locators prefixed with expressions that evaluate as scalar
-              values &mdash; including variable references, literals,
-              numbers,and scalar function calls &mdash; are disallowed,
+              values&mdash;including variable references, literals,
+              numbers,and scalar function calls&mdash;are disallowed,
               and their use results in an error.
             </para>
           </listitem>


Modified: trunk/refman-5.5/information-schema.xml
===================================================================
--- trunk/refman-5.5/information-schema.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/information-schema.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 736 bytes

@@ -4221,8 +4221,8 @@
       <listitem>
         <para>
           <literal>DATA_LENGTH</literal>: The total length of all rows
-          stored in this partition or subpartition, in bytes &mdash;
-          that is, the total number of bytes stored in the partition or
+          stored in this partition or subpartition, in bytes&mdash;that
+          is, the total number of bytes stored in the partition or
           subpartition.
         </para>
       </listitem>


Modified: trunk/refman-5.5/installing-core.xml
===================================================================
--- trunk/refman-5.5/installing-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/installing-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1560 bytes

@@ -2690,10 +2690,10 @@
           <xref linkend="mysql-install-wizard-starting"/>. Rather than
           opening a port, you also have the option of adding MySQL as a
           program that bypasses the Windows Firewall. One or the other
-          option is sufficient &mdash; you need not do both.
-          Additionally, when running the MySQL Server Configuration
-          Wizard on Windows Vista ensure that you are logged in as a
-          user with administrative rights.
+          option is sufficient&mdash;you need not do both. Additionally,
+          when running the MySQL Server Configuration Wizard on Windows
+          Vista ensure that you are logged in as a user with
+          administrative rights.
         </para>
 
         <mediaobject>

@@ -11955,8 +11955,8 @@
             created. These are superuser accounts that can do anything.
             The initial <literal>root</literal> account passwords are
             empty, so anyone can connect to the MySQL server as
-            <literal>root</literal> &mdash; <emphasis>without a
-            password</emphasis> &mdash; and be granted all privileges.
+            <literal>root</literal>&mdash;<emphasis>without a
+            password</emphasis>&mdash;and be granted all privileges.
           </para>
 
           <itemizedlist>


Modified: trunk/refman-5.5/internationalization.xml
===================================================================
--- trunk/refman-5.5/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 7, Lines Added: 16, Lines Deleted: 17; 4024 bytes

@@ -4852,10 +4852,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata. This is also
         true of the contents of tables in
         <literal>INFORMATION_SCHEMA</literal> because those tables by

@@ -5771,9 +5771,9 @@
           characters in the strings being sorted. It is applicable to
           the UCS character repertoire. Since every character repertoire
           is a subset of the UCS repertoire, the UCS_BASIC collation is
-          potentially applicable to every character set. NOTE 11 &mdash;
-          The Unicode scalar value of a character is its code point
-          treated as an unsigned integer.</quote>
+          potentially applicable to every character set. NOTE 11: The
+          Unicode scalar value of a character is its code point treated
+          as an unsigned integer.</quote>
         </para>
 
         <para>

@@ -6948,7 +6948,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -7019,8 +7019,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -7060,8 +7060,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -7104,7 +7104,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -9074,10 +9074,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-5.5/optimization.xml
===================================================================
--- trunk/refman-5.5/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1905 bytes

@@ -953,8 +953,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -10383,10 +10383,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -16411,8 +16411,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-5.5/partitioning.xml
===================================================================
--- trunk/refman-5.5/partitioning.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/partitioning.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 13, Lines Added: 43, Lines Deleted: 41; 8767 bytes

@@ -317,13 +317,14 @@
     </para>
 
     <para>
-      This is known as <firstterm>horizontal partitioning</firstterm>
-      &mdash; that is, different rows of a table may be assigned to
-      different physical partitions. MySQL &current-series; does not
-      support <firstterm>vertical partitioning</firstterm>, in which
-      different columns of a table are assigned to different physical
-      partitions. There are not at this time any plans to introduce
-      vertical partitioning into MySQL &current-series;.
+      This is known as <firstterm>horizontal
+      partitioning</firstterm>&mdash;that is, different rows of a table
+      may be assigned to different physical partitions. MySQL
+      &current-series; does not support <firstterm>vertical
+      partitioning</firstterm>, in which different columns of a table
+      are assigned to different physical partitions. There are not at
+      this time any plans to introduce vertical partitioning into MySQL
+      &current-series;.
     </para>
 
     <para>

@@ -714,8 +715,8 @@
     </para>
 
     <para>
-      It is important to remember &mdash; regardless of the type of
-      partitioning that you use &mdash; that partitions are always
+      It is important to remember&mdash;regardless of the type of
+      partitioning that you use&mdash;that partitions are always
       numbered automatically and in sequence when created, starting with
       <literal>0</literal>. When a new row is inserted into a
       partitioned table, it is these partition numbers that are used in

@@ -896,23 +897,23 @@
         bound</firstterm>). Now, any rows whose
         <literal>store_id</literal> column value is greater than or
         equal to 16 (the highest value defined) are stored in partition
-        <literal>p3</literal>. At some point in the future &mdash; when
-        the number of stores has increased to 25, 30, or more &mdash;
-        you can use an <literal role="stmt">ALTER TABLE</literal>
-        statement to add new partitions for stores 21-25, 26-30, and so
-        on (see <xref linkend="partitioning-management"/>, for details
-        of how to do this).
+        <literal>p3</literal>. At some point in the future&mdash;when
+        the number of stores has increased to 25, 30, or more&mdash;you
+        can use an <literal role="stmt">ALTER TABLE</literal> statement
+        to add new partitions for stores 21-25, 26-30, and so on (see
+        <xref linkend="partitioning-management"/>, for details of how to
+        do this).
       </para>
 
       <para>
         In much the same fashion, you could partition the table based on
-        employee job codes &mdash; that is, based on ranges of
-        <literal>job_code</literal> column values. For example &mdash;
-        assuming that two-digit job codes are used for regular
-        (in-store) workers, three-digit codes are used for office and
-        support personnel, and four-digit codes are used for management
-        positions &mdash; you could create this partitioned table using
-        the following statement:
+        employee job codes&mdash;that is, based on ranges of
+        <literal>job_code</literal> column values. For
+        example&mdash;assuming that two-digit job codes are used for
+        regular (in-store) workers, three-digit codes are used for
+        office and support personnel, and four-digit codes are used for
+        management positions&mdash;you could create this partitioned
+        table using the following statement:
       </para>
 
 <programlisting>

@@ -1209,9 +1210,10 @@
       <note>
         <para>
           In MySQL &current-series;, it is possible to match against
-          only a list of integers (and possibly <literal>NULL</literal>
-          &mdash; see <xref linkend="partitioning-handling-nulls"/>)
-          when partitioning by <literal>LIST</literal>.
+          only a list of integers (and possibly
+          <literal>NULL</literal>&mdash;see
+          <xref linkend="partitioning-handling-nulls"/>) when
+          partitioning by <literal>LIST</literal>.
         </para>
 
         <para>

@@ -2530,8 +2532,8 @@
 
       <para>
         The user function is evaluated each time a record is inserted or
-        updated. It may also &mdash; depending on the circumstances
-        &mdash; be evaluated when records are deleted.
+        updated. It may also&mdash;depending on the
+        circumstances&mdash;be evaluated when records are deleted.
       </para>
 
       <note>

@@ -2924,8 +2926,8 @@
       </indexterm>
 
       <para>
-        Subpartitioning &mdash; also known as <firstterm>composite
-        partitioning</firstterm> &mdash; is the further division of each
+        Subpartitioning&mdash;also known as <firstterm>composite
+        partitioning</firstterm>&mdash;is the further division of each
         partition in a partitioned table. For example, consider the
         following <literal role="stmt">CREATE TABLE</literal> statement:
       </para>

@@ -2943,9 +2945,9 @@
 
       <para>
         Table <literal>ts</literal> has 3 <literal>RANGE</literal>
-        partitions. Each of these partitions &mdash;
-        <literal>p0</literal>, <literal>p1</literal>, and
-        <literal>p2</literal> &mdash; is further divided into 2
+        partitions. Each of these
+        partitions&mdash;<literal>p0</literal>, <literal>p1</literal>,
+        and <literal>p2</literal>&mdash;is further divided into 2
         subpartitions. In effect, the entire table is divided into
         <literal>3 * 2 = 6</literal> partitions. However, due to the
         action of the <literal>PARTITION BY RANGE</literal> clause, the

@@ -3233,7 +3235,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 first subpartition (<literal>s1a</literal>) are stored
-                on <filename>/disk4</filename> &mdash; the data in
+                on <filename>/disk4</filename>&mdash;the data in
                 <filename>/disk4/data</filename>, and the indexes in
                 <filename>/disk4/idx</filename>.
               </para>

@@ -3243,7 +3245,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 second subpartition (<literal>s1b</literal>) are stored
-                on <filename>/disk5</filename> &mdash; the data in
+                on <filename>/disk5</filename>&mdash;the data in
                 <filename>/disk5/data</filename>, and the indexes in
                 <filename>/disk5/idx</filename>.
               </para>

@@ -4177,7 +4179,7 @@
         <literal>p1</literal>, and add <literal>np</literal> and then a
         new <literal>p1</literal> with a modified definition. However,
         as discussed earlier, this would result in the loss of all data
-        stored in <literal>p1</literal> &mdash; and it is often the case
+        stored in <literal>p1</literal>&mdash;and it is often the case
         that this is not what you really want to do. Another solution
         might appear to be to make a copy of the table with the new
         partitioning and to copy the data into it using

@@ -4533,7 +4535,7 @@
       <para>
         Note that the number following <literal>COALESCE
         PARTITION</literal> is the number of partitions to merge into
-        the remainder &mdash; in other words, it is the number of
+        the remainder&mdash;in other words, it is the number of
         partitions to remove from the table.
       </para>
 

@@ -5511,7 +5513,7 @@
             permitted in partitioning expressions. However, the result
             must be an integer value or <literal>NULL</literal> (except
             in the case of <literal>[LINEAR] KEY</literal> partitioning,
-            as discussed elswhere in this chapter &mdash; see
+            as discussed elswhere in this chapter; see
             <xref linkend="partitioning-types"/>, for more information).
           </para>
 

@@ -6572,10 +6574,10 @@
 </programlisting>
 
       <para>
-        If a table has no unique keys &mdash; this includes having no
-        primary key &mdash; then this restriction does not apply, and
-        you may use any column or columns in the partitioning expression
-        as long as the column type is compatible with the partitioning
+        If a table has no unique keys&mdash;this includes having no
+        primary key&mdash;then this restriction does not apply, and you
+        may use any column or columns in the partitioning expression as
+        long as the column type is compatible with the partitioning
         type.
       </para>
 


Modified: trunk/refman-5.5/replication-configuration.xml
===================================================================
--- trunk/refman-5.5/replication-configuration.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/replication-configuration.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3434 bytes

@@ -1250,10 +1250,10 @@
               slave. (If this option was not set explicitly on the
               existing slave, use
               <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively &mdash; if you have already tried to start
-              the new slave (after following the remaining steps in this
+              Alternatively&mdash;if you have already tried to start the
+              new slave (after following the remaining steps in this
               section) and have encountered errors like those described
-              previously &mdash; then perform the following steps:
+              previously&mdash;then perform the following steps:
 
               <orderedlist>
 

@@ -1468,12 +1468,12 @@
       setting the <literal role="sysvar">binlog_format</literal> server
       system variable. This variable can be set with session or global
       scope. The rules governing when and how the new setting takes
-      effect are the same as for other MySQL server system variables
-      &mdash; setting the variable for the current session lasts only
-      until the end of that session, and the change is not visible to
-      other sessions; setting the variable globally requires a restart
-      of the server in order to take effect. For more information, see
-      <xref linkend="set-option"/>.
+      effect are the same as for other MySQL server system
+      variables&mdash;setting the variable for the current session lasts
+      only until the end of that session, and the change is not visible
+      to other sessions; setting the variable globally requires a
+      restart of the server in order to take effect. For more
+      information, see <xref linkend="set-option"/>.
     </para>
 
     <para>

@@ -1839,11 +1839,11 @@
             <literal>mysql</literal> database is instead seen as a
             node-specific database. Row-based replication is not
             supported on tables in this database. Instead, statements
-            that would normally update this information &mdash; such as
+            that would normally update this information&mdash;such as
             <literal role="stmt">GRANT</literal>,
             <literal role="stmt">REVOKE</literal> and the manipulation
             of triggers, stored routines (including stored procedures),
-            and views &mdash; are all replicated to slaves using
+            and views&mdash;are all replicated to slaves using
             statement-based replication.
           </para>
 

@@ -2351,9 +2351,9 @@
             caught up with the master, but there are some cases where
             this is not strictly true. For example, this can occur if
             the network connection between master and slave is broken
-            but the slave I/O thread has not yet noticed this &mdash;
-            that is, <literal role="sysvar">slave_net_timeout</literal>
-            has not yet elapsed.
+            but the slave I/O thread has not yet noticed this&mdash;that
+            is, <literal role="sysvar">slave_net_timeout</literal> has
+            not yet elapsed.
           </para>
 
           <para>


Modified: trunk/refman-5.5/replication-notes.xml
===================================================================
--- trunk/refman-5.5/replication-notes.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/replication-notes.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 15, Lines Deleted: 14; 3226 bytes

@@ -1294,9 +1294,10 @@
 
             <para>
               Promotion between <literal role="type">INT</literal>
-              subtypes &mdash; for example, from
-              <literal>SMALLINT</literal> to <literal>BIGINT</literal>
-              &mdash; was also not supported prior to MySQL 5.5.3.
+              subtypes&mdash;for example, from
+              <literal>SMALLINT</literal> to
+              <literal>BIGINT</literal>&mdash;was also not supported
+              prior to MySQL 5.5.3.
             </para>
           </listitem>
 

@@ -2301,12 +2302,12 @@
         <para>
           Temporary tables are replicated except in the case where you
           stop the slave server (not just the slave threads) and you
-          have replicated temporary tables that are open for use in updates that
-          have not yet been executed on the slave. If you stop the slave
-          server, the temporary tables needed by those updates are no
-          longer available when the slave is restarted. To avoid this
-          problem, do not shut down the slave while it has temporary
-          tables open. Instead, use the following procedure:
+          have replicated temporary tables that are open for use in
+          updates that have not yet been executed on the slave. If you
+          stop the slave server, the temporary tables needed by those
+          updates are no longer available when the slave is restarted.
+          To avoid this problem, do not shut down the slave while it has
+          temporary tables open. Instead, use the following procedure:
         </para>
 
       </formalpara>

@@ -2409,10 +2410,10 @@
         the value of <literal role="sysvar">binlog_format</literal>; if
         this value is <literal>MIXED</literal>, these statements are
         replicated using row-based format. However, statements that
-        would normally update this information indirectly &mdash; such
+        would normally update this information indirectly&mdash;such
         <literal role="stmt">GRANT</literal>,
         <literal role="stmt">REVOKE</literal>, and statements
-        manipulating triggers, stored routines, and views &mdash; are
+        manipulating triggers, stored routines, and views&mdash;are
         replicated to slaves using statement-based replication.
       </para>
 

@@ -2923,9 +2924,9 @@
       </para>
 
       <para>
-        If you want triggers to execute on both the master and the slave
-        &mdash; perhaps because you have different triggers on the
-        master and slave &mdash; then you must use statement-based
+        If you want triggers to execute on both the master and the
+        slave&mdash;perhaps because you have different triggers on the
+        master and slave&mdash;then you must use statement-based
         replication. However, it is not necessary to use statement-based
         replication exclusively if you want to enable slave-side
         triggers; it is sufficient in such cases to switch to


Modified: trunk/refman-5.5/replication-options-core.xml
===================================================================
--- trunk/refman-5.5/replication-options-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/replication-options-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 3840 bytes

@@ -1215,8 +1215,8 @@
           row-based replication, the
           <literal role="stmt">UPDATE</literal> would change
           <literal>table1</literal> on the slave, but not
-          <literal>table2</literal> &mdash; in other words, only tables
-          in the database named by
+          <literal>table2</literal>&mdash;in other words, only tables in
+          the database named by
           <option role="mysqld">--replicate-do-db</option> are changed,
           and the choice of default database has no effect on this
           behavior.

@@ -2356,7 +2356,7 @@
           transactions. The default value of
           <literal role="sysvar">sync_relay_log_info</literal> is 0
           (recommended in most situations), which does not force any
-          synchronization to disk by the MySQL server &mdash; in this
+          synchronization to disk by the MySQL server&mdash;in this
           case, the server relies on the operating system to flush the
           <filename>master.info</filename> file&apos;s contents from
           time to time as for any other file.

@@ -2388,7 +2388,7 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_relay_log</literal> is 0, which
-          does no synchronizing to disk &mdash; in this case, the server
+          does no synchronizing to disk&mdash;in this case, the server
           relies on the operating system to flush the relay log&apos;s
           contents from time to time as for any other file. A value of 1
           is the safest choice because in the event of a crash you lose

@@ -2423,10 +2423,9 @@
           The default value of
           <literal role="sysvar">sync_relay_log_info</literal> is 0,
           which does not force any synchronization to disk by the MySQL
-          server &mdash; in this case, the server relies on the
-          operating system to flush the
-          <filename>relay-log.info</filename> file&apos;s contents from
-          time to time as for any other file.
+          server&mdash;in this case, the server relies on the operating
+          system to flush the <filename>relay-log.info</filename>
+          file&apos;s contents from time to time as for any other file.
         </para>
       </listitem>
 

@@ -2755,7 +2754,7 @@
           statement is not written to the binary log when using
           statement-based logging. However, when using row-based
           logging, the change to <literal>table1</literal> is logged,
-          but not that to <literal>table2</literal> &mdash; in other
+          but not that to <literal>table2</literal>&mdash;in other
           words, only changes to tables in the database named by
           <option role="mysqld">--binlog-do-db</option> are logged, and
           the choice of default database has no effect on this behavior.

@@ -3268,8 +3267,8 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_binlog</literal> is 0, which does
-          no synchronizing to disk &mdash; in this case, the server
-          relies on the operating system to flush the binary log&apos;s
+          no synchronizing to disk&mdash;in this case, the server relies
+          on the operating system to flush the binary log&apos;s
           contents from to time as for any other file. A value of 1 is
           the safest choice because in the event of a crash you lose at
           most one statement or transaction from the binary log.


Modified: trunk/refman-5.5/restrictions.xml
===================================================================
--- trunk/refman-5.5/restrictions.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/restrictions.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1215 bytes

@@ -395,11 +395,11 @@
           <literal>YEAR_MONTH</literal> are resolved in months; those
           using any other interval are resolved in seconds. There is no
           way to cause events scheduled to occur at the same second to
-          execute in a given order. In addition &mdash; due to rounding,
+          execute in a given order. In addition&mdash;due to rounding,
           the nature of threaded applications, and the fact that a
           nonzero length of time is required to create events and to
-          signal their execution &mdash; events may be delayed by as
-          much as 1 or 2 seconds. However, the time shown in the
+          signal their execution&mdash;events may be delayed by as much
+          as 1 or 2 seconds. However, the time shown in the
           <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table's
           <literal>LAST_EXECUTED</literal> column or the
           <literal>mysql.event</literal> table's


Modified: trunk/refman-5.5/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-data-definition.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/sql-syntax-data-definition.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 17, Lines Deleted: 18; 3860 bytes

@@ -2387,11 +2387,10 @@
 
     <para>
       The previous statement creates an event named
-      <literal>myevent</literal>. This event executes once &mdash; one
-      hour following its creation &mdash; by running an SQL statement
-      that increments the value of the
-      <literal>myschema.mytable</literal> table's
-      <literal>mycol</literal> column by 1.
+      <literal>myevent</literal>. This event executes once&mdash;one
+      hour following its creation&mdash;by running an SQL statement that
+      increments the value of the <literal>myschema.mytable</literal>
+      table's <literal>mycol</literal> column by 1.
     </para>
 
     <para>

@@ -2535,8 +2534,8 @@
 
         <para>
           <literal role="stmt">CREATE EVENT</literal> statements which
-          are themselves invalid &mdash; for whatever reason &mdash;
-          fail with an error.
+          are themselves invalid&mdash;for whatever reason&mdash;fail
+          with an error.
         </para>
 
         <para>

@@ -2547,10 +2546,10 @@
 
         <para>
           To create an event which occurs at some point in the future
-          relative to the current date and time &mdash; such as that
-          expressed by the phrase <quote>three weeks from now</quote>
-          &mdash; you can use the optional clause <literal>+ INTERVAL
-          <replaceable>interval</replaceable></literal>. The
+          relative to the current date and time&mdash;such as that
+          expressed by the phrase <quote>three weeks from
+          now</quote>&mdash;you can use the optional clause <literal>+
+          INTERVAL <replaceable>interval</replaceable></literal>. The
           <replaceable>interval</replaceable> portion consists of two
           parts, a quantity and a unit of time, and follows the same
           syntax rules that govern intervals used in the

@@ -2606,7 +2605,7 @@
           STARTS CURRENT_TIMESTAMP + INTERVAL '6:15'
           HOUR_MINUTE</literal>. Not specifying
           <literal>STARTS</literal> is the same as using <literal>STARTS
-          CURRENT_TIMESTAMP</literal> &mdash; that is, the action
+          CURRENT_TIMESTAMP</literal>&mdash;that is, the action
           specified for the event begins repeating immediately upon
           creation of the event.
         </para>

@@ -5542,10 +5541,10 @@
       <replaceable>num</replaceable>, where
       <replaceable>num</replaceable> is the number of partitions. (The
       maximum number of user-defined partitions which a table may
-      contain is 1024; the number of subpartitions &mdash; discussed
-      later in this section &mdash; is included in this maximum.) The
-      choices that are available for this function in MySQL
-      &current-series; are shown in the following list:
+      contain is 1024; the number of subpartitions&mdash;discussed later
+      in this section&mdash;is included in this maximum.) The choices
+      that are available for this function in MySQL &current-series; are
+      shown in the following list:
     </para>
 
     <itemizedlist>

@@ -8185,8 +8184,8 @@
     <note>
       <para>
         When upgrading from a version of MySQL older than MySQL 5.0.10
-        to 5.0.10 or newer &mdash; including all MySQL &current-series;
-        releases &mdash; you must drop all triggers <emphasis>before
+        to 5.0.10 or newer&mdash;including all MySQL &current-series;
+        releases&mdash;you must drop all triggers <emphasis>before
         upgrading</emphasis> and re-create them afterward, or else
         <literal role="stmt">DROP TRIGGER</literal> does not work after
         the upgrade.


Modified: trunk/refman-5.5/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 7; 2415 bytes

@@ -3857,8 +3857,8 @@
     </para>
 
     <para>
-      The inverse of the above operation &mdash; that is, dumping MySQL
-      table data into an XML file &mdash; can be accomplished using the
+      The inverse of the above operation&mdash;that is, dumping MySQL
+      table data into an XML file&mdash;can be accomplished using the
       mysql client from the system shell, as shown here:
     </para>
 

@@ -4226,8 +4226,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
     </para>
 

@@ -8481,7 +8482,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer

@@ -8729,8 +8730,8 @@
       <literal role="stmt">TRUNCATE TABLE</literal> is treated for
       purposes of binary logging and replication as
       <literal role="stmt">DROP TABLE</literal> followed by
-      <literal role="stmt">CREATE TABLE</literal> &mdash; that is, as
-      DDL rather than DML. This is due to the fact that, when using
+      <literal role="stmt">CREATE TABLE</literal>&mdash;that is, as DDL
+      rather than DML. This is due to the fact that, when using
       <literal role="se">InnoDB</literal> and other transactional
       storage engines where the transaction isolation level does not
       allow for statement-based logging (<literal>READ


Modified: trunk/refman-5.5/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/sql-syntax-replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 807 bytes

@@ -932,8 +932,8 @@
       </note>
 
       <para>
-        In MySQL 5.4 &mdash; unlike the case in MySQL 5.1 and earlier
-        &mdash; <literal>RESET SLAVE</literal> no longer changes
+        In MySQL 5.4&mdash;unlike the case in MySQL 5.1 and
+        earlier&mdash;<literal>RESET SLAVE</literal> no longer changes
         replication connection parameters such as master host, master
         port, master user, and master password. (This means that
         <literal role="stmt">START SLAVE</literal> can be issued without


Modified: trunk/refman-5.5/storage-engines-core.xml
===================================================================
--- trunk/refman-5.5/storage-engines-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/storage-engines-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 12, Lines Added: 94, Lines Deleted: 99; 16842 bytes

@@ -151,9 +151,9 @@
 
     <listitem>
       <para>
-        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>
-        &mdash; The default MySQL storage engine and the one that is
-        used the most in Web, data warehousing, and other application
+        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>:
+        The default MySQL storage engine and the one that is used the
+        most in Web, data warehousing, and other application
         environments. <literal>MyISAM</literal> is supported in all
         MySQL configurations, and is the default storage engine unless
         you have configured MySQL to use a different one by default.

@@ -162,15 +162,15 @@
 
     <listitem>
       <para>
-        <link linkend="innodb"><literal>InnoDB</literal></link> &mdash;
-        A transaction-safe (ACID compliant) storage engine for MySQL
-        that has commit, rollback, and crash-recovery capabilities to
-        protect user data. <literal>InnoDB</literal> row-level locking
-        (without escalation to coarser granularity locks) and
-        Oracle-style consistent nonlocking reads increase multi-user
-        concurrency and performance. <literal>InnoDB</literal> stores
-        user data in clustered indexes to reduce I/O for common queries
-        based on primary keys. To maintain data integrity,
+        <link linkend="innodb"><literal>InnoDB</literal></link>: A
+        transaction-safe (ACID compliant) storage engine for MySQL that
+        has commit, rollback, and crash-recovery capabilities to protect
+        user data. <literal>InnoDB</literal> row-level locking (without
+        escalation to coarser granularity locks) and Oracle-style
+        consistent nonlocking reads increase multi-user concurrency and
+        performance. <literal>InnoDB</literal> stores user data in
+        clustered indexes to reduce I/O for common queries based on
+        primary keys. To maintain data integrity,
         <literal>InnoDB</literal> also supports <literal>FOREIGN
         KEY</literal> referential-integrity constraints.
       </para>

@@ -178,46 +178,45 @@
 
     <listitem>
       <para>
-        <link linkend="memory-storage-engine"><literal>Memory</literal></link>
-        &mdash; Stores all data in RAM for extremely fast access in
-        environments that require quick lookups of reference and other
-        like data. This engine was formerly known as the
-        <literal>HEAP</literal> engine.
+        <link linkend="memory-storage-engine"><literal>Memory</literal></link>:
+        Stores all data in RAM for extremely fast access in environments
+        that require quick lookups of reference and other like data.
+        This engine was formerly known as the <literal>HEAP</literal>
+        engine.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="merge-storage-engine"><literal>Merge</literal></link>
-        &mdash; Allows a MySQL DBA or developer to logically group a
-        series of identical <literal>MyISAM</literal> tables and
-        reference them as one object. Good for VLDB environments such as
-        data warehousing.
+        <link linkend="merge-storage-engine"><literal>Merge</literal></link>:
+        Allows a MySQL DBA or developer to logically group a series of
+        identical <literal>MyISAM</literal> tables and reference them as
+        one object. Good for VLDB environments such as data warehousing.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="archive-storage-engine"><literal>Archive</literal></link>
-        &mdash; Provides the perfect solution for storing and retrieving
-        large amounts of seldom-referenced historical, archived, or
-        security audit information.
+        <link linkend="archive-storage-engine"><literal>Archive</literal></link>:
+        Provides the perfect solution for storing and retrieving large
+        amounts of seldom-referenced historical, archived, or security
+        audit information.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="federated-storage-engine"><literal>Federated</literal></link>
-        &mdash; Offers the ability to link separate MySQL servers to
-        create one logical database from many physical servers. Very
-        good for distributed or data mart environments.
+        <link linkend="federated-storage-engine"><literal>Federated</literal></link>:
+        Offers the ability to link separate MySQL servers to create one
+        logical database from many physical servers. Very good for
+        distributed or data mart environments.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="csv-storage-engine"><literal>CSV</literal></link>
-        &mdash; The CSV storage engine stores data in text files using
+        <link linkend="csv-storage-engine"><literal>CSV</literal></link>:
+        The CSV storage engine stores data in text files using
         comma-separated values format. You can use the CSV engine to
         easily exchange data between other software and applications
         that can import and export in CSV format.

@@ -226,23 +225,23 @@
 
     <listitem>
       <para>
-        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>
-        &mdash; The Blackhole storage engine accepts but does not store
-        data and retrievals always return an empty set. The
-        functionality can be used in distributed database design where
-        data is automatically replicated, but not stored locally.
+        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>:
+        The Blackhole storage engine accepts but does not store data and
+        retrievals always return an empty set. The functionality can be
+        used in distributed database design where data is automatically
+        replicated, but not stored locally.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="example-storage-engine"><literal>Example</literal></link>
-        &mdash; The Example storage engine is <quote>stub</quote> engine
-        that does nothing. You can create tables with this engine, but
-        no data can be stored in them or retrieved from them. The
-        purpose of this engine is to serve as an example in the MySQL
-        source code that illustrates how to begin writing new storage
-        engines. As such, it is primarily of interest to developers.
+        <link linkend="example-storage-engine"><literal>Example</literal></link>:
+        The Example storage engine is <quote>stub</quote> engine that
+        does nothing. You can create tables with this engine, but no
+        data can be stored in them or retrieved from them. The purpose
+        of this engine is to serve as an example in the MySQL source
+        code that illustrates how to begin writing new storage engines.
+        As such, it is primarily of interest to developers.
       </para>
     </listitem>
 

@@ -402,16 +401,16 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=43">PrimeBase
-          XT (PBXT)</ulink></emphasis> &mdash; PBXT has been designed
-          for modern, web-based, high concurrency environments.
+          XT (PBXT)</ulink></emphasis>: PBXT has been designed for
+          modern, web-based, high concurrency environments.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>
-          &mdash; RitmarkFS allows you to access and manipulate the file
-          system using SQL queries. RitmarkFS also supports file system
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>:
+          RitmarkFS allows you to access and manipulate the file system
+          using SQL queries. RitmarkFS also supports file system
           replication and directory change tracking.
         </para>
       </listitem>

@@ -419,45 +418,42 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=91">Distributed
-          Data Engine</ulink></emphasis> &mdash; The Distributed Data
-          Engine is an Open Source project that is dedicated to provide
-          a Storage Engine for distributed data according to workload
-          statistics.
+          Data Engine</ulink></emphasis>: The Distributed Data Engine is
+          an Open Source project that is dedicated to provide a Storage
+          Engine for distributed data according to workload statistics.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>
-          &mdash; A pluggable storage engine that allows read-only
-          access to Microsoft Access <filename>.mdb</filename> database
-          files.
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>:
+          A pluggable storage engine that allows read-only access to
+          Microsoft Access <filename>.mdb</filename> database files.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=139">solidDB
-          for MySQL</ulink></emphasis> &mdash; solidDB Storage Engine
-          for MySQL is an open source, transactional storage engine for
-          MySQL Server. It is designed for mission-critical
-          implementations that require a robust, transactional database.
-          solidDB Storage Engine for MySQL is a multi-threaded storage
-          engine that supports full ACID compliance with all expected
-          transaction isolation levels, row-level locking, and
-          Multi-Version Concurrency Control (MVCC) with nonblocking
-          reads and writes.
+          for MySQL</ulink></emphasis>: solidDB Storage Engine for MySQL
+          is an open source, transactional storage engine for MySQL
+          Server. It is designed for mission-critical implementations
+          that require a robust, transactional database. solidDB Storage
+          Engine for MySQL is a multi-threaded storage engine that
+          supports full ACID compliance with all expected transaction
+          isolation levels, row-level locking, and Multi-Version
+          Concurrency Control (MVCC) with nonblocking reads and writes.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://www.blobstreaming.org/">BLOB
-          Streaming Engine (MyBS)</ulink></emphasis> &mdash; The
-          Scalable BLOB Streaming infrastructure for MySQL will
-          transform MySQL into a scalable media server capable of
-          streaming pictures, films, MP3 files and other binary and text
-          objects (BLOBs) directly in and out of the database.
+          Streaming Engine (MyBS)</ulink></emphasis>: The Scalable BLOB
+          Streaming infrastructure for MySQL will transform MySQL into a
+          scalable media server capable of streaming pictures, films,
+          MP3 files and other binary and text objects (BLOBs) directly
+          in and out of the database.
         </para>
       </listitem>
 

@@ -623,9 +619,9 @@
 
     <para>
       This efficient and modular architecture provides huge benefits for
-      those wishing to specifically target a particular application need
-      &mdash; such as data warehousing, transaction processing, or high
-      availability situations &mdash; while enjoying the advantage of
+      those wishing to specifically target a particular application
+      need&mdash;such as data warehousing, transaction processing, or
+      high availability situations&mdash;while enjoying the advantage of
       utilizing a set of interfaces and services that are independent of
       any one storage engine.
     </para>

@@ -737,11 +733,11 @@
 
         <listitem>
           <para>
-            <emphasis>Concurrency</emphasis> &mdash; some applications
-            have more granular lock requirements (such as row-level
-            locks) than others. Choosing the right locking strategy can
-            reduce overhead and therefore improve overall performance.
-            This area also includes support for capabilities such as
+            <emphasis>Concurrency</emphasis>: Some applications have
+            more granular lock requirements (such as row-level locks)
+            than others. Choosing the right locking strategy can reduce
+            overhead and therefore improve overall performance. This
+            area also includes support for capabilities such as
             multi-version concurrency control or <quote>snapshot</quote>
             read.
           </para>

@@ -749,7 +745,7 @@
 
         <listitem>
           <para>
-            <emphasis>Transaction Support</emphasis> &mdash; Not every
+            <emphasis>Transaction Support</emphasis>: Not every
             application needs transactions, but for those that do, there
             are very well defined requirements such as ACID compliance
             and more.

@@ -758,15 +754,15 @@
 
         <listitem>
           <para>
-            <emphasis>Referential Integrity</emphasis> &mdash; The need
-            to have the server enforce relational database referential
-            integrity through DDL defined foreign keys.
+            <emphasis>Referential Integrity</emphasis>: The need to have
+            the server enforce relational database referential integrity
+            through DDL defined foreign keys.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Physical Storage</emphasis> &mdash; This involves
+            <emphasis>Physical Storage</emphasis>: This involves
             everything from the overall page size for tables and indexes
             as well as the format used for storing data to physical
             disk.

@@ -775,29 +771,28 @@
 
         <listitem>
           <para>
-            <emphasis>Index Support</emphasis> &mdash; Different
-            application scenarios tend to benefit from different index
-            strategies. Each storage engine generally has its own
-            indexing methods, although some (such as B-tree indexes) are
-            common to nearly all engines.
+            <emphasis>Index Support</emphasis>: Different application
+            scenarios tend to benefit from different index strategies.
+            Each storage engine generally has its own indexing methods,
+            although some (such as B-tree indexes) are common to nearly
+            all engines.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Memory Caches</emphasis> &mdash; Different
-            applications respond better to some memory caching
-            strategies than others, so although some memory caches are
-            common to all storage engines (such as those used for user
-            connections or MySQL's high-speed Query Cache), others are
-            uniquely defined only when a particular storage engine is
-            put in play.
+            <emphasis>Memory Caches</emphasis>: Different applications
+            respond better to some memory caching strategies than
+            others, so although some memory caches are common to all
+            storage engines (such as those used for user connections or
+            MySQL's high-speed Query Cache), others are uniquely defined
+            only when a particular storage engine is put in play.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Performance Aids</emphasis> &mdash; This includes
+            <emphasis>Performance Aids</emphasis>: This includes
             multiple I/O threads for parallel operations, thread
             concurrency, database checkpointing, bulk insert handling,
             and more.

@@ -806,8 +801,8 @@
 
         <listitem>
           <para>
-            <emphasis>Miscellaneous Target Features</emphasis> &mdash;
-            This may include support for geospatial operations, security
+            <emphasis>Miscellaneous Target Features</emphasis>: This may
+            include support for geospatial operations, security
             restrictions for certain data manipulation operations, and
             other similar features.
           </para>


Modified: trunk/refman-5.5/tutorial.xml
===================================================================
--- trunk/refman-5.5/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-5.5/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -557,7 +557,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1610,8 +1610,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Modified: trunk/refman-6.0/charset-tmp.xml
===================================================================
--- trunk/refman-6.0/charset-tmp.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/charset-tmp.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 7, Lines Added: 11, Lines Deleted: 13; 3452 bytes

@@ -4945,8 +4945,8 @@
     <para>
       <firstterm>Metadata</firstterm> is <quote>the data about the
       data.</quote> Anything that <emphasis>describes</emphasis> the
-      database &mdash; as opposed to being the
-      <emphasis>contents</emphasis> of the database &mdash; is metadata.
+      database&mdash;as opposed to being the
+      <emphasis>contents</emphasis> of the database&mdash;is metadata.
       Thus column names, database names, user names, version names, and
       most of the string results from
       <literal role="stmt">SHOW</literal> are metadata. This is also

@@ -5912,9 +5912,8 @@
         sorted. It is applicable to the UCS character repertoire. Since
         every character repertoire is a subset of the UCS repertoire,
         the UCS_BASIC collation is potentially applicable to every
-        character set. NOTE 11 &mdash; The Unicode scalar value of a
-        character is its code point treated as an unsigned
-        integer.</quote>
+        character set. NOTE 11: The Unicode scalar value of a character
+        is its code point treated as an unsigned integer.</quote>
       </para>
 
       <para>

@@ -7078,7 +7077,7 @@
           <literal>cp932</literal>. In addition to the characters
           supported by <literal>Shift_JIS</literal>,
           <literal>cp932</literal> supports extension characters such as
-          NEC special characters, NEC selected &mdash; IBM extended
+          NEC special characters, NEC selected&mdash;IBM extended
           characters, and IBM extended characters.
         </para>
 

@@ -7149,7 +7148,7 @@
           <listitem>
             <para>
               <literal>cp932</literal> supports NEC special characters,
-              NEC selected &mdash; IBM extended characters, and IBM
+              NEC selected&mdash;IBM extended characters, and IBM
               selected characters.
             </para>
           </listitem>

@@ -7189,7 +7188,7 @@
               <listitem>
                 <para>
                   If the character is in both IBM selected characters
-                  and NEC selected &mdash; IBM extended characters, use
+                  and NEC selected&mdash;IBM extended characters, use
                   the code point of IBM extended characters.
                 </para>
               </listitem>

@@ -7233,7 +7232,7 @@
 
               <listitem>
                 <para>
-                  NEC selected &mdash; IBM extended characters:
+                  NEC selected&mdash;IBM extended characters:
                 </para>
 
 <programlisting>

@@ -9317,10 +9316,9 @@
     or both), these may be displayed incorrectly in output from the
     client or the output itself may be formatted incorrectly. In such
     cases, starting the mysql client with
-    <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-    &mdash; that is, setting the client character set to match the
-    system character set &mdash; should fix the problem.
+    <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+    is, setting the client character set to match the system character
+    set&mdash;should fix the problem.
   </para>
 
   <para>


Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/data-types.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1075 bytes

@@ -3645,7 +3645,7 @@
 </programlisting>
 
         <para>
-          Otherwise &mdash; that is, if the
+          Otherwise&mdash;that is, if the
           <literal role="type">TIMESTAMP</literal> column is defined to
           allow <literal>NULL</literal> values but not using
           <literal>DEFAULT CURRENT_TIMESTAMP</literal>, as shown

@@ -4872,7 +4872,7 @@
         If you wish to use a number as an enumeration value, you must
         enclose it in quotation marks. If the quotation marks are
         omitted, the number is regarded as an index. For this and other
-        reasons &mdash; as explained later in this section &mdash; we
+        reasons&mdash;as explained later in this section&mdash;we
         strongly recommend that you do <emphasis>not</emphasis> use
         numbers as enumeration values.
       </para>


Modified: trunk/refman-6.0/dba-log-files.xml
===================================================================
--- trunk/refman-6.0/dba-log-files.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/dba-log-files.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1365 bytes

@@ -998,8 +998,8 @@
       it failed, and an
       <literal role="stmt" condition="insert-on-duplicate">INSERT ... ON
       DUPLICATE KEY UPDATE</literal> statement that encountered a
-      duplicate key constraint &mdash; but did not actually change any
-      data &mdash; was not logged. Beginning with MySQL 6.0.4, both of
+      duplicate key constraint&mdash;but did not actually change any
+      data&mdash;was not logged. Beginning with MySQL 6.0.4, both of
       these statements are written to the binary log. (Bug#23333)
     </para>
 

@@ -1500,9 +1500,9 @@
         <listitem>
           <para>
             When the body of a view requires row-based replication, the
-            statement creating the view also uses it &mdash; for
-            example, this occurs when the statement creating a view uses
-            the <literal role="func">UUID()</literal> function.
+            statement creating the view also uses it. For example, this
+            occurs when the statement creating a view uses the
+            <literal role="func">UUID()</literal> function.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 889 bytes

@@ -9096,9 +9096,9 @@
           The <literal role="sysvar">rand_seed1</literal> and
           <literal role="sysvar">rand_seed2</literal> variables exist as
           session variables only, and can be set but not read. Beginning
-          with MySQL 6.0.5, the variables &mdash; but not their values
-          &mdash; are shown in the output of <literal role="stmt">SHOW
-          VARIABLES</literal>.
+          with MySQL 6.0.5, the variables&mdash;but not their
+          values&mdash;are shown in the output of
+          <literal role="stmt">SHOW VARIABLES</literal>.
         </para>
 
         <para>


Modified: trunk/refman-6.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-6.0/dba-privilege-system.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/dba-privilege-system.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 1059 bytes

@@ -454,11 +454,10 @@
           <para>
             In some circumstances, the
             <literal role="priv">ALTER</literal> privilege is entirely
-            unnecessary &mdash; on slaves where there are no
-            nonreplicated tables, for instance. The MySQL Enterprise
-            Monitor notifies subscribers when accounts have
-            inappropriate privileges. For more information, see
-            &base-url-enterprise;advisors.html.
+            unnecessary&mdash;on slaves where there are no nonreplicated
+            tables, for instance. The MySQL Enterprise Monitor notifies
+            subscribers when accounts have inappropriate privileges. For
+            more information, see &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/errors-problems.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 7; 1882 bytes

@@ -1380,9 +1380,9 @@
           <para>
             Subscribers to the MySQL Enterprise Monitor receive advice
             on dynamically configuring the
-            <literal role="sysvar">max_connections</literal> variable
-            &mdash; avoiding failed connection attempts. For more
-            information, see &base-url-enterprise;advisors.html.
+            <literal role="sysvar">max_connections</literal> variable to
+            avoid failed connection attempts. For more information, see
+            &base-url-enterprise;advisors.html.
           </para>
 
         </formalpara>

@@ -1639,9 +1639,9 @@
               fail (for example, if the DNS server on which your server
               or network relies goes down). This is because MySQL is
               dependent on the host system for name resolution, but has
-              no way of knowing whether it is working &mdash; from
-              MySQL's point of view the problem is indistinguishable
-              from any other network timeout.
+              no way of knowing whether it is working&mdash;from MySQL's
+              point of view the problem is indistinguishable from any
+              other network timeout.
             </para>
 
             <para>

@@ -5078,7 +5078,7 @@
           been defined as <literal role="type">DECIMAL</literal> rather
           than <literal role="type">DOUBLE</literal>, the result of the
           <literal role="stmt">SELECT</literal> query would have
-          contained only one row &mdash; the last one shown above.
+          contained only one row&mdash;the last one shown above.
         </para>
 
         <para>


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/functions-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 1719 bytes

@@ -14284,11 +14284,11 @@
 
         <para>
           If no matching text node is found for the expression
-          (including the implicit <literal>/text()</literal>) &mdash;
-          for whatever reason, as long as
+          (including the implicit <literal>/text()</literal>)&mdash;for
+          whatever reason, as long as
           <replaceable>xpath_expr</replaceable> is valid, and
           <replaceable>xml_frag</replaceable> consists of elements which
-          are properly nested and closed &mdash; an empty string is
+          are properly nested and closed&mdash;an empty string is
           returned. No distinction is made between a match on an empty
           element and no match at all. This is by design.
         </para>

@@ -14807,10 +14807,10 @@
           <listitem>
             <para>
               Locators prefixed with expressions that evaluate as scalar
-              values &mdash; including variable references, literals,
-              numbers,and scalar function calls &mdash; are not
-              supported. Beginning with MySQL 6.0.10, they are
-              disallowed, and their use results in an error. (Bug#42495)
+              values&mdash;including variable references, literals,
+              numbers,and scalar function calls&mdash;are not supported.
+              Beginning with MySQL 6.0.10, they are disallowed, and
+              their use results in an error. (Bug#42495)
             </para>
           </listitem>
 


Modified: trunk/refman-6.0/information-schema.xml
===================================================================
--- trunk/refman-6.0/information-schema.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/information-schema.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 736 bytes

@@ -4270,8 +4270,8 @@
       <listitem>
         <para>
           <literal>DATA_LENGTH</literal>: The total length of all rows
-          stored in this partition or subpartition, in bytes &mdash;
-          that is, the total number of bytes stored in the partition or
+          stored in this partition or subpartition, in bytes&mdash;that
+          is, the total number of bytes stored in the partition or
           subpartition.
         </para>
       </listitem>


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/installing-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1560 bytes

@@ -2715,10 +2715,10 @@
           <xref linkend="mysql-install-wizard-starting"/>. Rather than
           opening a port, you also have the option of adding MySQL as a
           program that bypasses the Windows Firewall. One or the other
-          option is sufficient &mdash; you need not do both.
-          Additionally, when running the MySQL Server Configuration
-          Wizard on Windows Vista ensure that you are logged in as a
-          user with administrative rights.
+          option is sufficient&mdash;you need not do both. Additionally,
+          when running the MySQL Server Configuration Wizard on Windows
+          Vista ensure that you are logged in as a user with
+          administrative rights.
         </para>
 
         <mediaobject>

@@ -11653,8 +11653,8 @@
             created. These are superuser accounts that can do anything.
             The initial <literal>root</literal> account passwords are
             empty, so anyone can connect to the MySQL server as
-            <literal>root</literal> &mdash; <emphasis>without a
-            password</emphasis> &mdash; and be granted all privileges.
+            <literal>root</literal>&mdash;<emphasis>without a
+            password</emphasis>&mdash;and be granted all privileges.
           </para>
 
           <itemizedlist>


Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/internationalization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 7, Lines Added: 16, Lines Deleted: 17; 4024 bytes

@@ -5138,10 +5138,10 @@
       <para>
         <firstterm>Metadata</firstterm> is <quote>the data about the
         data.</quote> Anything that <emphasis>describes</emphasis> the
-        database &mdash; as opposed to being the
-        <emphasis>contents</emphasis> of the database &mdash; is
-        metadata. Thus column names, database names, user names, version
-        names, and most of the string results from
+        database&mdash;as opposed to being the
+        <emphasis>contents</emphasis> of the database&mdash;is metadata.
+        Thus column names, database names, user names, version names,
+        and most of the string results from
         <literal role="stmt">SHOW</literal> are metadata. This is also
         true of the contents of tables in
         <literal>INFORMATION_SCHEMA</literal> because those tables by

@@ -6119,9 +6119,9 @@
           characters in the strings being sorted. It is applicable to
           the UCS character repertoire. Since every character repertoire
           is a subset of the UCS repertoire, the UCS_BASIC collation is
-          potentially applicable to every character set. NOTE 11 &mdash;
-          The Unicode scalar value of a character is its code point
-          treated as an unsigned integer.</quote>
+          potentially applicable to every character set. NOTE 11: The
+          Unicode scalar value of a character is its code point treated
+          as an unsigned integer.</quote>
         </para>
 
         <para>

@@ -7296,7 +7296,7 @@
             <literal>cp932</literal>. In addition to the characters
             supported by <literal>Shift_JIS</literal>,
             <literal>cp932</literal> supports extension characters such
-            as NEC special characters, NEC selected &mdash; IBM extended
+            as NEC special characters, NEC selected&mdash;IBM extended
             characters, and IBM extended characters.
           </para>
 

@@ -7367,8 +7367,8 @@
             <listitem>
               <para>
                 <literal>cp932</literal> supports NEC special
-                characters, NEC selected &mdash; IBM extended
-                characters, and IBM selected characters.
+                characters, NEC selected&mdash;IBM extended characters,
+                and IBM selected characters.
               </para>
             </listitem>
 

@@ -7408,8 +7408,8 @@
                 <listitem>
                   <para>
                     If the character is in both IBM selected characters
-                    and NEC selected &mdash; IBM extended characters,
-                    use the code point of IBM extended characters.
+                    and NEC selected&mdash;IBM extended characters, use
+                    the code point of IBM extended characters.
                   </para>
                 </listitem>
 

@@ -7452,7 +7452,7 @@
 
                 <listitem>
                   <para>
-                    NEC selected &mdash; IBM extended characters:
+                    NEC selected&mdash;IBM extended characters:
                   </para>
 
 <programlisting>

@@ -9559,10 +9559,9 @@
       values, or both), these may be displayed incorrectly in output
       from the client or the output itself may be formatted incorrectly.
       In such cases, starting the mysql client with
-      <option
-role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>
-      &mdash; that is, setting the client character set to match the
-      system character set &mdash; should fix the problem.
+      <option role="mysql">--default-character-set=<replaceable>system_character_set</replaceable></option>&mdash;that
+      is, setting the client character set to match the system character
+      set&mdash;should fix the problem.
     </para>
 
     <para>


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/optimization.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1905 bytes

@@ -953,8 +953,8 @@
                 <literal role="jointype">const</literal> types, this is
                 the best possible join type. It is used when all parts
                 of an index are used by the join and the index is a
-                <literal>PRIMARY KEY</literal> or
-                <literal>UNIQUE NOT NULL</literal> index.
+                <literal>PRIMARY KEY</literal> or <literal>UNIQUE NOT
+                NULL</literal> index.
               </para>
 
               <para>

@@ -11331,10 +11331,10 @@
 
         <para>
           Often, it is not possible to predict exactly what indexes will
-          be required or will be most efficient &mdash; actual table
-          usage is the best indicator. The MySQL Enterprise Monitor
-          provides expert advice on this topic. For more information,
-          see &base-url-enterprise;advisors.html.
+          be required or will be most efficient&mdash;actual table usage
+          is the best indicator. The MySQL Enterprise Monitor provides
+          expert advice on this topic. For more information, see
+          &base-url-enterprise;advisors.html.
         </para>
 
       </formalpara>

@@ -17212,8 +17212,8 @@
           the <literal>State</literal> column for the master's
           <literal>Binlog Dump</literal> thread. If you see no
           <literal>Binlog Dump</literal> threads on a master server,
-          this means that replication is not running &mdash; that is,
-          that no slaves are currently connected.
+          this means that replication is not running&mdash;that is, that
+          no slaves are currently connected.
         </para>
 
         <itemizedlist>


Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/partitioning.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 13, Lines Added: 43, Lines Deleted: 41; 8744 bytes

@@ -312,13 +312,14 @@
     </para>
 
     <para>
-      This is known as <firstterm>horizontal partitioning</firstterm>
-      &mdash; that is, different rows of a table may be assigned to
-      different physical partitions. MySQL &current-series; does not
-      support <firstterm>vertical partitioning</firstterm>, in which
-      different columns of a table are assigned to different physical
-      partitions. There are not at this time any plans to introduce
-      vertical partitioning into MySQL &current-series;.
+      This is known as <firstterm>horizontal
+      partitioning</firstterm>&mdash;that is, different rows of a table
+      may be assigned to different physical partitions. MySQL
+      &current-series; does not support <firstterm>vertical
+      partitioning</firstterm>, in which different columns of a table
+      are assigned to different physical partitions. There are not at
+      this time any plans to introduce vertical partitioning into MySQL
+      &current-series;.
     </para>
 
     <para>

@@ -715,8 +716,8 @@
     </para>
 
     <para>
-      It is important to remember &mdash; regardless of the type of
-      partitioning that you use &mdash; that partitions are always
+      It is important to remember&mdash;regardless of the type of
+      partitioning that you use&mdash;that partitions are always
       numbered automatically and in sequence when created, starting with
       <literal>0</literal>. When a new row is inserted into a
       partitioned table, it is these partition numbers that are used in

@@ -897,23 +898,23 @@
         bound</firstterm>). Now, any rows whose
         <literal>store_id</literal> column value is greater than or
         equal to 16 (the highest value defined) are stored in partition
-        <literal>p3</literal>. At some point in the future &mdash; when
-        the number of stores has increased to 25, 30, or more &mdash;
-        you can use an <literal role="stmt">ALTER TABLE</literal>
-        statement to add new partitions for stores 21-25, 26-30, and so
-        on (see <xref linkend="partitioning-management"/>, for details
-        of how to do this).
+        <literal>p3</literal>. At some point in the future&mdash;when
+        the number of stores has increased to 25, 30, or more&mdash;you
+        can use an <literal role="stmt">ALTER TABLE</literal> statement
+        to add new partitions for stores 21-25, 26-30, and so on (see
+        <xref linkend="partitioning-management"/>, for details of how to
+        do this).
       </para>
 
       <para>
         In much the same fashion, you could partition the table based on
-        employee job codes &mdash; that is, based on ranges of
-        <literal>job_code</literal> column values. For example &mdash;
-        assuming that two-digit job codes are used for regular
-        (in-store) workers, three-digit codes are used for office and
-        support personnel, and four-digit codes are used for management
-        positions &mdash; you could create the partitioned table using
-        the following:
+        employee job codes&mdash;that is, based on ranges of
+        <literal>job_code</literal> column values. For
+        example&mdash;assuming that two-digit job codes are used for
+        regular (in-store) workers, three-digit codes are used for
+        office and support personnel, and four-digit codes are used for
+        management positions&mdash;you could create the partitioned
+        table using the following:
       </para>
 
 <programlisting>

@@ -1117,9 +1118,10 @@
       <note>
         <para>
           In MySQL &current-series;, it is possible to match against
-          only a list of integers (and possibly <literal>NULL</literal>
-          &mdash; see <xref linkend="partitioning-handling-nulls"/>)
-          when partitioning by <literal>LIST</literal>.
+          only a list of integers (and possibly
+          <literal>NULL</literal>&mdash;see
+          <xref linkend="partitioning-handling-nulls"/>) when
+          partitioning by <literal>LIST</literal>.
         </para>
       </note>
 

@@ -1538,8 +1540,8 @@
 
       <para>
         The user function is evaluated each time a record is inserted or
-        updated. It may also &mdash; depending on the circumstances
-        &mdash; be evaluated when records are deleted.
+        updated. It may also&mdash;depending on the
+        circumstances&mdash;be evaluated when records are deleted.
       </para>
 
       <note>

@@ -1910,8 +1912,8 @@
       </indexterm>
 
       <para>
-        Subpartitioning &mdash; also known as <firstterm>composite
-        partitioning</firstterm> &mdash; is the further division of each
+        Subpartitioning&mdash;also known as <firstterm>composite
+        partitioning</firstterm>&mdash;is the further division of each
         partition in a partitioned table. For example, consider the
         following <literal role="stmt">CREATE TABLE</literal> statement:
       </para>

@@ -1929,9 +1931,9 @@
 
       <para>
         Table <literal>ts</literal> has 3 <literal>RANGE</literal>
-        partitions. Each of these partitions &mdash;
-        <literal>p0</literal>, <literal>p1</literal>, and
-        <literal>p2</literal> &mdash; is further divided into 2
+        partitions. Each of these
+        partitions&mdash;<literal>p0</literal>, <literal>p1</literal>,
+        and <literal>p2</literal>&mdash;is further divided into 2
         subpartitions. In effect, the entire table is divided into
         <literal>3 * 2 = 6</literal> partitions. However, due to the
         action of the <literal>PARTITION BY RANGE</literal> clause, the

@@ -2219,7 +2221,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 first subpartition (<literal>s1a</literal>) are stored
-                on <filename>/disk4</filename> &mdash; the data in
+                on <filename>/disk4</filename>&mdash;the data in
                 <filename>/disk4/data</filename>, and the indexes in
                 <filename>/disk4/idx</filename>.
               </para>

@@ -2229,7 +2231,7 @@
               <para>
                 Data and indexes belonging to <literal>p1</literal>'s
                 second subpartition (<literal>s1b</literal>) are stored
-                on <filename>/disk5</filename> &mdash; the data in
+                on <filename>/disk5</filename>&mdash;the data in
                 <filename>/disk5/data</filename>, and the indexes in
                 <filename>/disk5/idx</filename>.
               </para>

@@ -3141,7 +3143,7 @@
         <literal>p1</literal>, and add <literal>np</literal> and then a
         new <literal>p1</literal> with a modified definition. However,
         as discussed earlier, this would result in the loss of all data
-        stored in <literal>p1</literal> &mdash; and it is often the case
+        stored in <literal>p1</literal>&mdash;and it is often the case
         that this is not what you really want to do. Another solution
         might appear to be to make a copy of the table with the new
         partitioning and to copy the data into it using

@@ -3497,7 +3499,7 @@
       <para>
         Note that the number following <literal>COALESCE
         PARTITION</literal> is the number of partitions to merge into
-        the remainder &mdash; in other words, it is the number of
+        the remainder&mdash;in other words, it is the number of
         partitions to remove from the table.
       </para>
 

@@ -4468,7 +4470,7 @@
             permitted in partitioning expressions. However, the result
             must be an integer value or <literal>NULL</literal> (except
             in the case of <literal>[LINEAR] KEY</literal> partitioning,
-            as discussed elswhere in this chapter &mdash; see
+            as discussed elswhere in this chapter; see
             <xref linkend="partitioning-types"/>, for more information).
           </para>
 

@@ -5493,10 +5495,10 @@
 </programlisting>
 
       <para>
-        If a table has no unique keys &mdash; this includes having no
-        primary key &mdash; then this restriction does not apply, and
-        you may use any column or columns in the partitioning expression
-        as long as the column type is compatible with the partitioning
+        If a table has no unique keys&mdash;this includes having no
+        primary key&mdash;then this restriction does not apply, and you
+        may use any column or columns in the partitioning expression as
+        long as the column type is compatible with the partitioning
         type.
       </para>
 


Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/replication-configuration.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 14; 3434 bytes

@@ -1250,10 +1250,10 @@
               slave. (If this option was not set explicitly on the
               existing slave, use
               <literal><replaceable>existing_slave_hostname</replaceable>-relay-bin.index</literal>.)
-              Alternatively &mdash; if you have already tried to start
-              the new slave (after following the remaining steps in this
+              Alternatively&mdash;if you have already tried to start the
+              new slave (after following the remaining steps in this
               section) and have encountered errors like those described
-              previously &mdash; then perform the following steps:
+              previously&mdash;then perform the following steps:
 
               <orderedlist>
 

@@ -1444,12 +1444,12 @@
       setting the <literal role="sysvar">binlog_format</literal> server
       system variable. This variable can be set with session or global
       scope. The rules governing when and how the new setting takes
-      effect are the same as for other MySQL server system variables
-      &mdash; setting the variable for the current session lasts only
-      until the end of that session, and the change is not visible to
-      other sessions; setting the variable globally requires a restart
-      of the server in order to take effect. For more information, see
-      <xref linkend="set-option"/>.
+      effect are the same as for other MySQL server system
+      variables&mdash;setting the variable for the current session lasts
+      only until the end of that session, and the change is not visible
+      to other sessions; setting the variable globally requires a
+      restart of the server in order to take effect. For more
+      information, see <xref linkend="set-option"/>.
     </para>
 
     <para>

@@ -1818,11 +1818,11 @@
             <literal>mysql</literal> database is instead seen as a
             node-specific database. Row-based replication is not
             supported on tables in this database. Instead, statements
-            that would normally update this information &mdash; such as
+            that would normally update this information&mdash;such as
             <literal role="stmt">GRANT</literal>,
             <literal role="stmt">REVOKE</literal> and the manipulation
             of triggers, stored routines (including stored procedures),
-            and views &mdash; are all replicated to slaves using
+            and views&mdash;are all replicated to slaves using
             statement-based replication.
           </para>
 

@@ -2393,9 +2393,9 @@
             caught up with the master, but there are some cases where
             this is not strictly true. For example, this can occur if
             the network connection between master and slave is broken
-            but the slave I/O thread has not yet noticed this &mdash;
-            that is, <literal role="sysvar">slave_net_timeout</literal>
-            has not yet elapsed.
+            but the slave I/O thread has not yet noticed this&mdash;that
+            is, <literal role="sysvar">slave_net_timeout</literal> has
+            not yet elapsed.
           </para>
 
           <para>


Modified: trunk/refman-6.0/replication-multi-master-upgrade.xml
===================================================================
--- trunk/refman-6.0/replication-multi-master-upgrade.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/replication-multi-master-upgrade.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 657 bytes

@@ -386,7 +386,7 @@
               </textobject>
             </mediaobject>
 
-            This is not the same marker as the previous one &mdash; in
+            This is not the same marker as the previous one&mdash;in
             fact, the best <quote>marker</quote> to use here is the end
             of C&apos;s binary log.
           </para>


Modified: trunk/refman-6.0/replication-notes.xml
===================================================================
--- trunk/refman-6.0/replication-notes.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/replication-notes.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 5, Lines Added: 18, Lines Deleted: 18; 4040 bytes

@@ -1246,9 +1246,10 @@
 
             <para>
               Promotion between <literal role="type">INT</literal>
-              subtypes &mdash; for example, from
-              <literal>SMALLINT</literal> to <literal>BIGINT</literal>
-              &mdash; was also not supported prior to MySQL 6.0.14.
+              subtypes&mdash;for example, from
+              <literal>SMALLINT</literal> to
+              <literal>BIGINT</literal>&mdash;was also not supported
+              prior to MySQL 6.0.14.
             </para>
           </listitem>
 

@@ -2207,12 +2208,12 @@
         <para>
           Temporary tables are replicated except in the case where you
           stop the slave server (not just the slave threads) and you
-          have replicated temporary tables that are open for use in updates that
-          have not yet been executed on the slave. If you stop the slave
-          server, the temporary tables needed by those updates are no
-          longer available when the slave is restarted. To avoid this
-          problem, do not shut down the slave while it has temporary
-          tables open. Instead, use the following procedure:
+          have replicated temporary tables that are open for use in
+          updates that have not yet been executed on the slave. If you
+          stop the slave server, the temporary tables needed by those
+          updates are no longer available when the slave is restarted.
+          To avoid this problem, do not shut down the slave while it has
+          temporary tables open. Instead, use the following procedure:
         </para>
 
       </formalpara>

@@ -2315,10 +2316,10 @@
         the value of <literal role="sysvar">binlog_format</literal>; if
         this value is <literal>MIXED</literal>, these statements are
         replicated using row-based format. However, statements that
-        would normally update this information indirectly &mdash; such
+        would normally update this information indirectly&mdash;such
         <literal role="stmt">GRANT</literal>,
         <literal role="stmt">REVOKE</literal>, and statements
-        manipulating triggers, stored routines, and views &mdash; are
+        manipulating triggers, stored routines, and views&mdash;are
         replicated to slaves using statement-based replication.
       </para>
 

@@ -2800,10 +2801,9 @@
       <para>
         Beginning with MySQL 6.0.10, it is also safe to replicate
         transactions from <literal role="se">MyISAM</literal> tables on
-        the master to transactional tables &mdash; such as tables that
-        use the <literal role="se">InnoDB</literal> storage engine
-        &mdash; on the slave. In such cases (beginning with MySQL
-        6.0.10), an
+        the master to transactional tables&mdash;such as tables that use
+        the <literal role="se">InnoDB</literal> storage engine&mdash;on
+        the slave. In such cases (beginning with MySQL 6.0.10), an
         <literal role="sysvar" condition="autocommit">AUTOCOMMIT=1</literal>
         statement issued on the master is replicated, thus enforcing
         <literal>AUTOCOMMIT</literal> mode on the slave.

@@ -2859,9 +2859,9 @@
       </para>
 
       <para>
-        If you want triggers to execute on both the master and the slave
-        &mdash; perhaps because you have different triggers on the
-        master and slave &mdash; then you must use statement-based
+        If you want triggers to execute on both the master and the
+        slave&mdash;perhaps because you have different triggers on the
+        master and slave&mdash;then you must use statement-based
         replication. However, it is not necessary to use statement-based
         replication exclusively if you want to enable slave-side
         triggers; it is sufficient in such cases to switch to


Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/replication-options-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 3837 bytes

@@ -1209,8 +1209,8 @@
           row-based replication, the
           <literal role="stmt">UPDATE</literal> would change
           <literal>table1</literal> on the slave, but not
-          <literal>table2</literal> &mdash; in other words, only tables
-          in the database named by
+          <literal>table2</literal>&mdash;in other words, only tables in
+          the database named by
           <option role="mysqld">--replicate-do-db</option> are changed,
           and the choice of default database has no effect on this
           behavior.

@@ -2342,7 +2342,7 @@
           transactions. The default value of
           <literal role="sysvar">sync_relay_log_info</literal> is 0
           (recommended in most situations), which does not force any
-          synchronization to disk by the MySQL server &mdash; in this
+          synchronization to disk by the MySQL server&mdash;in this
           case, the server relies on the operating system to flush the
           <filename>master.info</filename> file&apos;s contents from
           time to time as for any other file.

@@ -2378,7 +2378,7 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_relay_log</literal> is 0, which
-          does no synchronizing to disk &mdash; in this case, the server
+          does no synchronizing to disk&mdash;in this case, the server
           relies on the operating system to flush the relay log&apos;s
           contents from time to time as for any other file. A value of 1
           is the safest choice because in the event of a crash you lose

@@ -2417,10 +2417,9 @@
           The default value of
           <literal role="sysvar">sync_relay_log_info</literal> is 0,
           which does not force any synchronization to disk by the MySQL
-          server &mdash; in this case, the server relies on the
-          operating system to flush the
-          <filename>relay-log.info</filename> file&apos;s contents from
-          time to time as for any other file.
+          server&mdash;in this case, the server relies on the operating
+          system to flush the <filename>relay-log.info</filename>
+          file&apos;s contents from time to time as for any other file.
         </para>
 
         <para>

@@ -2753,7 +2752,7 @@
           statement is not written to the binary log when using
           statement-based logging. However, when using row-based
           logging, the change to <literal>table1</literal> is logged,
-          but not that to <literal>table2</literal> &mdash; in other
+          but not that to <literal>table2</literal>&mdash;in other
           words, only changes to tables in the database named by
           <option role="mysqld">--binlog-do-db</option> are logged, and
           the choice of default database has no effect on this behavior.

@@ -3272,8 +3271,8 @@
           if autocommit is enabled, and one write per transaction
           otherwise. The default value of
           <literal role="sysvar">sync_binlog</literal> is 0, which does
-          no synchronizing to disk &mdash; in this case, the server
-          relies on the operating system to flush the binary log&apos;s
+          no synchronizing to disk&mdash;in this case, the server relies
+          on the operating system to flush the binary log&apos;s
           contents from to time as for any other file. A value of 1 is
           the safest choice because in the event of a crash you lose at
           most one statement or transaction from the binary log.


Modified: trunk/refman-6.0/replication-solutions.xml
===================================================================
--- trunk/refman-6.0/replication-solutions.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/replication-solutions.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1041 bytes

@@ -1390,7 +1390,7 @@
           <para>
             Similarly, in a scenario which features a single master
             replicating to several slaves, we need only upgrade all of
-            the slaves first &mdash; in any order &mdash; and then the
+            the slaves first&mdash;in any order&mdash;and then the
             master, as the relationship is still purely linear.
           </para>
 -->

@@ -1749,7 +1749,7 @@
                 </textobject>
               </mediaobject>
 
-              This is not the same marker as the previous one &mdash; in
+              This is not the same marker as the previous one&mdash;in
               fact, the best <quote>marker</quote> to use here is the
               end of C&apos;s binary log.
             </para>


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/restrictions.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1215 bytes

@@ -402,11 +402,11 @@
           <literal>YEAR_MONTH</literal> are resolved in months; those
           using any other interval are resolved in seconds. There is no
           way to cause events scheduled to occur at the same second to
-          execute in a given order. In addition &mdash; due to rounding,
+          execute in a given order. In addition&mdash;due to rounding,
           the nature of threaded applications, and the fact that a
           nonzero length of time is required to create events and to
-          signal their execution &mdash; events may be delayed by as
-          much as 1 or 2 seconds. However, the time shown in the
+          signal their execution&mdash;events may be delayed by as much
+          as 1 or 2 seconds. However, the time shown in the
           <literal role="is">INFORMATION_SCHEMA.EVENTS</literal> table's
           <literal>LAST_EXECUTED</literal> column or the
           <literal>mysql.event</literal> table's


Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 6, Lines Added: 17, Lines Deleted: 18; 3999 bytes

@@ -1773,8 +1773,8 @@
           implemented for nonpartitioned tables by statements such as
           <literal role="stmt">CHECK TABLE</literal> and
           <literal role="stmt">REPAIR TABLE</literal> (which are also
-          supported for partitioned tables, beginning with MySQL 6.0.6
-          &mdash; see note at the end of this item). These include
+          supported for partitioned tables, beginning with MySQL
+          6.0.6&mdash;see note at the end of this item). These include
           <literal>ANALYZE PARTITION</literal>, <literal>CHECK
           PARTITION</literal>, <literal>OPTIMIZE PARTITION</literal>,
           <literal>REBUILD PARTITION</literal>, and <literal>REPAIR

@@ -2320,11 +2320,10 @@
 
     <para>
       The previous statement creates an event named
-      <literal>myevent</literal>. This event executes once &mdash; one
-      hour following its creation &mdash; by running an SQL statement
-      that increments the value of the
-      <literal>myschema.mytable</literal> table's
-      <literal>mycol</literal> column by 1.
+      <literal>myevent</literal>. This event executes once&mdash;one
+      hour following its creation&mdash;by running an SQL statement that
+      increments the value of the <literal>myschema.mytable</literal>
+      table's <literal>mycol</literal> column by 1.
     </para>
 
     <para>

@@ -2467,8 +2466,8 @@
 
         <para>
           <literal role="stmt">CREATE EVENT</literal> statements which
-          are themselves invalid &mdash; for whatever reason &mdash;
-          fail with an error.
+          are themselves invalid&mdash;for whatever reason&mdash;fail
+          with an error.
         </para>
 
         <para>

@@ -2479,10 +2478,10 @@
 
         <para>
           To create an event which occurs at some point in the future
-          relative to the current date and time &mdash; such as that
-          expressed by the phrase <quote>three weeks from now</quote>
-          &mdash; you can use the optional clause <literal>+ INTERVAL
-          <replaceable>interval</replaceable></literal>. The
+          relative to the current date and time&mdash;such as that
+          expressed by the phrase <quote>three weeks from
+          now</quote>&mdash;you can use the optional clause <literal>+
+          INTERVAL <replaceable>interval</replaceable></literal>. The
           <replaceable>interval</replaceable> portion consists of two
           parts, a quantity and a unit of time, and follows the same
           syntax rules that govern intervals used in the

@@ -2538,7 +2537,7 @@
           STARTS CURRENT_TIMESTAMP + INTERVAL '6:15'
           HOUR_MINUTE</literal>. Not specifying
           <literal>STARTS</literal> is the same as using <literal>STARTS
-          CURRENT_TIMESTAMP</literal> &mdash; that is, the action
+          CURRENT_TIMESTAMP</literal>&mdash;that is, the action
           specified for the event begins repeating immediately upon
           creation of the event.
         </para>

@@ -5515,10 +5514,10 @@
       <replaceable>num</replaceable>, where
       <replaceable>num</replaceable> is the number of partitions. (The
       maximum number of user-defined partitions which a table may
-      contain is 1024; the number of subpartitions &mdash; discussed
-      later in this section &mdash; is included in this maximum.) The
-      choices that are available for this function in MySQL
-      &current-series; are shown in the following list:
+      contain is 1024; the number of subpartitions&mdash;discussed later
+      in this section&mdash;is included in this maximum.) The choices
+      that are available for this function in MySQL &current-series; are
+      shown in the following list:
     </para>
 
     <itemizedlist>


Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 4, Lines Added: 7, Lines Deleted: 6; 2324 bytes

@@ -3861,8 +3861,8 @@
     </para>
 
     <para>
-      The inverse of the above operation &mdash; that is, dumping MySQL
-      table data into an XML file &mdash; can be accomplished using the
+      The inverse of the above operation&mdash;that is, dumping MySQL
+      table data into an XML file&mdash;can be accomplished using the
       mysql client from the system shell, as shown here:
     </para>
 

@@ -4230,8 +4230,9 @@
     <para>
       <literal role="stmt">REPLACE</literal> is a MySQL extension to the
       SQL standard. It either inserts, or <emphasis>deletes</emphasis>
-      and inserts. For another MySQL extension to standard SQL &mdash;
-      that either inserts or <emphasis>updates</emphasis> &mdash; see
+      and inserts. For another MySQL extension to standard
+      SQL&mdash;that either inserts or
+      <emphasis>updates</emphasis>&mdash;see
       <xref linkend="insert-on-duplicate"/>.
     </para>
 

@@ -8481,7 +8482,7 @@
       <para>
         A <literal>LEFT [OUTER] JOIN</literal> can be faster than an
         equivalent subquery because the server might be able to optimize
-        it better &mdash; a fact that is not specific to MySQL Server
+        it better&mdash;a fact that is not specific to MySQL Server
         alone. Prior to SQL-92, outer joins did not exist, so subqueries
         were the only way to do certain things. Today, MySQL Server and
         many other modern database systems offer a wide range of outer

@@ -8723,7 +8724,7 @@
       Beginning with MySQL 6.0.10, <literal role="stmt">TRUNCATE
       TABLE</literal> is treated for purposes of binary logging and
       replication as <literal role="stmt">DROP TABLE</literal> followed
-      by <literal role="stmt">CREATE TABLE</literal> &mdash; that is, as
+      by <literal role="stmt">CREATE TABLE</literal>&mdash;that is, as
       DDL rather than DML. This is due to the fact that, when using
       <literal role="se">InnoDB</literal> and other transactional
       storage engines where the transaction isolation level does not


Modified: trunk/refman-6.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-replication.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/sql-syntax-replication.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 807 bytes

@@ -940,8 +940,8 @@
       </note>
 
       <para>
-        In MySQL 6.0 &mdash; unlike the case in MySQL 5.1 and earlier
-        &mdash; <literal>RESET SLAVE</literal> no longer changes
+        In MySQL 6.0&mdash;unlike the case in MySQL 5.1 and
+        earlier&mdash;<literal>RESET SLAVE</literal> no longer changes
         replication connection parameters such as master host, master
         port, master user, and master password. (This means that
         <literal role="stmt">START SLAVE</literal> can be issued without


Modified: trunk/refman-6.0/storage-engines-core.xml
===================================================================
--- trunk/refman-6.0/storage-engines-core.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/storage-engines-core.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 14, Lines Added: 98, Lines Deleted: 103; 17892 bytes

@@ -156,9 +156,9 @@
 
     <listitem>
       <para>
-        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>
-        &mdash; The default MySQL storage engine and the one that is
-        used the most in Web, data warehousing, and other application
+        <link linkend="myisam-storage-engine"><literal>MyISAM</literal></link>:
+        The default MySQL storage engine and the one that is used the
+        most in Web, data warehousing, and other application
         environments. <literal>MyISAM</literal> is supported in all
         MySQL configurations, and is the default storage engine unless
         you have configured MySQL to use a different one by default.

@@ -167,15 +167,15 @@
 
     <listitem>
       <para>
-        <link linkend="innodb"><literal>InnoDB</literal></link> &mdash;
-        A transaction-safe (ACID compliant) storage engine for MySQL
-        that has commit, rollback, and crash-recovery capabilities to
-        protect user data. <literal>InnoDB</literal> row-level locking
-        (without escalation to coarser granularity locks) and
-        Oracle-style consistent nonlocking reads increase multi-user
-        concurrency and performance. <literal>InnoDB</literal> stores
-        user data in clustered indexes to reduce I/O for common queries
-        based on primary keys. To maintain data integrity,
+        <link linkend="innodb"><literal>InnoDB</literal></link>: A
+        transaction-safe (ACID compliant) storage engine for MySQL that
+        has commit, rollback, and crash-recovery capabilities to protect
+        user data. <literal>InnoDB</literal> row-level locking (without
+        escalation to coarser granularity locks) and Oracle-style
+        consistent nonlocking reads increase multi-user concurrency and
+        performance. <literal>InnoDB</literal> stores user data in
+        clustered indexes to reduce I/O for common queries based on
+        primary keys. To maintain data integrity,
         <literal>InnoDB</literal> also supports <literal>FOREIGN
         KEY</literal> referential-integrity constraints.
       </para>

@@ -183,8 +183,8 @@
 
     <listitem>
       <para>
-        <link linkend="se-falcon"><literal>Falcon</literal></link>
-        &mdash; Designed with modern database requirements in mind, and
+        <link linkend="se-falcon"><literal>Falcon</literal></link>:
+        Designed with modern database requirements in mind, and
         particularly for use within high-volume web serving or other
         environment that requires high performance, while still
         supporting the transactional and logging functionality required

@@ -199,8 +199,8 @@
 
     <listitem>
       <para>
-        <link linkend="se-maria"><literal>Maria</literal></link> &mdash;
-        A crash safe version of <literal>MyISAM</literal>. The
+        <link linkend="se-maria"><literal>Maria</literal></link>: A
+        crash safe version of <literal>MyISAM</literal>. The
         <literal>Maria</literal> storage engine supports all of the main
         functionality of the <literal>MyISAM</literal> engine, but
         includes recovery support (in the event of a system crash), full

@@ -214,46 +214,45 @@
 
     <listitem>
       <para>
-        <link linkend="memory-storage-engine"><literal>Memory</literal></link>
-        &mdash; Stores all data in RAM for extremely fast access in
-        environments that require quick lookups of reference and other
-        like data. This engine was formerly known as the
-        <literal>HEAP</literal> engine.
+        <link linkend="memory-storage-engine"><literal>Memory</literal></link>:
+        Stores all data in RAM for extremely fast access in environments
+        that require quick lookups of reference and other like data.
+        This engine was formerly known as the <literal>HEAP</literal>
+        engine.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="merge-storage-engine"><literal>Merge</literal></link>
-        &mdash; Allows a MySQL DBA or developer to logically group a
-        series of identical <literal>MyISAM</literal> tables and
-        reference them as one object. Good for VLDB environments such as
-        data warehousing.
+        <link linkend="merge-storage-engine"><literal>Merge</literal></link>:
+        Allows a MySQL DBA or developer to logically group a series of
+        identical <literal>MyISAM</literal> tables and reference them as
+        one object. Good for VLDB environments such as data warehousing.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="archive-storage-engine"><literal>Archive</literal></link>
-        &mdash; Provides the perfect solution for storing and retrieving
-        large amounts of seldom-referenced historical, archived, or
-        security audit information.
+        <link linkend="archive-storage-engine"><literal>Archive</literal></link>:
+        Provides the perfect solution for storing and retrieving large
+        amounts of seldom-referenced historical, archived, or security
+        audit information.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="federated-storage-engine"><literal>Federated</literal></link>
-        &mdash; Offers the ability to link separate MySQL servers to
-        create one logical database from many physical servers. Very
-        good for distributed or data mart environments.
+        <link linkend="federated-storage-engine"><literal>Federated</literal></link>:
+        Offers the ability to link separate MySQL servers to create one
+        logical database from many physical servers. Very good for
+        distributed or data mart environments.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="csv-storage-engine"><literal>CSV</literal></link>
-        &mdash; The CSV storage engine stores data in text files using
+        <link linkend="csv-storage-engine"><literal>CSV</literal></link>:
+        The CSV storage engine stores data in text files using
         comma-separated values format. You can use the CSV engine to
         easily exchange data between other software and applications
         that can import and export in CSV format.

@@ -262,23 +261,23 @@
 
     <listitem>
       <para>
-        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>
-        &mdash; The Blackhole storage engine accepts but does not store
-        data and retrievals always return an empty set. The
-        functionality can be used in distributed database design where
-        data is automatically replicated, but not stored locally.
+        <link linkend="blackhole-storage-engine"><literal>Blackhole</literal></link>:
+        The Blackhole storage engine accepts but does not store data and
+        retrievals always return an empty set. The functionality can be
+        used in distributed database design where data is automatically
+        replicated, but not stored locally.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <link linkend="example-storage-engine"><literal>Example</literal></link>
-        &mdash; The Example storage engine is <quote>stub</quote> engine
-        that does nothing. You can create tables with this engine, but
-        no data can be stored in them or retrieved from them. The
-        purpose of this engine is to serve as an example in the MySQL
-        source code that illustrates how to begin writing new storage
-        engines. As such, it is primarily of interest to developers.
+        <link linkend="example-storage-engine"><literal>Example</literal></link>:
+        The Example storage engine is <quote>stub</quote> engine that
+        does nothing. You can create tables with this engine, but no
+        data can be stored in them or retrieved from them. The purpose
+        of this engine is to serve as an example in the MySQL source
+        code that illustrates how to begin writing new storage engines.
+        As such, it is primarily of interest to developers.
       </para>
     </listitem>
 

@@ -455,16 +454,16 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=43">PrimeBase
-          XT (PBXT)</ulink></emphasis> &mdash; PBXT has been designed
-          for modern, web-based, high concurrency environments.
+          XT (PBXT)</ulink></emphasis>: PBXT has been designed for
+          modern, web-based, high concurrency environments.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>
-          &mdash; RitmarkFS allows you to access and manipulate the file
-          system using SQL queries. RitmarkFS also supports file system
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=82">RitmarkFS</ulink></emphasis>:
+          RitmarkFS allows you to access and manipulate the file system
+          using SQL queries. RitmarkFS also supports file system
           replication and directory change tracking.
         </para>
       </listitem>

@@ -472,45 +471,42 @@
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=91">Distributed
-          Data Engine</ulink></emphasis> &mdash; The Distributed Data
-          Engine is an Open Source project that is dedicated to provide
-          a Storage Engine for distributed data according to workload
-          statistics.
+          Data Engine</ulink></emphasis>: The Distributed Data Engine is
+          an Open Source project that is dedicated to provide a Storage
+          Engine for distributed data according to workload statistics.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>
-          &mdash; A pluggable storage engine that allows read-only
-          access to Microsoft Access <filename>.mdb</filename> database
-          files.
+          <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=98">mdbtools</ulink></emphasis>:
+          A pluggable storage engine that allows read-only access to
+          Microsoft Access <filename>.mdb</filename> database files.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://forge.mysql.com/projects/project.php?id=139">solidDB
-          for MySQL</ulink></emphasis> &mdash; solidDB Storage Engine
-          for MySQL is an open source, transactional storage engine for
-          MySQL Server. It is designed for mission-critical
-          implementations that require a robust, transactional database.
-          solidDB Storage Engine for MySQL is a multi-threaded storage
-          engine that supports full ACID compliance with all expected
-          transaction isolation levels, row-level locking, and
-          Multi-Version Concurrency Control (MVCC) with nonblocking
-          reads and writes.
+          for MySQL</ulink></emphasis>: solidDB Storage Engine for MySQL
+          is an open source, transactional storage engine for MySQL
+          Server. It is designed for mission-critical implementations
+          that require a robust, transactional database. solidDB Storage
+          Engine for MySQL is a multi-threaded storage engine that
+          supports full ACID compliance with all expected transaction
+          isolation levels, row-level locking, and Multi-Version
+          Concurrency Control (MVCC) with nonblocking reads and writes.
         </para>
       </listitem>
 
       <listitem>
         <para>
           <emphasis role="bold"><ulink url="http://www.blobstreaming.org/">BLOB
-          Streaming Engine (MyBS)</ulink></emphasis> &mdash; The
-          Scalable BLOB Streaming infrastructure for MySQL will
-          transform MySQL into a scalable media server capable of
-          streaming pictures, films, MP3 files and other binary and text
-          objects (BLOBs) directly in and out of the database.
+          Streaming Engine (MyBS)</ulink></emphasis>: The Scalable BLOB
+          Streaming infrastructure for MySQL will transform MySQL into a
+          scalable media server capable of streaming pictures, films,
+          MP3 files and other binary and text objects (BLOBs) directly
+          in and out of the database.
         </para>
       </listitem>
 

@@ -676,9 +672,9 @@
 
     <para>
       This efficient and modular architecture provides huge benefits for
-      those wishing to specifically target a particular application need
-      &mdash; such as data warehousing, transaction processing, or high
-      availability situations &mdash; while enjoying the advantage of
+      those wishing to specifically target a particular application
+      need&mdash;such as data warehousing, transaction processing, or
+      high availability situations&mdash;while enjoying the advantage of
       utilizing a set of interfaces and services that are independent of
       any one storage engine.
     </para>

@@ -725,11 +721,11 @@
 
         <listitem>
           <para>
-            <emphasis>Concurrency</emphasis> &mdash; some applications
-            have more granular lock requirements (such as row-level
-            locks) than others. Choosing the right locking strategy can
-            reduce overhead and therefore improve overall performance.
-            This area also includes support for capabilities such as
+            <emphasis>Concurrency</emphasis>: Some applications have
+            more granular lock requirements (such as row-level locks)
+            than others. Choosing the right locking strategy can reduce
+            overhead and therefore improve overall performance. This
+            area also includes support for capabilities such as
             multi-version concurrency control or <quote>snapshot</quote>
             read.
           </para>

@@ -737,7 +733,7 @@
 
         <listitem>
           <para>
-            <emphasis>Transaction Support</emphasis> &mdash; Not every
+            <emphasis>Transaction Support</emphasis>: Not every
             application needs transactions, but for those that do, there
             are very well defined requirements such as ACID compliance
             and more.

@@ -746,15 +742,15 @@
 
         <listitem>
           <para>
-            <emphasis>Referential Integrity</emphasis> &mdash; The need
-            to have the server enforce relational database referential
-            integrity through DDL defined foreign keys.
+            <emphasis>Referential Integrity</emphasis>: The need to have
+            the server enforce relational database referential integrity
+            through DDL defined foreign keys.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Physical Storage</emphasis> &mdash; This involves
+            <emphasis>Physical Storage</emphasis>: This involves
             everything from the overall page size for tables and indexes
             as well as the format used for storing data to physical
             disk.

@@ -763,29 +759,28 @@
 
         <listitem>
           <para>
-            <emphasis>Index Support</emphasis> &mdash; Different
-            application scenarios tend to benefit from different index
-            strategies. Each storage engine generally has its own
-            indexing methods, although some (such as B-tree indexes) are
-            common to nearly all engines.
+            <emphasis>Index Support</emphasis>: Different application
+            scenarios tend to benefit from different index strategies.
+            Each storage engine generally has its own indexing methods,
+            although some (such as B-tree indexes) are common to nearly
+            all engines.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Memory Caches</emphasis> &mdash; Different
-            applications respond better to some memory caching
-            strategies than others, so although some memory caches are
-            common to all storage engines (such as those used for user
-            connections or MySQL's high-speed Query Cache), others are
-            uniquely defined only when a particular storage engine is
-            put in play.
+            <emphasis>Memory Caches</emphasis>: Different applications
+            respond better to some memory caching strategies than
+            others, so although some memory caches are common to all
+            storage engines (such as those used for user connections or
+            MySQL's high-speed Query Cache), others are uniquely defined
+            only when a particular storage engine is put in play.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis>Performance Aids</emphasis> &mdash; This includes
+            <emphasis>Performance Aids</emphasis>: This includes
             multiple I/O threads for parallel operations, thread
             concurrency, database checkpointing, bulk insert handling,
             and more.

@@ -794,8 +789,8 @@
 
         <listitem>
           <para>
-            <emphasis>Miscellaneous Target Features</emphasis> &mdash;
-            This may include support for geospatial operations, security
+            <emphasis>Miscellaneous Target Features</emphasis>: This may
+            include support for geospatial operations, security
             restrictions for certain data manipulation operations, and
             other similar features.
           </para>


Modified: trunk/refman-6.0/tutorial.xml
===================================================================
--- trunk/refman-6.0/tutorial.xml	2010-05-16 20:49:26 UTC (rev 20660)
+++ trunk/refman-6.0/tutorial.xml	2010-05-16 21:33:48 UTC (rev 20661)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1305 bytes

@@ -557,7 +557,7 @@
       <literal>"&gt;</literal>, and <literal>`&gt;</literal> prompts
       signify, because if you mistakenly enter an unterminated string,
       any further lines you type appear to be ignored by
-      <command>mysql</command> &mdash; including a line containing
+      <command>mysql</command>&mdash;including a line containing
       <literal>QUIT</literal>. This can be quite confusing, especially
       if you do not know that you need to supply the terminating quote
       before you can cancel the current command.

@@ -1610,8 +1610,8 @@
 </programlisting>
 
         <para>
-          On character type columns, sorting &mdash; like all other
-          comparison operations &mdash; is normally performed in a
+          On character type columns, sorting&mdash;like all other
+          comparison operations&mdash;is normally performed in a
           case-insensitive fashion. This means that the order is
           undefined for columns that are identical except for their
           case. You can force a case-sensitive sort for a column by


Thread
svn commit - mysqldoc@docsrva: r20661 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-5.5 refman-6.0paul.dubois16 May