List:Commits« Previous MessageNext Message »
From:paul Date:January 21 2006 6:27am
Subject:svn commit - mysqldoc@docsrva: r967 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-21 07:27:00 +0100 (Sat, 21 Jan 2006)
New Revision: 967

Log:
 r6519@frost:  paul | 2006-01-21 00:23:38 -0600
 After merge fixes.


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


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-21 05:57:36 UTC (rev 966)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-21 06:27:00 UTC (rev 967)
@@ -6866,14 +6866,13 @@
             </para>
 
             <para>
-              Do not rename target directory if it exists, just add
+              Do not rename target directory (if it exists); merely add
               files to it. This option was added in MySQL 4.0.13.
             </para>
           </listitem>
 
           <listitem>
             <para>
->>>>>>> .r962
               <option>--allowold</option>
             </para>
 
@@ -6885,12 +6884,13 @@
 
           <listitem>
             <para>
-              <option>--checkpoint=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>--checkpoint=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
 
             <para>
-              Insert checkpoint entries into the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Insert checkpoint entries into the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
 
@@ -6941,17 +6941,6 @@
 
           <listitem>
             <para>
-              <option>--host=<replaceable>hostname</replaceable></option>,
-              <option>-h <replaceable>hostname</replaceable></option>
-            </para>
-            
-            <para>
-              Hostname for local server when connecting over TCP/IP.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <option>--host=<replaceable>host_name</replaceable></option>,
               <option>-h <replaceable>host_name</replaceable></option>
             </para>
@@ -7044,13 +7033,11 @@
 
           <listitem>
             <para>
-              <option>
-                --record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
-              </option>
+              <option>--record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
-            
+
             <para>
-              Record slave and master status in the specified database
+              Record master and slave status in the specified database
               <replaceable>db_name</replaceable> and table
               <replaceable>tbl_name</replaceable>.
             </para>

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-21 05:57:36 UTC (rev 966)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-21 06:27:00 UTC (rev 967)
@@ -7090,7 +7090,7 @@
             <para>
               <option>--addtodest</option>
             </para>
-            
+
             <para>
               Do not rename target directory (if it exists); merely add
               files to it.
@@ -7110,12 +7110,13 @@
 
           <listitem>
             <para>
-              <option>--checkpoint=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>--checkpoint=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
 
             <para>
-              Insert checkpoint entries into the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Insert checkpoint entries into the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
 
@@ -7165,8 +7166,8 @@
 
           <listitem>
             <para>
-              <option>--host=<replaceable>hostname</replaceable></option>,
-              <option>-h <replaceable>hostname</replaceable></option>
+              <option>--host=<replaceable>host_name</replaceable></option>,
+              <option>-h <replaceable>host_name</replaceable></option>
             </para>
 
             <para>
@@ -8005,9 +8006,8 @@
               considered insecure. See
               <xref linkend="password-security"/>.
             </para>
+          </listitem>
 
-            </listitem>
-
           <listitem>
             <para>
               <option>--port=<replaceable>port_num</replaceable></option>,

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-21 05:57:36 UTC (rev 966)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-21 06:27:00 UTC (rev 967)
@@ -7136,17 +7136,6 @@
               Display a help message and exit.
             </para>
           </listitem>
-          
-          <listitem>
-            <para>
-              <option>--addtodest</option>
-            </para>
-            
-            <para>
-              Do not rename target directory (if it exists); merely add
-              files to it.
-            </para>
-          </listitem>
 
           <listitem>
             <para>
@@ -7154,7 +7143,7 @@
             </para>
 
             <para>
-              Do not rename target directory if it exists, just add
+              Do not rename target directory (if it exists); merely add
               files to it.
             </para>
           </listitem>
@@ -7172,27 +7161,15 @@
 
           <listitem>
             <para>
-              <option>--checkpoint=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>--checkpoint=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
 
             <para>
-              Insert checkpoint entries into the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Insert checkpoint entries into the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
-          
-          <listitem>
-            <para>
-              <option>
-                --chroot=<replaceable>directory</replaceable>
-              </option>
-            </para>
-            
-            <para>
-              Base directory of chroot jail in which
-              <command>mysqld</command> operates.
-            </para>
-          </listitem>
 
           <listitem>
             <para>
@@ -7237,17 +7214,6 @@
               Flush logs after all tables are locked.
             </para>
           </listitem>
-          
-          <listitem>
-            <para>
-              <option>--host=<replaceable>hostname</replaceable></option>,
-              <option>-h</option>
-            </para>
-            
-            <para>
-              Hostname for local server when connecting over TCP/IP.
-            </para>
-          </listitem>
 
           <listitem>
             <para>
@@ -7338,28 +7304,16 @@
               Be silent except for errors.
             </para>
           </listitem>
-          
-          <listitem>
-            <para>
-              <option>
-                --record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable>
-              </option>
-            </para>
-            
-            <para>
-              Record slave and master status in specified database and
-              table.
-            </para>
-          </listitem>
 
           <listitem>
             <para>
-              <option>--record_log_pos=<replaceable>db_name.tbl_name</replaceable></option>
+              <option>--record_log_pos=<replaceable>db_name</replaceable>.<replaceable>tbl_name</replaceable></option>
             </para>
 
             <para>
-              Record master and slave status in the specified
-              <replaceable>db_name.tbl_name</replaceable>.
+              Record master and slave status in the specified database
+              <replaceable>db_name</replaceable> and table
+              <replaceable>tbl_name</replaceable>.
             </para>
           </listitem>
 
@@ -7373,27 +7327,6 @@
               expression.
             </para>
           </listitem>
-          
-          <listitem>
-            <para>
-              <option>--resetmaster</option>
-            </para>
-            
-            <para>
-              Reset the binlog once all tables are locked.
-            </para>
-          </listitem>
-          
-          <listitem>
-            <para>
-              <option>--resetslave</option>
-            </para>
-            
-            <para>
-              Reset the <filename>master.info</filename> file once all
-              tables are locked.
-            </para>
-          </listitem>
 
           <listitem>
             <para>

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