List:Commits« Previous MessageNext Message »
From:paul Date:January 20 2006 5:46pm
Subject:svn commit - mysqldoc@docsrva: r950 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-20 18:46:29 +0100 (Fri, 20 Jan 2006)
New Revision: 950

Log:
 r2387@kite-hub:  paul | 2006-01-20 11:38:32 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/charset.xml
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-mxj.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/connector-mxj.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-mxj.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/tutorial.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6472
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2335
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6472
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2387

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/charset.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1824,7 +1824,8 @@
       <para>
         The character that causes the different sort orders in this
         example is the U with two dots over it
-        (<literal>&uuml;</literal>), which the Germans call "U-umlaut".
+        (<literal>&uuml;</literal>), which the Germans call
+        <quote>U-umlaut.</quote>
       </para>
 
       <itemizedlist>
@@ -2200,12 +2201,12 @@
     <para>
       In UCS-2 (binary Unicode representation), every character is
       represented by a two-byte Unicode code with the most significant
-      byte first. For example: "LATIN CAPITAL LETTER A" has the code
-      <literal>0x0041</literal> and it is stored as a two-byte sequence:
-      <literal>0x00 0x41</literal>. "CYRILLIC SMALL LETTER YERU"
-      (Unicode <literal>0x044B</literal>) is stored as a two-byte
-      sequence: <literal>0x04 0x4B</literal>. For Unicode characters and
-      their codes, please refer to the
+      byte first. For example: <literal>LATIN CAPITAL LETTER A</literal>
+      has the code <literal>0x0041</literal> and it is stored as a
+      two-byte sequence: <literal>0x00 0x41</literal>. <literal>CYRILLIC
+      SMALL LETTER YERU</literal> (Unicode <literal>0x044B</literal>) is
+      stored as a two-byte sequence: <literal>0x04 0x4B</literal>. For
+      Unicode characters and their codes, please refer to the
       <ulink url="http://www.unicode.org/">Unicode Home Page</ulink>.
     </para>
 

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -6661,9 +6661,9 @@
           <literal>FLUSH...</literal> is issued, the MySQL server may
           get stalled until that long statement finishes, and then the
           dump becomes lock-free. So if the MySQL server receives only
-          short (in the sense of "short execution time") updating
-          statements, even if there are plenty of them, the initial lock
-          period should not be noticeable.
+          short (in the sense of <quote>short execution time</quote>)
+          updating statements, even if there are plenty of them, the
+          initial lock period should not be noticeable.
         </para>
 
 <programlisting>

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/connector-j.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1167,18 +1167,19 @@
 
           <listitem>
             <para>
-              Unicode Character Sets - See the next section, as well as
-              the "Character Sets" section in the server manual for
+              Unicode Character Sets &mdash; See the next section, as well as
+<xref linkend="charset"/>,
+for
               information on this new feature of MySQL. If you have
               something misconfigured, it will usually show up as an
-              error with a message similar to 'Illegal mix of
-              collations'.
+              error with a message similar to <literal>Illegal mix of
+              collations</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <emphasis>Server-side Prepared Statements</emphasis> -
+              <emphasis>Server-side Prepared Statements</emphasis> &mdash;
               Connector/J 3.1 will automatically detect and use
               server-side prepared statements when they are available
               (MySQL server version 4.1.0 and newer).
@@ -1212,7 +1213,7 @@
 
           <listitem>
             <para>
-              Datetimes with all-zero components ('0000-00-00 ...') -
+              Datetimes with all-zero components ('0000-00-00 ...') &mdash;
               These values can not be represented reliably in Java.
               Connector/J 3.0.x always converted them to NULL when being
               read from a ResultSet.
@@ -1246,7 +1247,7 @@
 
           <listitem>
             <para>
-              New SQLState Codes - Connector/J 3.1 uses SQL:1999
+              New SQLState Codes &mdash; Connector/J 3.1 uses SQL:1999
               SQLState codes returned by the MySQL server (if
               supported), which are different than the
               <quote>legacy</quote> X/Open state codes that Connector/J
@@ -1776,7 +1777,7 @@
                 when you are unable to configure your application to
                 handle SQLExceptions resulting from dead andstale
                 connections properly. Alternatively, investigate setting
-                the MySQL server variable "wait_timeout"to some high
+                the MySQL <literal>wait_timeout</literal> system variable to some high
                 value rather than the default of 8 hours.</entry>
               <entry>No</entry>
               <entry>false</entry>
@@ -3654,11 +3655,11 @@
         An application signals that it wants a transaction to be
         read-only by calling
         <function>Connection.setReadOnly(true)</function>, this
-        "replication-aware" connection will use one of the slave
+        <quote>replication-aware</quote> connection will use one of the slave
         connections, which are load-balanced per-vm using a round-robin
         scheme (a given connection is <quote>sticky</quote> to a slave
         unless that slave is removed from service). If you have a write
-        transaction, or if you have a read that is "time-sensitive"
+        transaction, or if you have a read that is <quote>time-sensitive</quote>
         (remember, replication in MySQL is asynchronous), set the
         connection to be not read-only, by calling
         <function>Connection.setReadOnly(false)</function> and the
@@ -3794,7 +3795,7 @@
         </para>
 
         <para>
-          When the connection is "loaned out" from the pool, it is used
+          When the connection is <quote>loaned out</quote> from the pool, it is used
           exclusively by the thread that requested it. From a
           programming point of view, it is the same as if your thread
           called DriverManager.getConnection() every time it needed a
@@ -3820,7 +3821,7 @@
               connection setup that MySQL offers compared to other
               databases, creating new JDBC connections still incurs
               networking and JDBC driver overhead that will be avoided
-              if connections are "recycled."
+              if connections are <quote>recycled.</quote>
             </para>
           </listitem>
 
@@ -3994,7 +3995,7 @@
           code (exceptions, flow-of-control, and so forth), connections,
           and anything created by them (such as statements or result
           sets) are closed, so that they may be re-used, otherwise they
-          will be "stranded," which in the best case means that the
+          will be <quote>stranded,</quote> which in the best case means that the
           MySQL server resources they represent (such as buffers, locks,
           or sockets) may be tied up for some time, or worst case, may
           be tied up forever.
@@ -4006,7 +4007,7 @@
 
         <para>
           As with all other configuration rules-of-thumb, the answer is
-          "It depends." Although the optimal size depends on anticipated
+          <quote>It depends.</quote> Although the optimal size depends on anticipated
           load and average database transaction time, the optimum
           connection pool size is smaller than you might expect. If you
           take Sun's Java Petstore blueprint application for example, a
@@ -4024,7 +4025,7 @@
         <para>
           An easy way to determine a starting point is to configure your
           connection pool's maximum number of connections to be
-          "unbounded," run a load test, and measure the largest amount
+          <quote>unbounded,</quote> run a load test, and measure the largest amount
           of concurrently used connections. You can then work backward
           from there to determine what values of minimum and maximum
           pooled connections give the best performance for your
@@ -4536,7 +4537,7 @@
               MySQL closes connections after 8 hours of inactivity. You
               either need to use a connection pool that handles stale
               connections or use the "autoReconnect" parameter (see
-              "Developing Applications with MySQL Connector/J").
+              <xref linkend="cj-configuration-properties"/>).
             </para>
 
             <para>

Modified: trunk/refman-4.1/connector-mxj.xml
===================================================================
--- trunk/refman-4.1/connector-mxj.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/connector-mxj.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -442,13 +442,13 @@
     <title>Running within a Java Object</title>
 
     <para>
-      Have a java application and wish to "embed" a MySQL database, make
-      use of the com.mysql.management.MysqldResource class directly.
-      This class may be instantiated with the default (no argument)
-      constructor, or by passing in a java.io.File object representing
-      the directory you wish the server to be "unzipped" into. It may
-      also be instantiated with printstreams for "stdout" and "stderr"
-      for logging.
+      Have a java application and wish to <quote>embed</quote> a MySQL
+      database, make use of the com.mysql.management.MysqldResource
+      class directly. This class may be instantiated with the default
+      (no argument) constructor, or by passing in a java.io.File object
+      representing the directory you wish the server to be "unzipped"
+      into. It may also be instantiated with printstreams for "stdout"
+      and "stderr" for logging.
     </para>
 
     <para>
@@ -617,10 +617,10 @@
         </para>
 
         <para>
-          The default "Kill Delay" is 30 seconds. This represents the
-          amount of time to wait between the initial request to shutdown
-          and issuing a "force kill" if the database has not shutdown by
-          itself.
+          The default <quote>Kill Delay</quote> is 30 seconds. This
+          represents the amount of time to wait between the initial
+          request to shutdown and issuing a <quote>force kill</quote> if
+          the database has not shutdown by itself.
         </para>
       </listitem>
 

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -2098,12 +2098,12 @@
       <title>&title-data-source-name;</title>
 
       <para>
-        A "data source" is a place where data comes from. The data
-        source must have a persistent identifier, the Data Source Name.
-        Using the Data Source Name, MySQL can access initialization
-        information. With the initialization information, MySQL knows
-        where to access the database and what settings to use when the
-        access starts.
+        A <firstterm>data source</firstterm> is a place where data comes
+        from. The data source must have a persistent identifier, the
+        Data Source Name. Using the Data Source Name, MySQL can access
+        initialization information. With the initialization information,
+        MySQL knows where to access the database and what settings to
+        use when the access starts.
       </para>
 
       <para>
@@ -2126,13 +2126,15 @@
 
       <para>
         If the information is in the Windows registry, it is called a
-        "Machine data source". It might be a "User data source", in
-        which case only one user can see it. Or it might be a "System
-        data source" in which case it is accessible to all users on the
-        computer, or indeed to all users connected to the computer, if
-        the users are connected by Microsoft Windows NT services. When
-        you run the ODBC Data Administration program, you have a choice
-        whether to use "User" or "System" -- there are separate tabs.
+        <firstterm>Machine data source</firstterm>. It might be a
+        <firstterm>User data source</firstterm>, in which case only one
+        user can see it. Or it might be a <firstterm>System data
+        source</firstterm> in which case it is accessible to all users
+        on the computer, or indeed to all users connected to the
+        computer, if the users are connected by Microsoft Windows NT
+        services. When you run the ODBC Data Administration program, you
+        have a choice whether to use "User" or "System" -- there are
+        separate tabs.
       </para>
 
       <para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/database-administration.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -3001,7 +3001,7 @@
               <literal>max_connections + table_cache*2</literal>
               (whichever is larger) number of files. You should try
               increasing this if <command>mysqld</command> gives you the
-              error "Too many open files."
+              error <literal>Too many open files</literal>.
             </para>
           </listitem>
 
@@ -21319,8 +21319,8 @@
             server is started with
             <literal>binlog-do-db=sales</literal>, and you run
             <literal>USE prices; UPDATE sales.january SET
-            amount=amount+1000;</literal>, this statement does <emphasis>not</emphasis> get
-            written into the binary log.
+            amount=amount+1000;</literal>, this statement does
+            <emphasis>not</emphasis> get written into the binary log.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -203,10 +203,10 @@
 
     <para>
       <emphasis role="bold">Note</emphasis>: In many contexts, the term
-      "node" is used to indicate a computer, but when discussing MySQL
-      Cluster it means a <emphasis>process</emphasis>. There can be any
-      number of nodes on a single computer, for which we use the term
-      <emphasis role="bold">cluster host</emphasis>.
+      <quote>node</quote> is used to indicate a computer, but when
+      discussing MySQL Cluster it means a <emphasis>process</emphasis>.
+      There can be any number of nodes on a single computer, for which
+      we use the term <emphasis role="bold">cluster host</emphasis>.
     </para>
 
     <para>
@@ -1149,7 +1149,7 @@
       <para>
         (<emphasis role="bold">NOTE</emphasis>: The "world" database can
         be downloaded from <ulink url="&base-url-docs;"/> where it can
-        be found listed under "Examples".)
+        be found listed under <quote>Examples.</quote>)
       </para>
 
       <para>
@@ -4544,9 +4544,9 @@
               All update activities also need to be logged. This log
               makes it possible to replay these updates whenever the
               system is restarted. The NDB recovery algorithm uses a
-              "fuzzy" checkpoint of the data together with the UNDO log,
-              and then applies the REDO log to play back all changes up
-              to the restoration point.
+              <quote>fuzzy</quote> checkpoint of the data together with
+              the UNDO log, and then applies the REDO log to play back
+              all changes up to the restoration point.
             </para>
 
             <para>

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -16306,8 +16306,8 @@
           <listitem>
             <para>
               If the thread is waiting for free disk space in a write
-              call, the write is aborted with a "disk full" error
-              message.
+              call, the write is aborted with a <quote>disk full</quote>
+              error message.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-4.1/tutorial.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -145,26 +145,26 @@
       The <literal>mysql&gt;</literal> prompt tells you that
       <command>mysql</command> is ready for you to enter commands.
     </para>
-    
+
     <para>
       If you are logging in on the same machine that MySQL is running
       on, you can omit the host, and simply use the following:
     </para>
-    
+
 <programlisting>
 shell&lt; <userinput>mysql -u <replaceable>user</replaceable> -p</userinput>
 </programlisting>
-    
+
     <para>
       If, when you attempt to log in, you get an error message such as
       <errortext>ERROR 2002 (HY000): Can't connect to local MySQL server
-        through socket '/tmp/mysql.sock' (2)</errortext>, it means that
+      through socket '/tmp/mysql.sock' (2)</errortext>, it means that
       that MySQL server daemon (Unix) or service (Windows) is not
-      running. Consult the administrator or see the section of 
+      running. Consult the administrator or see the section of
       <xref linkend="installing"/> that is appropriate to your operating
       system.
     </para>
-    
+
     <para>
       For help with other problems often encountered when trying to log
       in, see <xref linkend="common-errors"/>.
@@ -760,14 +760,14 @@
         recommended best practice is always to use the same lettercase
         that was used when the database was created.)
       </para>
-      
+
       <para>
         <emphasis role="bold">Note</emphasis>: If you get an error such
         as <errortext>ERROR 1044 (42000): Access denied for user
-          'monty'@'localhost' to database 'menagerie'</errortext> when
+        'monty'@'localhost' to database 'menagerie'</errortext> when
         attempting to create a database, this means that your user
         account does not have the necessary privileges to do so. Discuss
-        this with the administrator or see 
+        this with the administrator or see
         <xref linkend="privilege-system"/>.
       </para>
 
@@ -1196,7 +1196,7 @@
         form, you supply values for each column, in the order in which
         the columns were listed in the <literal>CREATE TABLE</literal>
         statement. Suppose that Diane gets a new hamster named
-        "Puffball". You could add a new record using an
+        <quote>Puffball.</quote> You could add a new record using an
         <literal>INSERT</literal> statement like this:
       </para>
 
@@ -2040,10 +2040,10 @@
           assume that it is not possible to insert a zero or an empty
           string into a column defined as <literal>NOT NULL</literal>,
           but this is not the case. These are in fact values, whereas
-          <literal>NULL</literal> means "not having a value". You can
-          test this easily enough by using <literal>IS
-          </literal>[<literal>NOT</literal>]<literal> NULL</literal> as
-          shown:
+          <literal>NULL</literal> means <quote>not having a
+          value.</quote> You can test this easily enough by using
+          <literal>IS </literal>[<literal>NOT</literal>]<literal>
+          NULL</literal> as shown:
         </para>
 
 <programlisting>
@@ -3605,9 +3605,9 @@
 
       <para>
         The use of <literal>REFERENCES</literal> in this way as a
-        comment or "reminder" in a column definition works with both
-        <literal>MyISAM</literal> and <literal>BerkeleyDB</literal>
-        tables.
+        comment or <quote>reminder</quote> in a column definition works
+        with both <literal>MyISAM</literal> and
+        <literal>BerkeleyDB</literal> tables.
       </para>
 
     </section>

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/charset.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1735,7 +1735,7 @@
       <para>
         The character that causes the different sort orders in this
         example is the U with two dots over it
-        (<literal>&uuml;</literal>), which the Germans call "U-umlaut".
+        (<literal>&uuml;</literal>), which the Germans call <quote>U-umlaut.</quote>
       </para>
 
       <itemizedlist>
@@ -2122,9 +2122,9 @@
     <para>
       In UCS-2 (binary Unicode representation), every character is
       represented by a two-byte Unicode code with the most significant
-      byte first. For example: "LATIN CAPITAL LETTER A" has the code
+      byte first. For example: <literal>LATIN CAPITAL LETTER A</literal> has the code
       <literal>0x0041</literal> and it is stored as a two-byte sequence:
-      <literal>0x00 0x41</literal>. "CYRILLIC SMALL LETTER YERU"
+      <literal>0x00 0x41</literal>. <literal>CYRILLIC SMALL LETTER YERU</literal>
       (Unicode <literal>0x044B</literal>) is stored as a two-byte
       sequence: <literal>0x04 0x4B</literal>. For Unicode characters and
       their codes, please refer to the

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -6888,7 +6888,7 @@
           <literal>FLUSH...</literal> is issued, the MySQL server may
           get stalled until that long statement finishes, and then the
           dump becomes lock-free. So if the MySQL server receives only
-          short (in the sense of "short execution time") updating
+          short (in the sense of <quote>short execution time</quote>) updating
           statements, even if there are plenty of them, the initial lock
           period should not be noticeable.
         </para>

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/connector-j.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1167,18 +1167,19 @@
 
           <listitem>
             <para>
-              Unicode Character Sets - See the next section, as well as
-              the "Character Sets" section in the server manual for
+              Unicode Character Sets &mdash; See the next section, as well as
+<xref linkend="charset"/>,
+for
               information on this new feature of MySQL. If you have
               something misconfigured, it will usually show up as an
-              error with a message similar to 'Illegal mix of
-              collations'.
+              error with a message similar to <literal>Illegal mix of
+              collations</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <emphasis>Server-side Prepared Statements</emphasis> -
+              <emphasis>Server-side Prepared Statements</emphasis> &mdash;
               Connector/J 3.1 will automatically detect and use
               server-side prepared statements when they are available
               (MySQL server version 4.1.0 and newer).
@@ -1212,7 +1213,7 @@
 
           <listitem>
             <para>
-              Datetimes with all-zero components ('0000-00-00 ...') -
+              Datetimes with all-zero components ('0000-00-00 ...') &mdash;
               These values can not be represented reliably in Java.
               Connector/J 3.0.x always converted them to NULL when being
               read from a ResultSet.
@@ -1246,7 +1247,7 @@
 
           <listitem>
             <para>
-              New SQLState Codes - Connector/J 3.1 uses SQL:1999
+              New SQLState Codes &mdash; Connector/J 3.1 uses SQL:1999
               SQLState codes returned by the MySQL server (if
               supported), which are different than the
               <quote>legacy</quote> X/Open state codes that Connector/J
@@ -1776,7 +1777,7 @@
                 when you are unable to configure your application to
                 handle SQLExceptions resulting from dead andstale
                 connections properly. Alternatively, investigate setting
-                the MySQL server variable "wait_timeout"to some high
+                the MySQL <literal>wait_timeout</literal> system variable to some high
                 value rather than the default of 8 hours.</entry>
               <entry>No</entry>
               <entry>false</entry>
@@ -3654,11 +3655,11 @@
         An application signals that it wants a transaction to be
         read-only by calling
         <function>Connection.setReadOnly(true)</function>, this
-        "replication-aware" connection will use one of the slave
+        <quote>replication-aware</quote> connection will use one of the slave
         connections, which are load-balanced per-vm using a round-robin
         scheme (a given connection is <quote>sticky</quote> to a slave
         unless that slave is removed from service). If you have a write
-        transaction, or if you have a read that is "time-sensitive"
+        transaction, or if you have a read that is <quote>time-sensitive</quote>
         (remember, replication in MySQL is asynchronous), set the
         connection to be not read-only, by calling
         <function>Connection.setReadOnly(false)</function> and the
@@ -3794,7 +3795,7 @@
         </para>
 
         <para>
-          When the connection is "loaned out" from the pool, it is used
+          When the connection is <quote>loaned out</quote> from the pool, it is used
           exclusively by the thread that requested it. From a
           programming point of view, it is the same as if your thread
           called DriverManager.getConnection() every time it needed a
@@ -3820,7 +3821,7 @@
               connection setup that MySQL offers compared to other
               databases, creating new JDBC connections still incurs
               networking and JDBC driver overhead that will be avoided
-              if connections are "recycled."
+              if connections are <quote>recycled.</quote>
             </para>
           </listitem>
 
@@ -3994,7 +3995,7 @@
           code (exceptions, flow-of-control, and so forth), connections,
           and anything created by them (such as statements or result
           sets) are closed, so that they may be re-used, otherwise they
-          will be "stranded," which in the best case means that the
+          will be <quote>stranded,</quote> which in the best case means that the
           MySQL server resources they represent (such as buffers, locks,
           or sockets) may be tied up for some time, or worst case, may
           be tied up forever.
@@ -4006,7 +4007,7 @@
 
         <para>
           As with all other configuration rules-of-thumb, the answer is
-          "It depends." Although the optimal size depends on anticipated
+          <quote>It depends.</quote> Although the optimal size depends on anticipated
           load and average database transaction time, the optimum
           connection pool size is smaller than you might expect. If you
           take Sun's Java Petstore blueprint application for example, a
@@ -4024,7 +4025,7 @@
         <para>
           An easy way to determine a starting point is to configure your
           connection pool's maximum number of connections to be
-          "unbounded," run a load test, and measure the largest amount
+          <quote>unbounded,</quote> run a load test, and measure the largest amount
           of concurrently used connections. You can then work backward
           from there to determine what values of minimum and maximum
           pooled connections give the best performance for your
@@ -4536,7 +4537,7 @@
               MySQL closes connections after 8 hours of inactivity. You
               either need to use a connection pool that handles stale
               connections or use the "autoReconnect" parameter (see
-              "Developing Applications with MySQL Connector/J").
+              <xref linkend="cj-configuration-properties"/>).
             </para>
 
             <para>

Modified: trunk/refman-5.0/connector-mxj.xml
===================================================================
--- trunk/refman-5.0/connector-mxj.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/connector-mxj.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -442,7 +442,7 @@
     <title>Running within a Java Object</title>
 
     <para>
-      Have a java application and wish to "embed" a MySQL database, make
+      Have a java application and wish to <quote>embed</quote> a MySQL database, make
       use of the com.mysql.management.MysqldResource class directly.
       This class may be instantiated with the default (no argument)
       constructor, or by passing in a java.io.File object representing
@@ -617,9 +617,9 @@
         </para>
 
         <para>
-          The default "Kill Delay" is 30 seconds. This represents the
+          The default <quote>Kill Delay</quote> is 30 seconds. This represents the
           amount of time to wait between the initial request to shutdown
-          and issuing a "force kill" if the database has not shutdown by
+          and issuing a <quote>force kill</quote> if the database has not shutdown by
           itself.
         </para>
       </listitem>

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -2098,7 +2098,7 @@
       <title>&title-data-source-name;</title>
 
       <para>
-        A "data source" is a place where data comes from. The data
+        A <firstterm>data source</firstterm> is a place where data comes from. The data
         source must have a persistent identifier, the Data Source Name.
         Using the Data Source Name, MySQL can access initialization
         information. With the initialization information, MySQL knows
@@ -2126,9 +2126,9 @@
 
       <para>
         If the information is in the Windows registry, it is called a
-        "Machine data source". It might be a "User data source", in
-        which case only one user can see it. Or it might be a "System
-        data source" in which case it is accessible to all users on the
+        <firstterm>Machine data source</firstterm>. It might be a <firstterm>User data source</firstterm>, in
+        which case only one user can see it. Or it might be a <firstterm>System
+        data source</firstterm> in which case it is accessible to all users on the
         computer, or indeed to all users connected to the computer, if
         the users are connected by Microsoft Windows NT services. When
         you run the ODBC Data Administration program, you have a choice

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/database-administration.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -3843,7 +3843,7 @@
               <literal>max_connections + table_cache*2</literal>
               (whichever is larger) number of files. You should try
               increasing this if <command>mysqld</command> gives you the
-              error "Too many open files."
+              error <literal>Too many open files</literal>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -202,7 +202,7 @@
 
     <para>
       <emphasis role="bold">Note</emphasis>: In many contexts, the term
-      "node" is used to indicate a computer, but when discussing MySQL
+      <quote>node</quote> is used to indicate a computer, but when discussing MySQL
       Cluster it means a <emphasis>process</emphasis>. There can be any
       number of nodes on a single computer, for which we use the term
       <emphasis role="bold">cluster host</emphasis>.
@@ -1148,7 +1148,7 @@
       <para>
         (<emphasis role="bold">NOTE</emphasis>: The "world" database can
         be downloaded from <ulink url="&base-url-docs;"/> where it can
-        be found listed under "Examples".)
+        be found listed under <quote>Examples.</quote>)
       </para>
 
       <para>
@@ -4550,7 +4550,7 @@
               All update activities also need to be logged. This log
               makes it possible to replay these updates whenever the
               system is restarted. The NDB recovery algorithm uses a
-              "fuzzy" checkpoint of the data together with the UNDO log,
+              <quote>fuzzy</quote> checkpoint of the data together with the UNDO log,
               and then applies the REDO log to play back all changes up
               to the restoration point.
             </para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -17845,7 +17845,7 @@
           <listitem>
             <para>
               If the thread is waiting for free disk space in a write
-              call, the write is aborted with a "disk full" error
+              call, the write is aborted with a <quote>disk full</quote> error
               message.
             </para>
           </listitem>

Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.0/tutorial.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1199,7 +1199,7 @@
         form, you supply values for each column, in the order in which
         the columns were listed in the <literal>CREATE TABLE</literal>
         statement. Suppose that Diane gets a new hamster named
-        "Puffball". You could add a new record using an
+        <quote>Puffball.</quote> You could add a new record using an
         <literal>INSERT</literal> statement like this:
       </para>
 
@@ -2037,7 +2037,7 @@
           assume that it is not possible to insert a zero or an empty
           string into a column defined as <literal>NOT NULL</literal>,
           but this is not the case. These are in fact values, whereas
-          <literal>NULL</literal> means "not having a value". You can
+          <literal>NULL</literal> means <quote>not having a value.</quote> You can
           test this easily enough by using <literal>IS
           </literal>[<literal>NOT</literal>]<literal> NULL</literal> as
           shown:
@@ -3466,7 +3466,7 @@
 
       <para>
         The use of <literal>REFERENCES</literal> in this way as a
-        comment or "reminder" in a column definition works with both
+        comment or <quote>reminder</quote> in a column definition works with both
         <literal>MyISAM</literal> and <literal>BerkeleyDB</literal>
         tables.
       </para>

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/charset.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1727,7 +1727,7 @@
       <para>
         The character that causes the different sort orders in this
         example is the U with two dots over it
-        (<literal>&uuml;</literal>), which the Germans call "U-umlaut".
+        (<literal>&uuml;</literal>), which the Germans call <quote>U-umlaut.</quote>
       </para>
 
       <itemizedlist>
@@ -2114,9 +2114,9 @@
     <para>
       In UCS-2 (binary Unicode representation), every character is
       represented by a two-byte Unicode code with the most significant
-      byte first. For example: "LATIN CAPITAL LETTER A" has the code
+      byte first. For example: <literal>LATIN CAPITAL LETTER A</literal> has the code
       <literal>0x0041</literal> and it is stored as a two-byte sequence:
-      <literal>0x00 0x41</literal>. "CYRILLIC SMALL LETTER YERU"
+      <literal>0x00 0x41</literal>. <literal>CYRILLIC SMALL LETTER YERU</literal>
       (Unicode <literal>0x044B</literal>) is stored as a two-byte
       sequence: <literal>0x04 0x4B</literal>. For Unicode characters and
       their codes, please refer to the

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -6938,7 +6938,7 @@
           <literal>FLUSH...</literal> is issued, the MySQL server may
           get stalled until that long statement finishes, and then the
           dump becomes lock-free. So if the MySQL server receives only
-          short (in the sense of "short execution time") updating
+          short (in the sense of <quote>short execution time</quote>) updating
           statements, even if there are plenty of them, the initial lock
           period should not be noticeable.
         </para>

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/connector-j.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1167,18 +1167,19 @@
 
           <listitem>
             <para>
-              Unicode Character Sets - See the next section, as well as
-              the "Character Sets" section in the server manual for
+              Unicode Character Sets &mdash; See the next section, as well as
+<xref linkend="charset"/>,
+for
               information on this new feature of MySQL. If you have
               something misconfigured, it will usually show up as an
-              error with a message similar to 'Illegal mix of
-              collations'.
+              error with a message similar to <literal>Illegal mix of
+              collations</literal>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <emphasis>Server-side Prepared Statements</emphasis> -
+              <emphasis>Server-side Prepared Statements</emphasis> &mdash;
               Connector/J 3.1 will automatically detect and use
               server-side prepared statements when they are available
               (MySQL server version 4.1.0 and newer).
@@ -1212,7 +1213,7 @@
 
           <listitem>
             <para>
-              Datetimes with all-zero components ('0000-00-00 ...') -
+              Datetimes with all-zero components ('0000-00-00 ...') &mdash;
               These values can not be represented reliably in Java.
               Connector/J 3.0.x always converted them to NULL when being
               read from a ResultSet.
@@ -1246,7 +1247,7 @@
 
           <listitem>
             <para>
-              New SQLState Codes - Connector/J 3.1 uses SQL:1999
+              New SQLState Codes &mdash; Connector/J 3.1 uses SQL:1999
               SQLState codes returned by the MySQL server (if
               supported), which are different than the
               <quote>legacy</quote> X/Open state codes that Connector/J
@@ -1776,7 +1777,7 @@
                 when you are unable to configure your application to
                 handle SQLExceptions resulting from dead andstale
                 connections properly. Alternatively, investigate setting
-                the MySQL server variable "wait_timeout"to some high
+                the MySQL <literal>wait_timeout</literal> system variable to some high
                 value rather than the default of 8 hours.</entry>
               <entry>No</entry>
               <entry>false</entry>
@@ -3654,11 +3655,11 @@
         An application signals that it wants a transaction to be
         read-only by calling
         <function>Connection.setReadOnly(true)</function>, this
-        "replication-aware" connection will use one of the slave
+        <quote>replication-aware</quote> connection will use one of the slave
         connections, which are load-balanced per-vm using a round-robin
         scheme (a given connection is <quote>sticky</quote> to a slave
         unless that slave is removed from service). If you have a write
-        transaction, or if you have a read that is "time-sensitive"
+        transaction, or if you have a read that is <quote>time-sensitive</quote>
         (remember, replication in MySQL is asynchronous), set the
         connection to be not read-only, by calling
         <function>Connection.setReadOnly(false)</function> and the
@@ -3794,7 +3795,7 @@
         </para>
 
         <para>
-          When the connection is "loaned out" from the pool, it is used
+          When the connection is <quote>loaned out</quote> from the pool, it is used
           exclusively by the thread that requested it. From a
           programming point of view, it is the same as if your thread
           called DriverManager.getConnection() every time it needed a
@@ -3820,7 +3821,7 @@
               connection setup that MySQL offers compared to other
               databases, creating new JDBC connections still incurs
               networking and JDBC driver overhead that will be avoided
-              if connections are "recycled."
+              if connections are <quote>recycled.</quote>
             </para>
           </listitem>
 
@@ -3994,7 +3995,7 @@
           code (exceptions, flow-of-control, and so forth), connections,
           and anything created by them (such as statements or result
           sets) are closed, so that they may be re-used, otherwise they
-          will be "stranded," which in the best case means that the
+          will be <quote>stranded,</quote> which in the best case means that the
           MySQL server resources they represent (such as buffers, locks,
           or sockets) may be tied up for some time, or worst case, may
           be tied up forever.
@@ -4006,7 +4007,7 @@
 
         <para>
           As with all other configuration rules-of-thumb, the answer is
-          "It depends." Although the optimal size depends on anticipated
+          <quote>It depends.</quote> Although the optimal size depends on anticipated
           load and average database transaction time, the optimum
           connection pool size is smaller than you might expect. If you
           take Sun's Java Petstore blueprint application for example, a
@@ -4024,7 +4025,7 @@
         <para>
           An easy way to determine a starting point is to configure your
           connection pool's maximum number of connections to be
-          "unbounded," run a load test, and measure the largest amount
+          <quote>unbounded,</quote> run a load test, and measure the largest amount
           of concurrently used connections. You can then work backward
           from there to determine what values of minimum and maximum
           pooled connections give the best performance for your
@@ -4536,7 +4537,7 @@
               MySQL closes connections after 8 hours of inactivity. You
               either need to use a connection pool that handles stale
               connections or use the "autoReconnect" parameter (see
-              "Developing Applications with MySQL Connector/J").
+              <xref linkend="cj-configuration-properties"/>).
             </para>
 
             <para>

Modified: trunk/refman-5.1/connector-mxj.xml
===================================================================
--- trunk/refman-5.1/connector-mxj.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/connector-mxj.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -442,7 +442,7 @@
     <title>Running within a Java Object</title>
 
     <para>
-      Have a java application and wish to "embed" a MySQL database, make
+      Have a java application and wish to <quote>embed</quote> a MySQL database, make
       use of the com.mysql.management.MysqldResource class directly.
       This class may be instantiated with the default (no argument)
       constructor, or by passing in a java.io.File object representing
@@ -617,9 +617,9 @@
         </para>
 
         <para>
-          The default "Kill Delay" is 30 seconds. This represents the
+          The default <quote>Kill Delay</quote> is 30 seconds. This represents the
           amount of time to wait between the initial request to shutdown
-          and issuing a "force kill" if the database has not shutdown by
+          and issuing a <quote>force kill</quote> if the database has not shutdown by
           itself.
         </para>
       </listitem>

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -2098,7 +2098,7 @@
       <title>&title-data-source-name;</title>
 
       <para>
-        A "data source" is a place where data comes from. The data
+        A <firstterm>data source</firstterm> is a place where data comes from. The data
         source must have a persistent identifier, the Data Source Name.
         Using the Data Source Name, MySQL can access initialization
         information. With the initialization information, MySQL knows
@@ -2126,9 +2126,9 @@
 
       <para>
         If the information is in the Windows registry, it is called a
-        "Machine data source". It might be a "User data source", in
-        which case only one user can see it. Or it might be a "System
-        data source" in which case it is accessible to all users on the
+        <firstterm>Machine data source</firstterm>. It might be a <firstterm>User data source</firstterm>, in
+        which case only one user can see it. Or it might be a <firstterm>System
+        data source</firstterm> in which case it is accessible to all users on the
         computer, or indeed to all users connected to the computer, if
         the users are connected by Microsoft Windows NT services. When
         you run the ODBC Data Administration program, you have a choice

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/database-administration.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -3823,7 +3823,7 @@
               <literal>max_connections + table_open_cache*2</literal>
               (whichever is larger) number of files. You should try
               increasing this if <command>mysqld</command> gives you the
-              error "Too many open files."
+              error <literal>Too many open files</literal>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -202,7 +202,7 @@
 
     <para>
       <emphasis role="bold">Note</emphasis>: In many contexts, the term
-      "node" is used to indicate a computer, but when discussing MySQL
+      <quote>node</quote> is used to indicate a computer, but when discussing MySQL
       Cluster it means a <emphasis>process</emphasis>. There can be any
       number of nodes on a single computer, for which we use the term
       <emphasis role="bold">cluster host</emphasis>.
@@ -1148,7 +1148,7 @@
       <para>
         (<emphasis role="bold">NOTE</emphasis>: The "world" database can
         be downloaded from <ulink url="&base-url-docs;"/> where it can
-        be found listed under "Examples".)
+        be found listed under <quote>Examples.</quote>)
       </para>
 
       <para>
@@ -4548,7 +4548,7 @@
               All update activities also need to be logged. This log
               makes it possible to replay these updates whenever the
               system is restarted. The NDB recovery algorithm uses a
-              "fuzzy" checkpoint of the data together with the UNDO log,
+              <quote>fuzzy</quote> checkpoint of the data together with the UNDO log,
               and then applies the REDO log to play back all changes up
               to the restoration point.
             </para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -18317,7 +18317,7 @@
           <listitem>
             <para>
               If the thread is waiting for free disk space in a write
-              call, the write is aborted with a "disk full" error
+              call, the write is aborted with a <quote>disk full</quote> error
               message.
             </para>
           </listitem>

Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2006-01-20 16:23:36 UTC (rev 949)
+++ trunk/refman-5.1/tutorial.xml	2006-01-20 17:46:29 UTC (rev 950)
@@ -1193,7 +1193,7 @@
         form, you supply values for each column, in the order in which
         the columns were listed in the <literal>CREATE TABLE</literal>
         statement. Suppose that Diane gets a new hamster named
-        "Puffball". You could add a new record using an
+        <quote>Puffball.</quote> You could add a new record using an
         <literal>INSERT</literal> statement like this:
       </para>
 
@@ -2031,7 +2031,7 @@
           assume that it is not possible to insert a zero or an empty
           string into a column defined as <literal>NOT NULL</literal>,
           but this is not the case. These are in fact values, whereas
-          <literal>NULL</literal> means "not having a value". You can
+          <literal>NULL</literal> means <quote>not having a value.</quote> You can
           test this easily enough by using <literal>IS
           </literal>[<literal>NOT</literal>]<literal> NULL</literal> as
           shown:
@@ -3460,7 +3460,7 @@
 
       <para>
         The use of <literal>REFERENCES</literal> in this way as a
-        comment or "reminder" in a column definition works with both
+        comment or <quote>reminder</quote> in a column definition works with both
         <literal>MyISAM</literal> and <literal>BerkeleyDB</literal>
         tables.
       </para>

Thread
svn commit - mysqldoc@docsrva: r950 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul20 Jan