List:Commits« Previous MessageNext Message »
From:paul Date:January 13 2006 9:34pm
Subject:svn commit - mysqldoc@docsrva: r817 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-13 22:34:56 +0100 (Fri, 13 Jan 2006)
New Revision: 817

Log:
 r2175@kite-hub:  paul | 2006-01-13 15:34:44 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/apis.xml
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/database-administration.xml


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

Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-4.1/apis.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -5601,7 +5601,7 @@
                 <entry>Use named pipes to connect to a MySQL server on NT.</entry>
               </row>
               <row>
-                <entry><literal>protocol={TCP | SOCKET | PIPE | MEMORY}</literal></entry>
+                <entry><literal>protocol={TCP|SOCKET|PIPE|MEMORY}</literal></entry>
                 <entry>The protocol to use when connecting to the server. (Added in MySQL 4.1)</entry>
               </row>
               <row>
@@ -13318,6 +13318,7 @@
 
         <refmeta>
           <refentrytitle><command>msql2mysql</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13327,6 +13328,7 @@
 
         <refnamediv>
           <refname>msql2mysql</refname>
+           
           <refpurpose>&title-msql2mysql-for-manpage;</refpurpose>
         </refnamediv>
 
@@ -13391,6 +13393,7 @@
 
         <refmeta>
           <refentrytitle><command>mysql_config</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13400,6 +13403,7 @@
 
         <refnamediv>
           <refname>mysql_config</refname>
+           
           <refpurpose>&title-mysql-config-for-manpage;</refpurpose>
         </refnamediv>
 

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -589,8 +589,9 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output.
+              Verbose mode. Print more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output.
             </para>
           </listitem>
 
@@ -1537,7 +1538,7 @@
 
       <refsection id="mysql-command-options">
 
-        <title>Options</title>
+        <title><command>mysql</command> Options</title>
 
         <indexterm>
           <primary><command>mysql</command> command-line options</primary>
@@ -2016,7 +2017,7 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -2193,7 +2194,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -2273,10 +2276,11 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output. (For
-              example, <option>-v -v -v</option> produces the table
-              output format even in batch mode.)
+              Verbose mode. Produce more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output. (For example, <option>-v -v
+              -v</option> produces the table output format even in batch
+              mode.)
             </para>
           </listitem>
 
@@ -2348,7 +2352,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4252,7 +4256,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4303,7 +4307,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4324,7 +4330,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -4369,7 +4375,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4653,7 +4659,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4706,7 +4712,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4839,7 +4847,7 @@
         <para>
           You can also set the following variable by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4861,6 +4869,14 @@
         </itemizedlist>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can pipe the output of <command>mysqlbinlog</command> into
           a <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
@@ -5411,7 +5427,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -5466,7 +5482,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6226,7 +6244,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -6343,8 +6361,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6426,7 +6445,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -6482,7 +6501,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -7242,7 +7261,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7286,8 +7305,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7308,8 +7328,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 
@@ -7623,7 +7643,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7638,8 +7658,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7670,9 +7691,9 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does. This option can be used multiple times to increase
-              the amount of information.
+              Verbose mode. Print more information about what the
+              program does. This option can be used multiple times to
+              increase the amount of information.
             </para>
           </listitem>
 
@@ -8057,8 +8078,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-4.1/database-administration.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -387,8 +387,8 @@
 
           <para>
             This option enables support for the
-            <literal>EXAMPLE</literal> storage engine in MySQL 4.1.10 and
-            newer.
+            <literal>EXAMPLE</literal> storage engine in MySQL 4.1.10
+            and newer.
           </para>
         </listitem>
 
@@ -3584,6 +3584,14 @@
         </para>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can find a full description for all variables in
           <xref linkend="server-system-variables"/>. The section on
           tuning server parameters includes information on how to
@@ -17204,6 +17212,7 @@
 
         <refnamediv>
           <refname>isamchk</refname>
+           
           <refpurpose>&title-isamchk-for-manpage;</refpurpose>
         </refnamediv>
 
@@ -17433,11 +17442,11 @@
               </para>
 
               <para>
-                Verbose mode. Print more information. This can be used
-                with <option>-d</option> and <option>-e</option>. Use
-                <option>-v</option> multiple times
-                (<option>-vv</option>, <option>-vvv</option>) for even
-                more output.
+                Verbose mode. Print more information about what the
+                program does. This can be used with <option>-d</option>
+                and <option>-e</option>. Use <option>-v</option>
+                multiple times (<option>-vv</option>,
+                <option>-vvv</option>) for even more output.
               </para>
             </listitem>
 
@@ -17472,7 +17481,7 @@
           <para>
             You can also set the following variables by using
             <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-            options:
+            syntax:
           </para>
 
           <indexterm>
@@ -22505,8 +22514,7 @@
         hostname, <command>mysqladmin</command> defaults to using a Unix
         socket file connection rather than TCP/IP. In MySQL 4.1, you can
         explicitly specify the connection protocol to use by using the
-        <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
-        option.
+        <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option> option.
       </para>
 
       <para>

Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.0/apis.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -5648,7 +5648,7 @@
                 <entry>Use named pipes to connect to a MySQL server on NT.</entry>
               </row>
               <row>
-                <entry><literal>protocol={TCP | SOCKET | PIPE | MEMORY}</literal></entry>
+                <entry><literal>protocol={TCP|SOCKET|PIPE|MEMORY}</literal></entry>
                 <entry>The protocol to use when connecting to the server.</entry>
               </row>
               <row>
@@ -13285,6 +13285,7 @@
 
         <refmeta>
           <refentrytitle><command>msql2mysql</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13294,6 +13295,7 @@
 
         <refnamediv>
           <refname>msql2mysql</refname>
+           
           <refpurpose>&title-msql2mysql-for-manpage;</refpurpose>
         </refnamediv>
 
@@ -13358,6 +13360,7 @@
 
         <refmeta>
           <refentrytitle><command>mysql_config</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13367,6 +13370,7 @@
 
         <refnamediv>
           <refname>mysql_config</refname>
+           
           <refpurpose>&title-mysql-config-for-manpage;</refpurpose>
         </refnamediv>
 

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -561,8 +561,9 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output.
+              Verbose mode. Print more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output.
             </para>
           </listitem>
 
@@ -1479,7 +1480,7 @@
 
       <refsection id="mysql-command-options">
 
-        <title>Options</title>
+        <title><command>mysql</command> Options</title>
 
         <indexterm>
           <primary><command>mysql</command> command-line options</primary>
@@ -1958,7 +1959,7 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -2149,7 +2150,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -2229,10 +2232,11 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output. (For
-              example, <option>-v -v -v</option> produces the table
-              output format even in batch mode.)
+              Verbose mode. Produce more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output. (For example, <option>-v -v
+              -v</option> produces the table output format even in batch
+              mode.)
             </para>
           </listitem>
 
@@ -2304,7 +2308,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4208,7 +4212,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4259,7 +4263,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4280,7 +4286,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -4325,7 +4331,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4377,8 +4383,7 @@
           <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           or <option>-O
           <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          syntax. However, this syntax is now deprecated, and should no
-          longer be used.
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
         </para>
 
       </refsection>
@@ -4620,7 +4625,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4673,7 +4678,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4801,7 +4808,7 @@
         <para>
           You can also set the following variable by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4823,6 +4830,14 @@
         </itemizedlist>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can pipe the output of <command>mysqlbinlog</command> into
           a <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
@@ -5529,7 +5544,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -5583,7 +5598,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6280,7 +6297,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -6427,8 +6444,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6543,7 +6561,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -6599,7 +6617,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -6640,7 +6658,7 @@
           <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           or <option>-O
           <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          syntax. However, this syntax now deprecated.
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
         </para>
 
         <para>
@@ -7355,7 +7373,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7399,8 +7417,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7421,8 +7440,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 
@@ -7736,7 +7755,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7764,8 +7783,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7796,9 +7816,9 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does. This option can be used multiple times to increase
-              the amount of information.
+              Verbose mode. Print more information about what the
+              program does. This option can be used multiple times to
+              increase the amount of information.
             </para>
           </listitem>
 
@@ -8183,8 +8203,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.0/database-administration.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -4380,6 +4380,14 @@
         </para>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can find a full description for all variables in
           <xref linkend="server-system-variables"/>. The section on
           tuning server parameters includes information on how to
@@ -19669,11 +19677,11 @@
               </para>
 
               <para>
-                Verbose mode. Print more information. This can be used
-                with <option>-d</option> and <option>-e</option>. Use
-                <option>-v</option> multiple times
-                (<option>-vv</option>, <option>-vvv</option>) for even
-                more output.
+                Verbose mode. Print more information about what the
+                program does. This can be used with <option>-d</option>
+                and <option>-e</option>. Use <option>-v</option>
+                multiple times (<option>-vv</option>,
+                <option>-vvv</option>) for even more output.
               </para>
             </listitem>
 
@@ -19708,7 +19716,7 @@
           <para>
             You can also set the following variables by using
             <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-            options:
+            syntax:
           </para>
 
           <indexterm>
@@ -23313,8 +23321,8 @@
             server is started with
             <literal>binlog-do-db=sales</literal>, and you do
             <literal>USE prices; UPDATE sales.january SET
-            amount=amount+1000;</literal>, this statement <emphasis>is</emphasis>
-            written into the binary log.
+            amount=amount+1000;</literal>, this statement
+            <emphasis>is</emphasis> written into the binary log.
           </para>
         </listitem>
 
@@ -24522,8 +24530,8 @@
         hostname, <command>mysqladmin</command> defaults to using a Unix
         socket file connection rather than TCP/IP. From MySQL 4.1
         onward, you can explicitly specify the connection protocol to
-        use by using the <option>--protocol={TCP | SOCKET | PIPE |
-        MEMORY}</option> option.
+        use by using the
+        <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option> option.
       </para>
 
       <para>

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.1/apis.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -5643,7 +5643,7 @@
                 <entry>Use named pipes to connect to a MySQL server on NT.</entry>
               </row>
               <row>
-                <entry><literal>protocol={TCP | SOCKET | PIPE | MEMORY}</literal></entry>
+                <entry><literal>protocol={TCP|SOCKET|PIPE|MEMORY}</literal></entry>
                 <entry>The protocol to use when connecting to the server.</entry>
               </row>
               <row>
@@ -13288,6 +13288,7 @@
 
         <refmeta>
           <refentrytitle><command>msql2mysql</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13297,6 +13298,7 @@
 
         <refnamediv>
           <refname>msql2mysql</refname>
+           
           <refpurpose>&title-msql2mysql-for-manpage;</refpurpose>
         </refnamediv>
 
@@ -13361,6 +13363,7 @@
 
         <refmeta>
           <refentrytitle><command>mysql_config</command></refentrytitle>
+           
           <manvolnum>1</manvolnum>
           <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
           <refmiscinfo class="source">MySQL</refmiscinfo>
@@ -13370,6 +13373,7 @@
 
         <refnamediv>
           <refname>mysql_config</refname>
+           
           <refpurpose>&title-mysql-config-for-manpage;</refpurpose>
         </refnamediv>
 

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -561,8 +561,9 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output.
+              Verbose mode. Print more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output.
             </para>
           </listitem>
 
@@ -1479,7 +1480,7 @@
 
       <refsection id="mysql-command-options">
 
-        <title>Options</title>
+        <title><command>mysql</command> Options</title>
 
         <indexterm>
           <primary><command>mysql</command> command-line options</primary>
@@ -1958,7 +1959,7 @@
                 <secondary><command>mysql</command> option</secondary>
               </indexterm>
 
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -2149,7 +2150,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -2229,10 +2232,11 @@
             </para>
 
             <para>
-              Verbose mode. Produce more output. This option can be
-              given multiple times to produce more and more output. (For
-              example, <option>-v -v -v</option> produces the table
-              output format even in batch mode.)
+              Verbose mode. Produce more output about what the program
+              does. This option can be given multiple times to produce
+              more and more output. (For example, <option>-v -v
+              -v</option> produces the table output format even in batch
+              mode.)
             </para>
           </listitem>
 
@@ -2304,7 +2308,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4207,7 +4211,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4258,7 +4262,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4279,7 +4285,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -4324,7 +4330,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4376,8 +4382,7 @@
           <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           or <option>-O
           <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          syntax. However, this syntax is now deprecated, and should no
-          longer be used.
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
         </para>
 
       </refsection>
@@ -4632,7 +4637,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -4697,7 +4702,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -4825,7 +4832,7 @@
         <para>
           You can also set the following variable by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -4847,6 +4854,14 @@
         </itemizedlist>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can pipe the output of <command>mysqlbinlog</command> into
           a <command>mysql</command> client to execute the statements
           contained in the binary log. This is used to recover from a
@@ -5553,7 +5568,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -5607,7 +5622,9 @@
             </para>
 
             <para>
-              The socket file to use for the connection.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6303,7 +6320,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -6462,8 +6479,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -6576,7 +6594,7 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information on what the
+              Verbose mode. Print more information about what the
               program does.
             </para>
           </listitem>
@@ -6632,7 +6650,7 @@
         <para>
           You can also set the following variables by using
           <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          options:
+          syntax:
         </para>
 
         <itemizedlist>
@@ -6673,7 +6691,7 @@
           <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
           or <option>-O
           <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-          syntax. However, this syntax now deprecated.
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
         </para>
 
         <para>
@@ -7388,7 +7406,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7432,8 +7450,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7454,8 +7473,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 
@@ -7763,7 +7782,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -7790,8 +7809,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -7822,9 +7842,9 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does. This option can be used multiple times to increase
-              the amount of information.
+              Verbose mode. Print more information about what the
+              program does. This option can be used multiple times to
+              increase the amount of information.
             </para>
           </listitem>
 
@@ -8128,7 +8148,7 @@
 
           <listitem>
             <para>
-              <option>--protocol={TCP | SOCKET | PIPE | MEMORY}</option>
+              <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
             </para>
 
             <para>
@@ -8196,8 +8216,9 @@
             </para>
 
             <para>
-              The socket file to use when connecting to
-              <literal>localhost</literal> (which is the default host).
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
@@ -8218,8 +8239,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 
@@ -8604,8 +8625,8 @@
             </para>
 
             <para>
-              Verbose mode. Print out more information what the program
-              does.
+              Verbose mode. Print more information about what the
+              program does.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-13 20:53:45 UTC (rev 816)
+++ trunk/refman-5.1/database-administration.xml	2006-01-13 21:34:56 UTC (rev 817)
@@ -4323,10 +4323,6 @@
           certain values are allowed.
         </para>
 
-        <remark role="todo">
-          Determine if this is still supported at all in MySQL 5.1.
-        </remark>
-
         <para>
           It is also possible to set variables by using
           <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
@@ -4336,6 +4332,14 @@
         </para>
 
         <para>
+          It is also possible to set variables by using
+          <option>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          or <option>-O
+          <replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
+          syntax. <emphasis>This syntax is deprecated</emphasis>.
+        </para>
+
+        <para>
           You can find a full description for all variables in
           <xref linkend="server-system-variables"/>. The section on
           tuning server parameters includes information on how to
@@ -19618,11 +19622,11 @@
               </para>
 
               <para>
-                Verbose mode. Print more information. This can be used
-                with <option>-d</option> and <option>-e</option>. Use
-                <option>-v</option> multiple times
-                (<option>-vv</option>, <option>-vvv</option>) for even
-                more output.
+                Verbose mode. Print more information about what the
+                program does. This can be used with <option>-d</option>
+                and <option>-e</option>. Use <option>-v</option>
+                multiple times (<option>-vv</option>,
+                <option>-vvv</option>) for even more output.
               </para>
             </listitem>
 
@@ -19657,7 +19661,7 @@
           <para>
             You can also set the following variables by using
             <option>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></option>
-            options:
+            syntax:
           </para>
 
           <indexterm>
@@ -24467,8 +24471,8 @@
         hostname, <command>mysqladmin</command> defaults to using a Unix
         socket file connection rather than TCP/IP. From MySQL 4.1
         onward, you can explicitly specify the connection protocol to
-        use by using the <option>--protocol={TCP | SOCKET | PIPE |
-        MEMORY}</option> option.
+        use by using the
+        <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option> option.
       </para>
 
       <para>

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