List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 4:11am
Subject:svn commit - mysqldoc@docsrva: r1041 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-26 05:11:07 +0100 (Thu, 26 Jan 2006)
New Revision: 1041

Log:
 r6689@frost:  paul | 2006-01-25 21:39:37 -0600
 Cleanup edits.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -2903,7 +2903,7 @@
             </para>
 
             <para>
-              The database to use. This is useful mainly in an option
+              The database to use. This is useful primarily in an option
               file.
             </para>
           </listitem>
@@ -2951,11 +2951,11 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -5454,11 +5454,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>. Added
               in MySQL 4.1.9.
             </para>
@@ -6616,11 +6616,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -7221,11 +7221,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>. If
               not specified, <command>mysqldump</command> from MySQL
               4.1.2 or later uses <literal>utf8</literal>, and earlier
@@ -8968,11 +8968,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-4.1/database-administration.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -564,11 +564,11 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--character-set-server=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               server character set. This option is available as of MySQL
               4.1.3. See <xref linkend="character-sets"/>.
             </para>
@@ -593,11 +593,11 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
+              <option>--collation-server=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               server collation. This option is available as of MySQL
               4.1.3. See <xref linkend="character-sets"/>.
             </para>
@@ -664,11 +664,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. This option is deprecated in favor of
               <option>--character-set-server</option> as of MySQL 4.1.3.
               See <xref linkend="character-sets"/>.
@@ -677,11 +677,11 @@
 
           <listitem>
             <para>
-              <option>--default-collation=<replaceable>collation</replaceable></option>
+              <option>--default-collation=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               collation. This option is deprecated in favor of
               <option>--collation-server</option> as of MySQL 4.1.3. See
               <xref linkend="character-sets"/>.
@@ -18991,7 +18991,7 @@
         <option>--character-set-server</option> option when you start
         the server (<option>--default-character-set</option> before
         MySQL 4.1.3). The character sets available depend on the
-        <option>--with-charset=<replaceable>charset</replaceable></option>
+        <option>--with-charset=<replaceable>charset_name</replaceable></option>
         and <option>--with-extra-charsets=
         <replaceable>list-of-charsets</replaceable> | complex | all |
         none</option> options to <command>configure</command>, and the
@@ -19014,7 +19014,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset</replaceable></command> on
+        --set-collation=<replaceable>charset_name</replaceable></command> on
         all tables, or your indexes may not be ordered correctly. (Use
         <option>--set-character-set</option> before MySQL 4.1.1.)
       </para>
@@ -19064,7 +19064,7 @@
 
 <programlisting>
 [client]
-default-character-set=<replaceable>charset</replaceable>
+default-character-set=<replaceable>charset_name</replaceable>
 </programlisting>
 
       <para>
@@ -19616,7 +19616,7 @@
         <literal>gb2312</literal>, <literal>gbk</literal>,
         <literal>sjis</literal>, and <literal>ujis</literal> character
         sets for examples. These are implemented in the
-        <filename>ctype-<replaceable>charset</replaceable>.c</filename>
+        <filename>ctype-<replaceable>charset_name</replaceable>.c</filename>
         files in the <filename>strings</filename> directory.
       </para>
 

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-4.1/functions.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -764,7 +764,7 @@
 
           <para>
             <indexterm type="function">
-              <primary>BETWEEN &hellip; AND</primary>
+              <primary>BETWEEN ... AND</primary>
             </indexterm>
 
             <literal><replaceable>expr</replaceable> BETWEEN
@@ -855,7 +855,7 @@
               <primary>COALESCE()</primary>
             </indexterm>
 
-            <literal>COALESCE(<replaceable>value</replaceable>,&hellip;)</literal>
+            <literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -894,7 +894,7 @@
               <primary>GREATEST()</primary>
             </indexterm>
 
-            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -943,7 +943,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1009,7 +1009,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> NOT IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1019,7 +1019,7 @@
           <para>
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;))</literal>.
+            (<replaceable>value</replaceable>,...))</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -1085,7 +1085,7 @@
               <primary>INTERVAL()</primary>
             </indexterm>
 
-            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,&hellip;)</literal>
+            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1102,7 +1102,7 @@
             integers. It is required that <replaceable>N1</replaceable>
             &lt; <replaceable>N2</replaceable> &lt;
             <replaceable>N3</replaceable> &lt;
-            <literal>&hellip;</literal> &lt;
+            <literal>...</literal> &lt;
             <replaceable>Nn</replaceable> for this function to work
             correctly. This is because a binary search is used (very
             fast).
@@ -1132,7 +1132,7 @@
               <primary>LEAST()</primary>
             </indexterm>
 
-            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1521,7 +1521,7 @@
           [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>compare_value</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -1529,7 +1529,7 @@
           <literal>CASE WHEN [<replaceable>condition</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>condition</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -1991,8 +1991,8 @@
             <primary>CHAR()</primary>
           </indexterm>
 
-          <literal>CHAR(<replaceable>N</replaceable>,&hellip; [USING
-          <replaceable>charset</replaceable>])</literal>
+          <literal>CHAR(<replaceable>N</replaceable>,... [USING
+          <replaceable>charset_name</replaceable>])</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2103,7 +2103,7 @@
             <primary>CONCAT()</primary>
           </indexterm>
 
-          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2153,7 +2153,7 @@
             <primary>CONCAT_WS()</primary>
           </indexterm>
 
-          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2251,7 +2251,7 @@
             <primary>ELT()</primary>
           </indexterm>
 
-          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2335,7 +2335,7 @@
             <primary>FIELD()</primary>
           </indexterm>
 
-          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2346,7 +2346,7 @@
           Returns the index (position) of <replaceable>str</replaceable>
           in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
-          <replaceable>str3</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str3</replaceable>, <literal>...</literal>
           list. Returns <literal>0</literal> if
           <replaceable>str</replaceable> is not found.
         </para>
@@ -2927,7 +2927,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2943,7 +2943,7 @@
           <replaceable>str2</replaceable> to bit 1, and so on.
           <literal>NULL</literal> values in
           <replaceable>str1</replaceable>,
-          <replaceable>str2</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str2</replaceable>, <literal>...</literal>
           are not appended to the result.
         </para>
 
@@ -9039,11 +9039,11 @@
 
         <para>
           <indexterm type="function">
-            <primary>MATCH &hellip; AGAINST()</primary>
+            <primary>MATCH ... AGAINST()</primary>
           </indexterm>
 
           <literal>MATCH
-          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,&hellip;)
+          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
           AGAINST (<replaceable>expr</replaceable> [IN BOOLEAN MODE |
           WITH QUERY EXPANSION])</literal>
         </para>
@@ -9472,7 +9472,7 @@
             By default (when neither <literal>+</literal> nor
             <literal>-</literal> is specified) the word is optional, but
             the rows that contain it are rated higher. This mimics the
-            behavior of <literal>MATCH() &hellip; AGAINST()</literal>
+            behavior of <literal>MATCH() ... AGAINST()</literal>
             without the <literal>IN BOOLEAN MODE</literal> modifier.
           </para>
         </listitem>
@@ -11037,8 +11037,8 @@
         </para>
 
         <para>
-          <literal>CAST()</literal> and <literal>CONVERT(&hellip; USING
-          &hellip;)</literal> are standard SQL syntax. The
+          <literal>CAST()</literal> and <literal>CONVERT(... USING
+          ...)</literal> are standard SQL syntax. The
           non-<literal>USING</literal> form of
           <literal>CONVERT()</literal> is ODBC syntax.
         </para>
@@ -11121,7 +11121,7 @@
 
     <para>
       The cast functions are useful when you want to create a column
-      with a specific type in a <literal>CREATE &hellip;
+      with a specific type in a <literal>CREATE ...
       SELECT</literal> statement:
     </para>
 
@@ -13827,8 +13827,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            In an <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE
-            &hellip;</literal> statement, you can use the
+            In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
             <literal>VALUES(<replaceable>col_name</replaceable>)</literal>
             function in the <literal>UPDATE</literal> clause to refer to
             column values from the <literal>INSERT</literal> portion of
@@ -13839,7 +13838,7 @@
             inserted, had no duplicate-key conflict occurred. This
             function is especially useful in multiple-row inserts. The
             <literal>VALUES()</literal> function is meaningful only in
-            <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE</literal>
+            <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
             statements and returns <literal>NULL</literal> otherwise.
             <xref linkend="insert-on-duplicate"/>.
           </para>
@@ -14134,7 +14133,7 @@
             </indexterm>
 
             <literal>COUNT(DISTINCT
-            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>&hellip;])</literal>
+            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>...])</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -14164,7 +14163,7 @@
             combinations that do not contain <literal>NULL</literal> by
             giving a list of expressions. In standard SQL, you would
             have to do a concatenation of all expressions inside
-            <literal>COUNT(DISTINCT &hellip;)</literal>.
+            <literal>COUNT(DISTINCT ...)</literal>.
           </para>
 
           <para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-4.1/installing.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -8071,7 +8071,7 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you have to
             run <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset</replaceable></command>
+            --set-character-set=<replaceable>charset_name</replaceable></command>
             on every table. Your indexes may be sorted incorrectly
             otherwise. (This can happen if you install MySQL, create
             some tables, and then reconfigure MySQL to use a different
@@ -11946,7 +11946,7 @@
       within versions for the same release series of MySQL. The current
       production release series is 4.1. If you change the character set
       when running MySQL, you must run <command>myisamchk -r -q
-      --set-character-set=<replaceable>charset</replaceable></command>
+      --set-character-set=<replaceable>charset_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
       may also change the sort order.

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -3141,7 +3141,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -3152,7 +3152,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     USING <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -3524,7 +3524,7 @@
       </para>
 
       <para>
-        <literal>DO</literal> is useful mainly with functions that have
+        <literal>DO</literal> is useful primarily with functions that have
         side effects, such as <literal>RELEASE_LOCK()</literal>.
       </para>
 

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -2777,7 +2777,7 @@
             </para>
 
             <para>
-              The database to use. This is useful mainly in an option
+              The database to use. This is useful primarily in an option
               file.
             </para>
           </listitem>
@@ -2825,11 +2825,11 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -5342,11 +5342,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -6781,11 +6781,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -7333,11 +7333,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>. If
               not specified, <command>mysqldump</command> uses
               <literal>utf8</literal>.
@@ -9127,11 +9127,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.0/database-administration.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -586,11 +586,11 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--character-set-server=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               server character set. See
               <xref linkend="character-sets"/>.
             </para>
@@ -613,11 +613,11 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
+              <option>--collation-server=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               server collation. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -683,12 +683,12 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
               (<emphasis>DEPRECATED</emphasis>)
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. This option is deprecated in favor of
               <option>--character-set-server</option>. See
               <xref linkend="character-sets"/>.
@@ -697,11 +697,11 @@
 
           <listitem>
             <para>
-              <option>--default-collation=<replaceable>collation</replaceable></option>
+              <option>--default-collation=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               collation. This option is deprecated in favor of
               <option>--collation-server</option>. See
               <xref linkend="character-sets"/>.
@@ -21230,7 +21230,7 @@
         You can change the character set with the
         <option>--character-set-server</option> option when you start
         the server. The character sets available depend on the
-        <option>--with-charset=<replaceable>charset</replaceable></option>
+        <option>--with-charset=<replaceable>charset_name</replaceable></option>
         and
         <option>--with-extra-charsets=<replaceable>list-of-charsets</replaceable>
         | complex | all | none</option> options to
@@ -21253,7 +21253,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset</replaceable></command> on
+        --set-collation=<replaceable>charset_name</replaceable></command> on
         all tables, or your indexes may not be ordered correctly.
       </para>
 
@@ -21302,7 +21302,7 @@
 
 <programlisting>
 [client]
-default-character-set=<replaceable>charset</replaceable>
+default-character-set=<replaceable>charset_name</replaceable>
 </programlisting>
 
       <para>
@@ -21810,7 +21810,7 @@
         <literal>gb2312</literal>, <literal>gbk</literal>,
         <literal>sjis</literal>, and <literal>ujis</literal> character
         sets for examples. These are implemented in the
-        <filename>ctype-<replaceable>charset</replaceable>.c</filename>
+        <filename>ctype-<replaceable>charset_name</replaceable>.c</filename>
         files in the <filename>strings</filename> directory.
       </para>
 

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.0/functions.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -843,7 +843,7 @@
 
           <para>
             <indexterm type="function">
-              <primary>BETWEEN &hellip; AND</primary>
+              <primary>BETWEEN ... AND</primary>
             </indexterm>
 
             <literal><replaceable>expr</replaceable> BETWEEN
@@ -932,7 +932,7 @@
               <primary>COALESCE()</primary>
             </indexterm>
 
-            <literal>COALESCE(<replaceable>value</replaceable>,&hellip;)</literal>
+            <literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -967,7 +967,7 @@
               <primary>GREATEST()</primary>
             </indexterm>
 
-            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1013,7 +1013,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1078,7 +1078,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> NOT IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1088,7 +1088,7 @@
           <para>
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;))</literal>.
+            (<replaceable>value</replaceable>,...))</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -1154,7 +1154,7 @@
               <primary>INTERVAL()</primary>
             </indexterm>
 
-            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,&hellip;)</literal>
+            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1171,7 +1171,7 @@
             integers. It is required that <replaceable>N1</replaceable>
             &lt; <replaceable>N2</replaceable> &lt;
             <replaceable>N3</replaceable> &lt;
-            <literal>&hellip;</literal> &lt;
+            <literal>...</literal> &lt;
             <replaceable>Nn</replaceable> for this function to work
             correctly. This is because a binary search is used (very
             fast).
@@ -1201,7 +1201,7 @@
               <primary>LEAST()</primary>
             </indexterm>
 
-            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1578,7 +1578,7 @@
           [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>compare_value</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -1586,7 +1586,7 @@
           <literal>CASE WHEN [<replaceable>condition</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>condition</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -2045,8 +2045,8 @@
             <primary>CHAR()</primary>
           </indexterm>
 
-          <literal>CHAR(<replaceable>N</replaceable>,&hellip; [USING
-          <replaceable>charset</replaceable>])</literal>
+          <literal>CHAR(<replaceable>N</replaceable>,... [USING
+          <replaceable>charset_name</replaceable>])</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2197,7 +2197,7 @@
             <primary>CONCAT()</primary>
           </indexterm>
 
-          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2247,7 +2247,7 @@
             <primary>CONCAT_WS()</primary>
           </indexterm>
 
-          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2344,7 +2344,7 @@
             <primary>ELT()</primary>
           </indexterm>
 
-          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2428,7 +2428,7 @@
             <primary>FIELD()</primary>
           </indexterm>
 
-          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2439,7 +2439,7 @@
           Returns the index (position) of <replaceable>str</replaceable>
           in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
-          <replaceable>str3</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str3</replaceable>, <literal>...</literal>
           list. Returns <literal>0</literal> if
           <replaceable>str</replaceable> is not found.
         </para>
@@ -3009,7 +3009,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -3025,7 +3025,7 @@
           <replaceable>str2</replaceable> to bit 1, and so on.
           <literal>NULL</literal> values in
           <replaceable>str1</replaceable>,
-          <replaceable>str2</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str2</replaceable>, <literal>...</literal>
           are not appended to the result.
         </para>
 
@@ -9138,11 +9138,11 @@
 
         <para>
           <indexterm type="function">
-            <primary>MATCH &hellip; AGAINST()</primary>
+            <primary>MATCH ... AGAINST()</primary>
           </indexterm>
 
           <literal>MATCH
-          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,&hellip;)
+          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
           AGAINST (<replaceable>expr</replaceable> [IN BOOLEAN MODE |
           WITH QUERY EXPANSION])</literal>
         </para>
@@ -9570,7 +9570,7 @@
             By default (when neither <literal>+</literal> nor
             <literal>-</literal> is specified) the word is optional, but
             the rows that contain it are rated higher. This mimics the
-            behavior of <literal>MATCH() &hellip; AGAINST()</literal>
+            behavior of <literal>MATCH() ... AGAINST()</literal>
             without the <literal>IN BOOLEAN MODE</literal> modifier.
           </para>
         </listitem>
@@ -11119,8 +11119,8 @@
         </para>
 
         <para>
-          <literal>CAST()</literal> and <literal>CONVERT(&hellip; USING
-          &hellip;)</literal> are standard SQL syntax. The
+          <literal>CAST()</literal> and <literal>CONVERT(... USING
+          ...)</literal> are standard SQL syntax. The
           non-<literal>USING</literal> form of
           <literal>CONVERT()</literal> is ODBC syntax.
         </para>
@@ -11175,7 +11175,7 @@
 
     <para>
       The cast functions are useful when you want to create a column
-      with a specific type in a <literal>CREATE &hellip;
+      with a specific type in a <literal>CREATE ...
       SELECT</literal> statement:
     </para>
 
@@ -13901,8 +13901,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            In an <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE
-            &hellip;</literal> statement, you can use the
+            In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
             <literal>VALUES(<replaceable>col_name</replaceable>)</literal>
             function in the <literal>UPDATE</literal> clause to refer to
             column values from the <literal>INSERT</literal> portion of
@@ -13913,7 +13912,7 @@
             inserted, had no duplicate-key conflict occurred. This
             function is especially useful in multiple-row inserts. The
             <literal>VALUES()</literal> function is meaningful only in
-            <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE</literal>
+            <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
             statements and returns <literal>NULL</literal> otherwise.
             <xref linkend="insert-on-duplicate"/>.
           </para>
@@ -14218,7 +14217,7 @@
             </indexterm>
 
             <literal>COUNT(DISTINCT
-            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>&hellip;])</literal>
+            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>...])</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -14248,7 +14247,7 @@
             combinations that do not contain <literal>NULL</literal> by
             giving a list of expressions. In standard SQL, you would
             have to do a concatenation of all expressions inside
-            <literal>COUNT(DISTINCT &hellip;)</literal>.
+            <literal>COUNT(DISTINCT ...)</literal>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.0/installing.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -8033,7 +8033,7 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset</replaceable></command>
+            --set-character-set=<replaceable>charset_name</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
             sorted incorrectly otherwise. (This can happen if you
             install MySQL, create some tables, and then reconfigure
@@ -11841,7 +11841,7 @@
       production release series is &current-series;. If you change the
       character set when running MySQL, you must run <command>myisamchk
       -r -q
-      --set-character-set=<replaceable>charset</replaceable></command>
+      --set-character-set=<replaceable>charset_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
       may also change the sort order.
@@ -12341,7 +12341,7 @@
             MySQL 5.0.15, the <literal>CHAR()</literal> function returns
             a binary string rather than a string in the connection
             character set. An optional <literal>USING
-            <replaceable>charset</replaceable></literal> clause may be
+            <replaceable>charset_name</replaceable></literal> clause may be
             used to produce a result in a specific character set
             instead. Also, arguments larger than 256 produce multiple
             characters. They are no longer interpreted modulo 256 to

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -3151,7 +3151,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -3162,7 +3162,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     USING <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -3479,7 +3479,7 @@
       </para>
 
       <para>
-        <literal>DO</literal> is useful mainly with functions that have
+        <literal>DO</literal> is useful primarily with functions that have
         side effects, such as <literal>RELEASE_LOCK()</literal>.
       </para>
 

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -2778,7 +2778,7 @@
             </para>
 
             <para>
-              The database to use. This is useful mainly in an option
+              The database to use. This is useful primarily in an option
               file.
             </para>
           </listitem>
@@ -2826,11 +2826,11 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -5343,11 +5343,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -6807,11 +6807,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -7359,11 +7359,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>. If
               not specified, <command>mysqldump</command> uses
               <literal>utf8</literal>.
@@ -9163,11 +9163,11 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. See <xref linkend="character-sets"/>.
             </para>
           </listitem>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.1/database-administration.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -612,11 +612,11 @@
 
           <listitem>
             <para>
-              <option>--character-set-server=<replaceable>charset</replaceable></option>
+              <option>--character-set-server=<replaceable>charset_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               server character set. See
               <xref linkend="character-sets"/>.
             </para>
@@ -639,11 +639,11 @@
 
           <listitem>
             <para>
-              <option>--collation-server=<replaceable>collation</replaceable></option>
+              <option>--collation-server=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               server collation. See <xref linkend="character-sets"/>.
             </para>
           </listitem>
@@ -709,12 +709,12 @@
 
           <listitem>
             <para>
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
+              <option>--default-character-set=<replaceable>charset_name</replaceable></option>
               (<emphasis>DEPRECATED</emphasis>)
             </para>
 
             <para>
-              Use <replaceable>charset</replaceable> as the default
+              Use <replaceable>charset_name</replaceable> as the default
               character set. This option is deprecated in favor of
               <option>--character-set-server</option>. See
               <xref linkend="character-sets"/>.
@@ -723,11 +723,11 @@
 
           <listitem>
             <para>
-              <option>--default-collation=<replaceable>collation</replaceable></option>
+              <option>--default-collation=<replaceable>collation_name</replaceable></option>
             </para>
 
             <para>
-              Use <replaceable>collation</replaceable> as the default
+              Use <replaceable>collation_name</replaceable> as the default
               collation. This option is deprecated in favor of
               <option>--collation-server</option>. See
               <xref linkend="character-sets"/>.
@@ -21243,7 +21243,7 @@
         You can change the character set with the
         <option>--character-set-server</option> option when you start
         the server. The character sets available depend on the
-        <option>--with-charset=<replaceable>charset</replaceable></option>
+        <option>--with-charset=<replaceable>charset_name</replaceable></option>
         and
         <option>--with-extra-charsets=<replaceable>list-of-charsets</replaceable>
         | complex | all | none</option> options to
@@ -21266,7 +21266,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset</replaceable></command> on
+        --set-collation=<replaceable>charset_name</replaceable></command> on
         all tables, or your indexes may not be ordered correctly.
       </para>
 
@@ -21315,7 +21315,7 @@
 
 <programlisting>
 [client]
-default-character-set=<replaceable>charset</replaceable>
+default-character-set=<replaceable>charset_name</replaceable>
 </programlisting>
 
       <para>
@@ -21823,7 +21823,7 @@
         <literal>gb2312</literal>, <literal>gbk</literal>,
         <literal>sjis</literal>, and <literal>ujis</literal> character
         sets for examples. These are implemented in the
-        <filename>ctype-<replaceable>charset</replaceable>.c</filename>
+        <filename>ctype-<replaceable>charset_name</replaceable>.c</filename>
         files in the <filename>strings</filename> directory.
       </para>
 

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.1/functions.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -836,7 +836,7 @@
 
           <para>
             <indexterm type="function">
-              <primary>BETWEEN &hellip; AND</primary>
+              <primary>BETWEEN ... AND</primary>
             </indexterm>
 
             <literal><replaceable>expr</replaceable> BETWEEN
@@ -925,7 +925,7 @@
               <primary>COALESCE()</primary>
             </indexterm>
 
-            <literal>COALESCE(<replaceable>value</replaceable>,&hellip;)</literal>
+            <literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -960,7 +960,7 @@
               <primary>GREATEST()</primary>
             </indexterm>
 
-            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1004,7 +1004,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1069,7 +1069,7 @@
             </indexterm>
 
             <literal><replaceable>expr</replaceable> NOT IN
-            (<replaceable>value</replaceable>,&hellip;)</literal>
+            (<replaceable>value</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1079,7 +1079,7 @@
           <para>
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> IN
-            (<replaceable>value</replaceable>,&hellip;))</literal>.
+            (<replaceable>value</replaceable>,...))</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -1145,7 +1145,7 @@
               <primary>INTERVAL()</primary>
             </indexterm>
 
-            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,&hellip;)</literal>
+            <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1162,7 +1162,7 @@
             integers. It is required that <replaceable>N1</replaceable>
             &lt; <replaceable>N2</replaceable> &lt;
             <replaceable>N3</replaceable> &lt;
-            <literal>&hellip;</literal> &lt;
+            <literal>...</literal> &lt;
             <replaceable>Nn</replaceable> for this function to work
             correctly. This is because a binary search is used (very
             fast).
@@ -1192,7 +1192,7 @@
               <primary>LEAST()</primary>
             </indexterm>
 
-            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,&hellip;)</literal>
+            <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -1560,7 +1560,7 @@
           [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>compare_value</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -1568,7 +1568,7 @@
           <literal>CASE WHEN [<replaceable>condition</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
           [<replaceable>condition</replaceable>] THEN
-          <replaceable>result</replaceable> &hellip;] [ELSE
+          <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
 
@@ -2027,8 +2027,8 @@
             <primary>CHAR()</primary>
           </indexterm>
 
-          <literal>CHAR(<replaceable>N</replaceable>,&hellip; [USING
-          <replaceable>charset</replaceable>])</literal>
+          <literal>CHAR(<replaceable>N</replaceable>,... [USING
+          <replaceable>charset_name</replaceable>])</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2169,7 +2169,7 @@
             <primary>CONCAT()</primary>
           </indexterm>
 
-          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2219,7 +2219,7 @@
             <primary>CONCAT_WS()</primary>
           </indexterm>
 
-          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2316,7 +2316,7 @@
             <primary>ELT()</primary>
           </indexterm>
 
-          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2400,7 +2400,7 @@
             <primary>FIELD()</primary>
           </indexterm>
 
-          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,&hellip;)</literal>
+          <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2411,7 +2411,7 @@
           Returns the index (position) of <replaceable>str</replaceable>
           in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
-          <replaceable>str3</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str3</replaceable>, <literal>...</literal>
           list. Returns <literal>0</literal> if
           <replaceable>str</replaceable> is not found.
         </para>
@@ -2981,7 +2981,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,&hellip;)</literal>
+          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
 
         <remark role="help-syntax-end"/>
@@ -2997,7 +2997,7 @@
           <replaceable>str2</replaceable> to bit 1, and so on.
           <literal>NULL</literal> values in
           <replaceable>str1</replaceable>,
-          <replaceable>str2</replaceable>, <literal>&hellip;</literal>
+          <replaceable>str2</replaceable>, <literal>...</literal>
           are not appended to the result.
         </para>
 
@@ -9082,11 +9082,11 @@
 
         <para>
           <indexterm type="function">
-            <primary>MATCH &hellip; AGAINST()</primary>
+            <primary>MATCH ... AGAINST()</primary>
           </indexterm>
 
           <literal>MATCH
-          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,&hellip;)
+          (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
           AGAINST (<replaceable>expr</replaceable> [IN BOOLEAN MODE |
           WITH QUERY EXPANSION])</literal>
         </para>
@@ -9522,7 +9522,7 @@
             By default (when neither <literal>+</literal> nor
             <literal>-</literal> is specified) the word is optional, but
             the rows that contain it are rated higher. This mimics the
-            behavior of <literal>MATCH() &hellip; AGAINST()</literal>
+            behavior of <literal>MATCH() ... AGAINST()</literal>
             without the <literal>IN BOOLEAN MODE</literal> modifier.
           </para>
         </listitem>
@@ -11062,8 +11062,8 @@
         </para>
 
         <para>
-          <literal>CAST()</literal> and <literal>CONVERT(&hellip; USING
-          &hellip;)</literal> are standard SQL syntax. The
+          <literal>CAST()</literal> and <literal>CONVERT(... USING
+          ...)</literal> are standard SQL syntax. The
           non-<literal>USING</literal> form of
           <literal>CONVERT()</literal> is ODBC syntax.
         </para>
@@ -11118,7 +11118,7 @@
 
     <para>
       The cast functions are useful when you want to create a column
-      with a specific type in a <literal>CREATE &hellip;
+      with a specific type in a <literal>CREATE ...
       SELECT</literal> statement:
     </para>
 
@@ -14288,8 +14288,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            In an <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE
-            &hellip;</literal> statement, you can use the
+            In an <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal> statement, you can use the
             <literal>VALUES(<replaceable>col_name</replaceable>)</literal>
             function in the <literal>UPDATE</literal> clause to refer to
             column values from the <literal>INSERT</literal> portion of
@@ -14300,7 +14299,7 @@
             inserted, had no duplicate-key conflict occurred. This
             function is especially useful in multiple-row inserts. The
             <literal>VALUES()</literal> function is meaningful only in
-            <literal>INSERT &hellip; ON DUPLICATE KEY UPDATE</literal>
+            <literal>INSERT ... ON DUPLICATE KEY UPDATE</literal>
             statements and returns <literal>NULL</literal> otherwise.
             <xref linkend="insert-on-duplicate"/>.
           </para>
@@ -14605,7 +14604,7 @@
             </indexterm>
 
             <literal>COUNT(DISTINCT
-            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>&hellip;])</literal>
+            <replaceable>expr</replaceable>,[<replaceable>expr</replaceable>...])</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -14635,7 +14634,7 @@
             combinations that do not contain <literal>NULL</literal> by
             giving a list of expressions. In standard SQL, you would
             have to do a concatenation of all expressions inside
-            <literal>COUNT(DISTINCT &hellip;)</literal>.
+            <literal>COUNT(DISTINCT ...)</literal>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.1/installing.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -8026,7 +8026,7 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset</replaceable></command>
+            --set-character-set=<replaceable>charset_name</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
             sorted incorrectly otherwise. (This can happen if you
             install MySQL, create some tables, and then reconfigure
@@ -11840,7 +11840,7 @@
       production release series is &current-series;. If you change the
       character set when running MySQL, you must run <command>myisamchk
       -r -q
-      --set-character-set=<replaceable>charset</replaceable></command>
+      --set-character-set=<replaceable>charset_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
       may also change the sort order.

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-26 03:18:44 UTC (rev 1040)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-26 04:11:07 UTC (rev 1041)
@@ -3748,7 +3748,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     FROM <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -3759,7 +3759,7 @@
 
 <programlisting>
 DELETE [LOW_PRIORITY] [QUICK] [IGNORE]
-    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*] ...]
+    FROM <replaceable>tbl_name</replaceable>[.*] [, <replaceable>tbl_name</replaceable>[.*]] ...
     USING <replaceable>table_references</replaceable>
     [WHERE <replaceable>where_definition</replaceable>]
 </programlisting>
@@ -4076,7 +4076,7 @@
       </para>
 
       <para>
-        <literal>DO</literal> is useful mainly with functions that have
+        <literal>DO</literal> is useful primarily with functions that have
         side effects, such as <literal>RELEASE_LOCK()</literal>.
       </para>
 

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