Author: paul
Date: 2007-08-21 03:37:01 +0200 (Tue, 21 Aug 2007)
New Revision: 7483
Log:
r28993@polar: paul | 2007-08-20 20:34:44 -0500
Break some of the dependencies between refman versions.
(Makes it easier for translation repositories - don't have to
import all refmans just because one is imported.)
Modified:
trunk/refman-4.1/Makefile
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-5.0/Makefile
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/Makefile
trunk/refman-5.2/Makefile
trunk/refman-common/connector-j.xml
trunk/refman-common/connector-net.xml
trunk/refman-common/what-is.en.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28858
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23922
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28993
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23922
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-4.1/Makefile 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes
@@ -21,7 +21,7 @@
IDMAP_VER = $(DOC_VER)
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/internals $(REPO_ROOT)/ndbapi
+IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/internals $(REPO_ROOT)/ndbapi
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-4.1/client-utility-programs.xml 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 8; 790 bytes
@@ -14669,14 +14669,6 @@
</para>
<para>
- In MySQL 5.0 and up, the <literal>INFORMATION_SCHEMA</literal>
- database contains the same kind of information in the
- <literal>SCHEMATA</literal>, <literal>TABLES</literal>,
- <literal>COLUMNS</literal>, and <literal>STATISTICS</literal>
- tables. See <xref linkend="information-schema"/>.
- </para>
-
- <para>
Invoke <command>mysql_tableinfo</command> like this:
</para>
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-5.0/Makefile 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 588 bytes
@@ -23,7 +23,7 @@
IDMAP_VER = $(DOC_VER)
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-4.1 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/ndbapi $(REPO_ROOT)/internals
+IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/ndbapi
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-5.0/dba-core.xml 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 599 bytes
@@ -3355,7 +3355,7 @@
Variables with no version indicated are present in all MySQL
¤t-series; releases. For historical information
concerning their implementation, please see
- <citetitle><xref linkend="refman-4-1"/></citetitle>.
+ <ulink url="&base-url-refman;/4.1/en/"/>.
</para>
<para>
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-5.1/Makefile 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 652 bytes
@@ -21,7 +21,7 @@
IDMAP_VER = $(DOC_VER)
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-4.1 $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/internals $(REPO_ROOT)/falcon $(REPO_ROOT)/ndbapi
+IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/falcon $(REPO_ROOT)/ndbapi
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/refman-5.2/Makefile
===================================================================
--- trunk/refman-5.2/Makefile 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-5.2/Makefile 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 854 bytes
@@ -21,7 +21,8 @@
IDMAP_VER = $(DOC_VER)
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-4.1 $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/internals $(REPO_ROOT)/falcon $(REPO_ROOT)/ndbapi
+#IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/internals $(REPO_ROOT)/falcon $(REPO_ROOT)/ndbapi
+IDMAP_REFS = . $(REPO_ROOT)/refman-common $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/falcon $(REPO_ROOT)/ndbapi
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/refman-common/connector-j.xml
===================================================================
--- trunk/refman-common/connector-j.xml 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-common/connector-j.xml 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 11; 1592 bytes
@@ -113,21 +113,21 @@
</listitem>
</itemizedlist>
-
+
<formalpara role="mnmas-kb">
-
+
<title>MySQL Enterprise</title>
-
+
<para>
- MySQL Enterprise subscribers will find more information
- about using JDBC with MySQL in the Knowledge Base articles about
+ MySQL Enterprise subscribers will find more information about
+ using JDBC with MySQL in the Knowledge Base articles about
<ulink url="https://kb.mysql.com/search.php?cat=search&category=10">
- JDBC</ulink>. Access to the MySQL Knowledge Base collection of articles is one of the
- advantages of subscribing to MySQL Enterprise. For more
- information see
+ JDBC</ulink>. Access to the MySQL Knowledge Base collection of
+ articles is one of the advantages of subscribing to MySQL
+ Enterprise. For more information see
<ulink url="&base-url-enterprise;advisors.html"/>.
</para>
-
+
</formalpara>
<section id="connector-j-versions">
@@ -2582,8 +2582,9 @@
</para>
<para>
- See <xref linkend="stored-procedures"/>, for more information
- on MySQL stored procedures.
+ For more information on MySQL stored procedures, please refer
+ to
+ <ulink url="&base-url-docs;mysql/en/stored-procedures.html"/>.
</para>
<para>
Modified: trunk/refman-common/connector-net.xml
===================================================================
--- trunk/refman-common/connector-net.xml 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-common/connector-net.xml 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 634 bytes
@@ -23883,8 +23883,7 @@
<para>
This section will not provide in-depth information on creating
Stored Procedures. For such information, please refer to
- <ulink
- url="&base-url-docs;mysql/en/stored-procedures.html"/>.
+ <ulink url="&base-url-docs;mysql/en/stored-procedures.html"/>.
</para>
<para>
Modified: trunk/refman-common/what-is.en.xml
===================================================================
--- trunk/refman-common/what-is.en.xml 2007-08-20 20:48:38 UTC (rev 7482)
+++ trunk/refman-common/what-is.en.xml 2007-08-21 01:37:01 UTC (rev 7483)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 6; 1816 bytes
@@ -280,16 +280,18 @@
for more information about current and upcoming features. In most
respects, it applies to all versions of MySQL. For information
about features as they are introduced into MySQL on a
- series-specific basis, see <quote>In a Nutshell</quote> section of
- the appropriate Manual:
+ series-specific basis, see the <quote>In a Nutshell</quote>
+ section of the appropriate Manual:
</para>
<itemizedlist>
<listitem>
<para>
- MySQL 4.0 and 4.1: <xref linkend="mysql-4-0-nutshell"/>, and
- <ulink url="http://dev.mysql.com/doc/refman/4.1/en/mysql-nutshell.html">MySQL
+ MySQL 4.0 and 4.1:
+ <ulink url="&base-url-refman;/4.1/en/mysql-4-0-nutshell.html">MySQL
+ 4.0 in a Nutshell</ulink>, and
+ <ulink url="&base-url-refman;/4.1/en/mysql-nutshell.html">MySQL
4.1 in a Nutshell</ulink>.
</para>
</listitem>
@@ -297,7 +299,7 @@
<listitem>
<para>
MySQL 5.0:
- <ulink url="http://dev.mysql.com/doc/refman/5.0/en/mysql-nutshell.html">MySQL
+ <ulink url="&base-url-refman;/5.0/en/mysql-nutshell.html">MySQL
5.0 in a Nutshell</ulink>.
</para>
</listitem>
@@ -305,7 +307,7 @@
<listitem>
<para>
MySQL 5.1:
- <ulink url="http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html">MySQL
+ <ulink url="&base-url-refman;/5.1/en/mysql-nutshell.html">MySQL
5.1 in a Nutshell</ulink>.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7483 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-common | paul | 21 Aug |
