Author: paul
Date: 2008-02-11 16:53:31 +0100 (Mon, 11 Feb 2008)
New Revision: 9777
Log:
r29114@arctic: paul | 2008-02-11 09:48:54 -0600
In dynamic docs numeric option descriptions, consistently use --opt-name=#,
not --opt-name=# sometimes, --opt-name=N sometimes.
Modified:
trunk/dynamic-docs/command-optvars/myisamchk.xml
trunk/dynamic-docs/command-optvars/mysql_find_rows.xml
trunk/dynamic-docs/command-optvars/mysqlaccess.xml
trunk/dynamic-docs/command-optvars/mysqladmin.xml
trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/dynamic-docs/command-optvars/mysqlimport.xml
trunk/dynamic-docs/command-optvars/mysqlslap.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29069
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29070
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34985
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29069
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29114
Modified: trunk/dynamic-docs/command-optvars/myisamchk.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/myisamchk.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/myisamchk.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 10; 2546 bytes
@@ -1165,7 +1165,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--sort-records=N"/>
+ <optype class="cmdline" format="--sort-records=#"/>
<optype class="cmdline" format="-R N"/>
<optype class="mycnf"/>
</types>
@@ -1195,7 +1195,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="decode_bits=N"/>
+ <optype class="cmdline" format="decode_bits=#"/>
<optype class="mycnf"/>
</types>
@@ -1226,7 +1226,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="ft_max_word_len=N"/>
+ <optype class="cmdline" format="ft_max_word_len=#"/>
<optype class="mycnf"/>
</types>
@@ -1253,7 +1253,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="ft_min_word_len=N"/>
+ <optype class="cmdline" format="ft_min_word_len=#"/>
<optype class="mycnf"/>
</types>
@@ -1311,7 +1311,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="key_buffer_size=N"/>
+ <optype class="cmdline" format="key_buffer_size=#"/>
<optype class="mycnf"/>
</types>
@@ -1342,7 +1342,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="myisam_block_size=N"/>
+ <optype class="cmdline" format="myisam_block_size=#"/>
<optype class="mycnf"/>
</types>
@@ -1374,7 +1374,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="read_buffer_size=N"/>
+ <optype class="cmdline" format="read_buffer_size=#"/>
<optype class="mycnf"/>
</types>
@@ -1406,7 +1406,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="sort_buffer_size=N"/>
+ <optype class="cmdline" format="sort_buffer_size=#"/>
<optype class="mycnf"/>
</types>
@@ -1437,7 +1437,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="sort_key_blocks=N"/>
+ <optype class="cmdline" format="sort_key_blocks=#"/>
<optype class="mycnf"/>
</types>
@@ -1500,7 +1500,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="write_buffer_size=N"/>
+ <optype class="cmdline" format="write_buffer_size=#"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysql_find_rows.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysql_find_rows.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysql_find_rows.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 725 bytes
@@ -65,7 +65,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--rows=N"/>
+ <optype class="cmdline" format="--rows=#"/>
<optype class="mycnf"/>
</types>
@@ -115,7 +115,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--start_row=N"/>
+ <optype class="cmdline" format="--start_row=#"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlaccess.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlaccess.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqlaccess.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 507 bytes
@@ -228,7 +228,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--debug=N"/>
+ <optype class="cmdline" format="--debug=#"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqladmin.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqladmin.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqladmin.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 553 bytes
@@ -119,7 +119,7 @@
<seealso xref="sleep"/>
<types>
- <optype class="cmdline" format="--count=N"/>
+ <optype class="cmdline" format="--count=#"/>
<optype class="cmdline" format="-c N"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlbinlog.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqlbinlog.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 5, Lines Added: 5, Lines Deleted: 5; 1473 bytes
@@ -539,7 +539,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--offset=N"/>
+ <optype class="cmdline" format="--offset=#"/>
<optype class="cmdline" format="-o N"/>
<optype class="mycnf"/>
</types>
@@ -571,7 +571,7 @@
<deprecated version="4.1.3"/>
<types>
- <optype class="cmdline" format="--position=N"/>
+ <optype class="cmdline" format="--position=#"/>
<optype class="cmdline" format="-j"/>
<optype class="mycnf"/>
</types>
@@ -787,7 +787,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--start-position=N"/>
+ <optype class="cmdline" format="--start-position=#"/>
<optype class="mycnf"/>
</types>
@@ -816,7 +816,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--stop-position=N"/>
+ <optype class="cmdline" format="--stop-position=#"/>
<optype class="mycnf"/>
</types>
@@ -877,7 +877,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="open_files_limit=N"/>
+ <optype class="cmdline" format="open_files_limit=#"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 820 bytes
@@ -5662,7 +5662,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--binlog-row-event-max-size=N"/>
+ <optype class="cmdline" format="--binlog-row-event-max-size=#"/>
<optype class="mycnf"/>
</types>
@@ -7678,7 +7678,7 @@
<seealso xref="last_insert_id"/>
<types>
- <optype class="cmdline" format="--identity=N"/>
+ <optype class="cmdline" format="--identity=#"/>
<optype class="mycnf"/>
<vartype class="system" isdynamic="yes" scope="session"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlimport.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlimport.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqlimport.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 521 bytes
@@ -678,7 +678,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--ignore-lines=N"/>
+ <optype class="cmdline" format="--ignore-lines=#"/>
<optype class="mycnf"/>
</types>
Modified: trunk/dynamic-docs/command-optvars/mysqlslap.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlslap.xml 2008-02-11 15:34:02 UTC (rev 9776)
+++ trunk/dynamic-docs/command-optvars/mysqlslap.xml 2008-02-11 15:53:31 UTC (rev 9777)
Changed blocks: 13, Lines Added: 13, Lines Deleted: 13; 3551 bytes
@@ -84,7 +84,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--auto-generate-sql-execute-number=N"/>
+ <optype class="cmdline" format="--auto-generate-sql-execute-number=#"/>
<optype class="mycnf"/>
</types>
@@ -170,7 +170,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--auto-generate-sql-secondary-indexes=N"/>
+ <optype class="cmdline" format="--auto-generate-sql-secondary-indexes=#"/>
<optype class="mycnf"/>
</types>
@@ -200,7 +200,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--auto-generate-sql-unique-query-number=N"/>
+ <optype class="cmdline" format="--auto-generate-sql-unique-query-number=#"/>
<optype class="mycnf"/>
</types>
@@ -231,7 +231,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--auto-generate-sql-unique-write-number=N"/>
+ <optype class="cmdline" format="--auto-generate-sql-unique-write-number=#"/>
<optype class="mycnf"/>
</types>
@@ -261,7 +261,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--auto-generate-sql-write-number=N"/>
+ <optype class="cmdline" format="--auto-generate-sql-write-number=#"/>
<optype class="mycnf"/>
</types>
@@ -291,7 +291,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--commit=N"/>
+ <optype class="cmdline" format="--commit=#"/>
<optype class="mycnf"/>
</types>
@@ -425,7 +425,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--detach=N"/>
+ <optype class="cmdline" format="--detach=#"/>
<optype class="mycnf"/>
</types>
@@ -573,7 +573,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--set-random-seed=N"/>
+ <optype class="cmdline" format="--set-random-seed=#"/>
<optype class="mycnf"/>
</types>
@@ -875,7 +875,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--concurrency=N"/>
+ <optype class="cmdline" format="--concurrency=#"/>
<optype class="cmdline" format="-c N"/>
<optype class="mycnf"/>
</types>
@@ -1029,7 +1029,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--iterations=N"/>
+ <optype class="cmdline" format="--iterations=#"/>
<optype class="cmdline" format="-i N"/>
<optype class="mycnf"/>
</types>
@@ -1081,7 +1081,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--number-char-cols=N"/>
+ <optype class="cmdline" format="--number-char-cols=#"/>
<optype class="cmdline" format="-x N"/>
<optype class="mycnf"/>
</types>
@@ -1108,7 +1108,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--number-int-cols=N"/>
+ <optype class="cmdline" format="--number-int-cols=#"/>
<optype class="cmdline" format="-y N"/>
<optype class="mycnf"/>
</types>
@@ -1134,7 +1134,7 @@
</shortdescription>
<types>
- <optype class="cmdline" format="--number-of-queries=N" inversion="5.1.5"/>
+ <optype class="cmdline" format="--number-of-queries=#" inversion="5.1.5"/>
<optype class="mycnf"/>
</types>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r9777 - in trunk: . dynamic-docs/command-optvars | paul | 11 Feb |
