Author: paul
Date: 2008-06-24 19:58:38 +0200 (Tue, 24 Jun 2008)
New Revision: 11021
Log:
r32216@frost: paul | 2008-06-24 12:58:53 -0500
Move misplaced table lines
Modified:
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.0/programs-server-core.xml
trunk/refman-5.1/programs-client-core.xml
trunk/refman-5.1/programs-server-core.xml
trunk/refman-6.0/programs-client-core.xml
trunk/refman-6.0/programs-server-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32213
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32216
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-5.0/programs-client-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 12; 2564 bytes
@@ -156,12 +156,12 @@
<secondary>mysql</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysql:all"/>
+
<para>
<command>mysql</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysql:all"/>
-
<itemizedlist>
<listitem>
@@ -3661,12 +3661,12 @@
<secondary>mysqladmin</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqladmin:all"/>
+
<para>
<command>mysqladmin</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqladmin:all"/>
-
<itemizedlist>
<listitem>
@@ -4373,12 +4373,12 @@
</tgroup>
</informaltable>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlcheck:all"/>
+
<para>
<command>mysqlcheck</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlcheck:all"/>
-
<itemizedlist>
<listitem>
@@ -5333,12 +5333,12 @@
deal with old servers.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqldump:all"/>
+
<para>
<command>mysqldump</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqldump:all"/>
-
<itemizedlist>
<listitem>
@@ -7526,12 +7526,12 @@
named <literal>patient</literal>.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlimport:all"/>
+
<para>
<command>mysqlimport</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlimport:all"/>
-
<itemizedlist>
<listitem>
@@ -8330,12 +8330,12 @@
last on the command line as a separate argument.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlshow:all"/>
+
<para>
<command>mysqlshow</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqlshow:all"/>
-
<itemizedlist>
<listitem>
Modified: trunk/refman-5.0/programs-server-core.xml
===================================================================
--- trunk/refman-5.0/programs-server-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-5.0/programs-server-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 673 bytes
@@ -255,12 +255,12 @@
in MySQL ¤t-series; installations.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.0:mysqld_safe:all"/>
+
<para>
<command>mysqld_safe</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.0:mysqld_safe:all"/>
-
<itemizedlist>
<listitem>
Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-5.1/programs-client-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 7, Lines Added: 14, Lines Deleted: 14; 2952 bytes
@@ -156,12 +156,12 @@
<secondary>mysql</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysql:all"/>
+
<para>
<command>mysql</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysql:all"/>
-
<itemizedlist>
<listitem>
@@ -3765,12 +3765,12 @@
<secondary>mysqladmin</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqladmin:all"/>
+
<para>
<command>mysqladmin</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqladmin:all"/>
-
<itemizedlist>
<listitem>
@@ -4499,12 +4499,12 @@
</tgroup>
</informaltable>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlcheck:all"/>
+
<para>
<command>mysqlcheck</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlcheck:all"/>
-
<itemizedlist>
<listitem>
@@ -5516,12 +5516,12 @@
</para>
</note>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqldump:all"/>
+
<para>
<command>mysqldump</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqldump:all"/>
-
<itemizedlist>
<listitem>
@@ -7798,12 +7798,12 @@
named <literal>patient</literal>.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlimport:all"/>
+
<para>
<command>mysqlimport</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlimport:all"/>
-
<itemizedlist>
<listitem>
@@ -8666,12 +8666,12 @@
last on the command line as a separate argument.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlshow:all"/>
+
<para>
<command>mysqlshow</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlshow:all"/>
-
<itemizedlist>
<listitem>
@@ -9188,12 +9188,12 @@
<command>mysqlslap</command> does not understand them.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlslap:all"/>
+
<para>
<command>mysqlslap</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlslap:all"/>
-
<itemizedlist>
<listitem>
Modified: trunk/refman-5.1/programs-server-core.xml
===================================================================
--- trunk/refman-5.1/programs-server-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-5.1/programs-server-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 673 bytes
@@ -218,12 +218,12 @@
in MySQL ¤t-series; installations.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="5.1:mysqld_safe:all"/>
+
<para>
<command>mysqld_safe</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="5.1:mysqld_safe:all"/>
-
<itemizedlist>
<listitem>
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-6.0/programs-client-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 7, Lines Added: 13, Lines Deleted: 17; 3089 bytes
@@ -155,12 +155,12 @@
<secondary>mysql</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysql:all"/>
+
<para>
<command>mysql</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysql:all"/>
-
<itemizedlist>
<listitem>
@@ -3762,12 +3762,12 @@
<secondary>mysqladmin</secondary>
</indexterm>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqladmin:all"/>
+
<para>
<command>mysqladmin</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqladmin:all"/>
-
<itemizedlist>
<listitem>
@@ -4495,12 +4495,12 @@
</tgroup>
</informaltable>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlcheck:all"/>
+
<para>
<command>mysqlcheck</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlcheck:all"/>
-
<itemizedlist>
<listitem>
@@ -5498,16 +5498,12 @@
option. Use <option>--skip-opt</option> instead.
</para>
- <para>
- <command>mysqldump</command> supports the following options:
- </para>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqldump:all"/>
<para>
<command>mysqldump</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqldump:all"/>
-
<itemizedlist>
<listitem>
@@ -7766,12 +7762,12 @@
named <literal>patient</literal>.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlimport:all"/>
+
<para>
<command>mysqlimport</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlimport:all"/>
-
<itemizedlist>
<listitem>
@@ -8632,12 +8628,12 @@
last on the command line as a separate argument.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlshow:all"/>
+
<para>
<command>mysqlshow</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlshow:all"/>
-
<itemizedlist>
<listitem>
@@ -9151,12 +9147,12 @@
<command>mysqlslap</command> does not understand them.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlslap:all"/>
+
<para>
<command>mysqlslap</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqlslap:all"/>
-
<itemizedlist>
<listitem>
Modified: trunk/refman-6.0/programs-server-core.xml
===================================================================
--- trunk/refman-6.0/programs-server-core.xml 2008-06-24 17:58:10 UTC (rev 11020)
+++ trunk/refman-6.0/programs-server-core.xml 2008-06-24 17:58:38 UTC (rev 11021)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 673 bytes
@@ -198,12 +198,12 @@
in MySQL ¤t-series; installations.
</para>
+ <para condition="dynamic:optvar:commandoptions" role="6.0:mysqld_safe:all"/>
+
<para>
<command>mysqld_safe</command> supports the following options:
</para>
- <para condition="dynamic:optvar:commandoptions" role="6.0:mysqld_safe:all"/>
-
<itemizedlist>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11021 - in trunk: . refman-5.0 refman-5.1 refman-6.0 | paul | 24 Jun |
