Author: paul
Date: 2009-02-13 04:31:39 +0100 (Fri, 13 Feb 2009)
New Revision: 13746
Log:
r38568@frost: paul | 2009-02-12 21:30:46 -0500
Fix markup
Modified:
trunk/refman-4.1/programs-client.xml
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.1/programs-client-core.xml
trunk/refman-6.0/programs-client-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38564
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41755
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38568
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml 2009-02-13 03:30:40 UTC (rev 13745)
+++ trunk/refman-4.1/programs-client.xml 2009-02-13 03:31:39 UTC (rev 13746)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1426 bytes
@@ -7468,7 +7468,7 @@
<para>
See the description for the
- <option role="mysqldump">--replace</option> option.
+ <option role="mysqlimport">--replace</option> option.
</para>
</listitem>
@@ -7712,15 +7712,15 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>,
+ <option role="mysqlimport">--replace</option>,
<option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and
+ The <option role="mysqlimport">--replace</option> and
<option>--ignore</option> options control handling of input
rows that duplicate existing rows on unique key values. If
- you specify <option role="mysqldump">--replace</option>, new
+ you specify <option role="mysqlimport">--replace</option>, new
rows replace existing rows that have the same unique key
value. If you specify <option>--ignore</option>, input rows
that duplicate an existing row on a unique key value are
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2009-02-13 03:30:40 UTC (rev 13745)
+++ trunk/refman-5.0/programs-client-core.xml 2009-02-13 03:31:39 UTC (rev 13746)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1441 bytes
@@ -8026,7 +8026,7 @@
<para>
See the description for the
- <option role="mysqldump">--replace</option> option.
+ <option role="mysqlimport">--replace</option> option.
</para>
</listitem>
@@ -8269,15 +8269,15 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>,
+ <option role="mysqlimport">--replace</option>,
<option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and
+ The <option role="mysqlimport">--replace</option> and
<option>--ignore</option> options control handling of input
rows that duplicate existing rows on unique key values. If
- you specify <option role="mysqldump">--replace</option>, new
+ you specify <option role="mysqlimport">--replace</option>, new
rows replace existing rows that have the same unique key
value. If you specify <option>--ignore</option>, input rows
that duplicate an existing row on a unique key value are
Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml 2009-02-13 03:30:40 UTC (rev 13745)
+++ trunk/refman-5.1/programs-client-core.xml 2009-02-13 03:31:39 UTC (rev 13746)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1441 bytes
@@ -8326,7 +8326,7 @@
<para>
See the description for the
- <option role="mysqldump">--replace</option> option.
+ <option role="mysqlimport">--replace</option> option.
</para>
</listitem>
@@ -8569,15 +8569,15 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>,
+ <option role="mysqlimport">--replace</option>,
<option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and
+ The <option role="mysqlimport">--replace</option> and
<option>--ignore</option> options control handling of input
rows that duplicate existing rows on unique key values. If
- you specify <option role="mysqldump">--replace</option>, new
+ you specify <option role="mysqlimport">--replace</option>, new
rows replace existing rows that have the same unique key
value. If you specify <option>--ignore</option>, input rows
that duplicate an existing row on a unique key value are
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2009-02-13 03:30:40 UTC (rev 13745)
+++ trunk/refman-6.0/programs-client-core.xml 2009-02-13 03:31:39 UTC (rev 13746)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1441 bytes
@@ -8289,7 +8289,7 @@
<para>
See the description for the
- <option role="mysqldump">--replace</option> option.
+ <option role="mysqlimport">--replace</option> option.
</para>
</listitem>
@@ -8532,15 +8532,15 @@
<secondary>mysqlimport</secondary>
</indexterm>
- <option role="mysqldump">--replace</option>,
+ <option role="mysqlimport">--replace</option>,
<option>-r</option>
</para>
<para>
- The <option role="mysqldump">--replace</option> and
+ The <option role="mysqlimport">--replace</option> and
<option>--ignore</option> options control handling of input
rows that duplicate existing rows on unique key values. If
- you specify <option role="mysqldump">--replace</option>, new
+ you specify <option role="mysqlimport">--replace</option>, new
rows replace existing rows that have the same unique key
value. If you specify <option>--ignore</option>, input rows
that duplicate an existing row on a unique key value are
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13746 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 13 Feb |