Author: paul
Date: 2006-01-05 21:46:05 +0100 (Thu, 05 Jan 2006)
New Revision: 694
Log:
r5879@frost: paul | 2006-01-05 14:37:56 -0600
Combine xrefs.
Modified:
trunk/
trunk/refman-4.1/apis.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/installing.xml
trunk/refman-4.1/problems.xml
trunk/refman-5.0/apis.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.0/tutorial.xml
trunk/refman-5.1/apis.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/problems.xml
trunk/refman-5.1/tutorial.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5878
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:5879
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1933
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-4.1/apis.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -4989,7 +4989,7 @@
</para>
<para>
- See <xref linkend="c-api-multiple-queries"/>. See
+ See <xref linkend="c-api-multiple-queries"/>, and
<xref linkend="mysql-next-result"/>.
</para>
@@ -7343,8 +7343,8 @@
</para>
<para>
- See <xref linkend="mysql-errno"/>. See
- <xref linkend="mysql-error"/>. See
+ See <xref linkend="mysql-errno"/>,
+ <xref linkend="mysql-error"/>, and
<xref linkend="mysql-stmt-sqlstate"/>.
</para>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-4.1/database-administration.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -2371,7 +2371,7 @@
<literal>DELAYED KEYS</literal> option.
<literal>ALL</literal> delays key writes for all
<literal>MyISAM</literal> tables. Available as of MySQL
- 4.0.3. See <xref linkend="server-parameters"/>. See
+ 4.0.3. See <xref linkend="server-parameters"/>, and
<xref linkend="myisam-start"/>.
</para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-4.1/installing.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -10734,7 +10734,7 @@
</para>
<para>
- See <xref linkend="problems-with-mysql-sock"/>. See
+ See <xref linkend="problems-with-mysql-sock"/>, and
<xref linkend="environment-variables"/>.
</para>
</listitem>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-4.1/problems.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -1182,13 +1182,10 @@
</itemizedlist>
<para>
- See also See <xref linkend="communication-errors"/>.
+ See also <xref linkend="communication-errors"/>, and
+ <xref linkend="bug-reports"/>.
</para>
- <para>
- See <xref linkend="bug-reports"/>.
- </para>
-
</section>
<section id="packet-too-large">
@@ -1476,7 +1473,7 @@
</itemizedlist>
<para>
- See also See <xref linkend="gone-away"/>.
+ See also <xref linkend="gone-away"/>.
</para>
</section>
Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.0/apis.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -5044,7 +5044,7 @@
</para>
<para>
- See <xref linkend="c-api-multiple-queries"/>. See
+ See <xref linkend="c-api-multiple-queries"/>, and
<xref linkend="mysql-next-result"/>.
</para>
@@ -7387,8 +7387,8 @@
</para>
<para>
- See <xref linkend="mysql-errno"/>. See
- <xref linkend="mysql-error"/>. See
+ See <xref linkend="mysql-errno"/>,
+ <xref linkend="mysql-error"/>, and
<xref linkend="mysql-stmt-sqlstate"/>.
</para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.0/installing.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -10617,7 +10617,7 @@
</para>
<para>
- See <xref linkend="problems-with-mysql-sock"/>. See
+ See <xref linkend="problems-with-mysql-sock"/>, and
<xref linkend="environment-variables"/>.
</para>
</listitem>
@@ -12524,7 +12524,7 @@
<para>
MySQL 5.0.2 adds several SQL modes that allow stricter
control over rejecting records that have invalid or missing
- values. See <xref linkend="server-sql-mode"/>. See
+ values. See <xref linkend="server-sql-mode"/>, and
<xref linkend="constraint-invalid-data"/>. If you want to
enable this control but continue to use MySQL's capability
for storing incorrect dates such as
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.0/problems.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -1182,13 +1182,10 @@
</itemizedlist>
<para>
- See also See <xref linkend="communication-errors"/>.
+ See also <xref linkend="communication-errors"/>, and
+ <xref linkend="bug-reports"/>.
</para>
- <para>
- See <xref linkend="bug-reports"/>.
- </para>
-
</section>
<section id="packet-too-large">
@@ -1443,7 +1440,7 @@
</itemizedlist>
<para>
- See also See <xref linkend="gone-away"/>.
+ See also <xref linkend="gone-away"/>.
</para>
</section>
Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.0/tutorial.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -3272,7 +3272,7 @@
<para>
In MySQL, <literal>InnoDB</literal> tables support checking of
- foreign key constraints. See <xref linkend="innodb"/>. See also
+ foreign key constraints. See <xref linkend="innodb"/>, and
<xref linkend="ansi-diff-foreign-keys"/>.
</para>
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.1/apis.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -5039,7 +5039,7 @@
</para>
<para>
- See <xref linkend="c-api-multiple-queries"/>. See
+ See <xref linkend="c-api-multiple-queries"/>, and
<xref linkend="mysql-next-result"/>.
</para>
@@ -7388,8 +7388,8 @@
</para>
<para>
- See <xref linkend="mysql-errno"/>. See
- <xref linkend="mysql-error"/>. See
+ See <xref linkend="mysql-errno"/>,
+ <xref linkend="mysql-error"/>, and
<xref linkend="mysql-stmt-sqlstate"/>.
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.1/installing.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -10619,7 +10619,7 @@
</para>
<para>
- See <xref linkend="problems-with-mysql-sock"/>. See
+ See <xref linkend="problems-with-mysql-sock"/>, and
<xref linkend="environment-variables"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.1/problems.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -1182,13 +1182,10 @@
</itemizedlist>
<para>
- See also See <xref linkend="communication-errors"/>.
+ See also <xref linkend="communication-errors"/>, and
+ <xref linkend="bug-reports"/>.
</para>
- <para>
- See <xref linkend="bug-reports"/>.
- </para>
-
</section>
<section id="packet-too-large">
@@ -1443,7 +1440,7 @@
</itemizedlist>
<para>
- See also See <xref linkend="gone-away"/>.
+ See also <xref linkend="gone-away"/>.
</para>
</section>
Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml 2006-01-05 20:45:35 UTC (rev 693)
+++ trunk/refman-5.1/tutorial.xml 2006-01-05 20:46:05 UTC (rev 694)
@@ -3266,7 +3266,7 @@
<para>
In MySQL, <literal>InnoDB</literal> tables support checking of
- foreign key constraints. See <xref linkend="innodb"/>. See also
+ foreign key constraints. See <xref linkend="innodb"/>, and
<xref linkend="ansi-diff-foreign-keys"/>.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r694 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 5 Jan |
