Author: paul
Date: 2008-07-09 19:49:57 +0200 (Wed, 09 Jul 2008)
New Revision: 11149
Log:
r32050@arctic: paul | 2008-07-09 12:36:09 -0500
--protocol option:
- Don't list all values in dyndocs, to make value in summary tables shorter
- List all values in option descriptions, to be more informative
Modified:
trunk/dynamic-docs/command-optvars/mysql.xml
trunk/dynamic-docs/command-optvars/mysqladmin.xml
trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
trunk/dynamic-docs/command-optvars/mysqlcheck.xml
trunk/dynamic-docs/command-optvars/mysqlimport.xml
trunk/dynamic-docs/command-optvars/mysqlshow.xml
trunk/dynamic-docs/command-optvars/mysqlslap.xml
trunk/refman-6.0/programs-admin-util-core.xml
trunk/refman-6.0/programs-client-core.xml
trunk/refman-6.0/programs-using.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:32399
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32047
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32399
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32050
Modified: trunk/dynamic-docs/command-optvars/mysql.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysql.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 533 bytes
@@ -1095,8 +1095,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqladmin.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqladmin.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqladmin.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 546 bytes
@@ -467,8 +467,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 549 bytes
@@ -246,8 +246,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlcheck.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlcheck.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqlcheck.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 546 bytes
@@ -352,8 +352,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlimport.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlimport.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqlimport.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 549 bytes
@@ -328,8 +328,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlshow.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlshow.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqlshow.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 543 bytes
@@ -326,8 +326,7 @@
</shortdescription>
<types>
- <optype class="cmdline"
- format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlslap.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlslap.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/dynamic-docs/command-optvars/mysqlslap.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 537 bytes
@@ -1211,7 +1211,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--protocol={TCP|SOCKET|PIPE|MEMORY}"/>
+ <optype class="cmdline" format="--protocol=type"/>
<optype class="mycnf"/>
</types>
Modified: trunk/refman-6.0/programs-admin-util-core.xml
===================================================================
--- trunk/refman-6.0/programs-admin-util-core.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/refman-6.0/programs-admin-util-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 561 bytes
@@ -4072,7 +4072,7 @@
<secondary>mysqlbinlog</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/refman-6.0/programs-client-core.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 7; 2149 bytes
@@ -969,7 +969,7 @@
<secondary>mysql</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -4071,7 +4071,7 @@
<secondary>mysqladmin</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -5137,7 +5137,7 @@
<secondary>mysqlcheck</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -6906,7 +6906,7 @@
<secondary>mysqldump</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -8379,7 +8379,7 @@
<secondary>mysqlimport</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -9046,7 +9046,7 @@
<secondary>mysqlshow</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
@@ -10231,7 +10231,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
Modified: trunk/refman-6.0/programs-using.xml
===================================================================
--- trunk/refman-6.0/programs-using.xml 2008-07-09 17:33:41 UTC (rev 11148)
+++ trunk/refman-6.0/programs-using.xml 2008-07-09 17:49:57 UTC (rev 11149)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 517 bytes
@@ -403,7 +403,7 @@
<primary>protocol option</primary>
</indexterm>
-
<option>--protocol=<replaceable>type</replaceable></option>
+ <option>--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11149 - in trunk: . dynamic-docs/command-optvars refman-6.0 | paul | 9 Jul |