Author: paul
Date: 2010-07-12 22:32:04 +0200 (Mon, 12 Jul 2010)
New Revision: 21674
Log:
r61076@frost: paul | 2010-07-12 14:32:38 -0500
Remove unnecessary version differences
Modified:
trunk/refman-6.0/dba-mysqld-server-core.xml
trunk/refman-6.0/dba-security-core.xml
trunk/refman-6.0/dba-user-management-core.xml
trunk/refman-6.0/replication-options-core.xml
trunk/refman-6.0/se-innodb-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:40730
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:61075
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:40730
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:61076
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-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml 2010-07-12 20:31:57 UTC (rev 21673)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml 2010-07-12 20:32:04 UTC (rev 21674)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 2; 1035 bytes
@@ -92,7 +92,9 @@
information on the item as available.
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:all:Option/Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:all">
+ <citetitle>Option/Variable Summary</citetitle>
+ </para>
</section>
@@ -3797,7 +3799,9 @@
The following table lists all available system variables:
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:systemvar:System Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:systemvar">
+ <citetitle>System Variable Summary</citetitle>
+ </para>
<para>
For additional system variable information, see these sections:
Modified: trunk/refman-6.0/dba-security-core.xml
===================================================================
--- trunk/refman-6.0/dba-security-core.xml 2010-07-12 20:31:57 UTC (rev 21673)
+++ trunk/refman-6.0/dba-security-core.xml 2010-07-12 20:32:04 UTC (rev 21674)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 675 bytes
@@ -1612,7 +1612,9 @@
The following <command>mysqld</command> options affect security:
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-security:Security Option/Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-security">
+ <citetitle>Security Option/Variable Summary</citetitle>
+ </para>
<itemizedlist>
Modified: trunk/refman-6.0/dba-user-management-core.xml
===================================================================
--- trunk/refman-6.0/dba-user-management-core.xml 2010-07-12 20:31:57 UTC (rev 21673)
+++ trunk/refman-6.0/dba-user-management-core.xml 2010-07-12 20:32:04 UTC (rev 21674)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 1; 678 bytes
@@ -1610,7 +1610,9 @@
SSL support. See <xref linkend="secure-using-ssl"/>.
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-ssl:SSL Option/Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-ssl">
+ <citetitle>SSL Option/Variable Summary</citetitle>
+ </para>
<itemizedlist>
Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml 2010-07-12 20:31:57 UTC (rev 21673)
+++ trunk/refman-6.0/replication-options-core.xml 2010-07-12 20:32:04 UTC (rev 21674)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 2; 1177 bytes
@@ -81,7 +81,9 @@
replication and the binary log.
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-replication:Replication Option/Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-replication">
+ <citetitle>Replication Option/Variable Summary</citetitle>
+ </para>
<para>
<xref linkend="replication-options-master"/>, provides more
@@ -91,7 +93,9 @@
<xref linkend="replication-options-slave"/>.
</para>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-binlog:Binary Logging Option/Variable Summary"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-binlog">
+ <citetitle>Binary Logging Option/Variable Summary</citetitle>
+ </para>
<para>
<xref linkend="replication-options-binary-log"/>, provides more
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2010-07-12 20:31:57 UTC (rev 21673)
+++ trunk/refman-6.0/se-innodb-core.xml 2010-07-12 20:32:04 UTC (rev 21674)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 664 bytes
@@ -1190,7 +1190,10 @@
</formalpara>
- <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-innodb:InnoDB Option/Variable Reference"/>
+ <para condition="dynamic:optvar:fullsummary" role="6.0:mysqld:section-innodb">
+ <citetitle><literal>InnoDB</literal> Option/Variable
+ Reference</citetitle>
+ </para>
<para>
<literal>InnoDB</literal> command options:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r21674 - in trunk: . refman-6.0 | paul.dubois | 12 Jul |
