Author: paul
Date: 2009-02-01 00:07:33 +0100 (Sun, 01 Feb 2009)
New Revision: 13499
Log:
r38070@frost: paul | 2009-01-31 17:09:37 -0500
Add auto-link markup
Modified:
trunk/refman-common/bug-reports.xml
trunk/refman-common/connector-j.xml
trunk/refman-common/credits.xml
trunk/refman-common/ha-topology.xml
trunk/refman-common/ha-vm.xml
trunk/refman-common/what-is.en.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:41130
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38065
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:41130
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:38070
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:36139
Modified: trunk/refman-common/bug-reports.xml
===================================================================
--- trunk/refman-common/bug-reports.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/bug-reports.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 938 bytes
@@ -258,9 +258,10 @@
If your report includes long query output lines from test cases that
you run with the <command>mysql</command> command-line tool, you can
make the output more readable by using the
- <option>--vertical</option> option or the <literal>\G</literal>
- statement terminator. The <literal>EXPLAIN SELECT</literal> example
- later in this section demonstrates the use of <literal>\G</literal>.
+ <option role="mysql">--vertical</option> option or the
+ <literal>\G</literal> statement terminator. The <literal>EXPLAIN
+ SELECT</literal> example later in this section demonstrates the use
+ of <literal>\G</literal>.
</para>
<para>
Modified: trunk/refman-common/connector-j.xml
===================================================================
--- trunk/refman-common/connector-j.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/connector-j.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 7; 1465 bytes
@@ -4558,13 +4558,14 @@
<para>
Testing your connectivity with the
<command>mysql</command> command-line client will not
- work unless you add the <option>--host</option> flag,
- and use something other than
- <literal>localhost</literal> for the host. The
- <command>mysql</command> command-line client will use
- Unix domain sockets if you use the special host name
- <literal>localhost</literal>. If you are testing
- connectivity to <literal>localhost</literal>, use
+ work unless you add the
+ <option role="mysql">--host</option> flag, and use
+ something other than <literal>localhost</literal> for
+ the host. The <command>mysql</command> command-line
+ client will use Unix domain sockets if you use the
+ special host name <literal>localhost</literal>. If you
+ are testing connectivity to
+ <literal>localhost</literal>, use
<literal>127.0.0.1</literal> as the host name instead.
</para>
</note>
Modified: trunk/refman-common/credits.xml
===================================================================
--- trunk/refman-common/credits.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/credits.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 972 bytes
@@ -282,13 +282,14 @@
<listitem>
<para>
- <option>--max-user-connections=...</option> option
+ <option role="mysqld">--max-user-connections=...</option>
+ option
</para>
</listitem>
<listitem>
<para>
- <literal>net_read</literal> and
+ <literal role="sysvar">net_read_timeout</literal> and
<literal role="sysvar">net_write_timeout</literal>
</para>
</listitem>
@@ -2494,7 +2495,7 @@
</para>
<para>
- <option>--skip-show-database</option>
+ <option role="mysqld">--skip-show-database</option>
</para>
</listitem>
Modified: trunk/refman-common/ha-topology.xml
===================================================================
--- trunk/refman-common/ha-topology.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/ha-topology.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 10; 2141 bytes
@@ -190,8 +190,9 @@
<para>
It is safe to connect servers in a circular master/slave
- relationship if you use the <option>--log-slave-updates</option>
- option. That means that you can create a setup as shown in
+ relationship if you use the
+ <option role="mysqld">--log-slave-updates</option> option. That
+ means that you can create a setup as shown in
<xref linkend="figure_replication-multimaster-chain"/>.
</para>
@@ -219,14 +220,15 @@
Server IDs are encoded in binary log events, so server A knows
when an event that it reads was originally created by itself and
does not execute the event (unless server A was started with the
- <option>--replicate-same-server-id</option> option, which is
- meaningful only in rare cases). Thus, there are no infinite
- loops. This type of circular setup works only if you perform no
- conflicting updates between the tables. In other words, if you
- insert data in both A and C, you should never insert a row in A
- that may have a key that conflicts with a row inserted in C. You
- should also not update the same rows on two servers if the order
- in which the updates are applied is significant.
+ <option role="mysqld">--replicate-same-server-id</option>
+ option, which is meaningful only in rare cases). Thus, there are
+ no infinite loops. This type of circular setup works only if you
+ perform no conflicting updates between the tables. In other
+ words, if you insert data in both A and C, you should never
+ insert a row in A that may have a key that conflicts with a row
+ inserted in C. You should also not update the same rows on two
+ servers if the order in which the updates are applied is
+ significant.
</para>
</section>
Modified: trunk/refman-common/ha-vm.xml
===================================================================
--- trunk/refman-common/ha-vm.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/ha-vm.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 671 bytes
@@ -681,8 +681,8 @@
<filename>/mnt</filename> (although on the large and extra large
instance you can alter this configuration). You must edit
<filename>/etc/my.cnf</filename> to set the
- <option>datadir</option> option to point to the larger storage
- area.
+ <option role="mysqld">datadir</option> option to point to the
+ larger storage area.
</para>
<important>
Modified: trunk/refman-common/what-is.en.xml
===================================================================
--- trunk/refman-common/what-is.en.xml 2009-01-31 22:53:50 UTC (rev 13498)
+++ trunk/refman-common/what-is.en.xml 2009-01-31 23:07:33 UTC (rev 13499)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 840 bytes
@@ -638,8 +638,8 @@
<option role="mysqld">--enable-named-pipe</option> option.
In MySQL 4.1 and higher, Windows servers also support
shared-memory connections if started with the
- <option>--shared-memory</option> option. Clients can
- connect through shared memory by using the
+ <option role="mysqld">--shared-memory</option> option.
+ Clients can connect through shared memory by using the
<option>--protocol=memory</option> option.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13499 - in trunk: . refman-common | paul.dubois | 1 Feb |
