Author: paul
Date: 2010-08-23 16:54:11 +0200 (Mon, 23 Aug 2010)
New Revision: 22386
Log:
r62569@frost: paul | 2010-08-23 09:52:48 -0500
formalpara does not allow programlisting
Modified:
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.5/replication-options-core.xml
trunk/refman-5.6/replication-options-core.xml
trunk/refman-6.0/replication-options-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41634
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62567
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41634
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62569
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2010-08-23 14:39:12 UTC (rev 22385)
+++ trunk/refman-5.0/replication-options-core.xml 2010-08-23 14:54:11 UTC (rev 22386)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 595 bytes
@@ -461,13 +461,13 @@
<filename>my.cnf</filename> file:
</para>
+ </formalpara>
+
<programlisting>
[mysqld]
server-id=3
</programlisting>
- </formalpara>
-
<para>
Some slave server replication options are handled in a special
way, in the sense that each is ignored if a
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2010-08-23 14:39:12 UTC (rev 22385)
+++ trunk/refman-5.1/replication-options-core.xml 2010-08-23 14:54:11 UTC (rev 22386)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 567 bytes
@@ -473,13 +473,13 @@
<filename>my.cnf</filename> file:
</para>
+ </formalpara>
+
<programlisting>
[mysqld]
server-id=3
</programlisting>
- </formalpara>
-
<important>
<para>
Certain <option>--master-<replaceable>xxx</replaceable></option>
Modified: trunk/refman-5.5/replication-options-core.xml
===================================================================
--- trunk/refman-5.5/replication-options-core.xml 2010-08-23 14:39:12 UTC (rev 22385)
+++ trunk/refman-5.5/replication-options-core.xml 2010-08-23 14:54:11 UTC (rev 22386)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 575 bytes
@@ -451,13 +451,13 @@
<filename>my.cnf</filename> file:
</para>
+ </formalpara>
+
<programlisting>
[mysqld]
server-id=3
</programlisting>
- </formalpara>
-
<formalpara id="replication-optvars-slaves">
<title>Startup options for replication slaves</title>
Modified: trunk/refman-5.6/replication-options-core.xml
===================================================================
--- trunk/refman-5.6/replication-options-core.xml 2010-08-23 14:39:12 UTC (rev 22385)
+++ trunk/refman-5.6/replication-options-core.xml 2010-08-23 14:54:11 UTC (rev 22386)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 575 bytes
@@ -451,13 +451,13 @@
<filename>my.cnf</filename> file:
</para>
+ </formalpara>
+
<programlisting>
[mysqld]
server-id=3
</programlisting>
- </formalpara>
-
<formalpara id="replication-optvars-slaves">
<title>Startup options for replication slaves</title>
Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml 2010-08-23 14:39:12 UTC (rev 22385)
+++ trunk/refman-6.0/replication-options-core.xml 2010-08-23 14:54:11 UTC (rev 22386)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 575 bytes
@@ -451,13 +451,13 @@
<filename>my.cnf</filename> file:
</para>
+ </formalpara>
+
<programlisting>
[mysqld]
server-id=3
</programlisting>
- </formalpara>
-
<formalpara id="replication-optvars-slaves">
<title>Startup options for replication slaves</title>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22386 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 23 Aug |
