Below is the list of changes that have just been committed into a local
mysqldoc repository of root. When root does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3118 05/07/27 11:13:27 Mike.Hillyer@stripped +2 -0
Sync Connector doc includes.
refman-5.0/mysql-connectors.xml
1.6 05/07/27 11:13:26 Mike.Hillyer@stripped +3 -51
Sync Connector doc includes.
refman-4.1/mysql-connectors.xml
1.6 05/07/27 11:13:26 Mike.Hillyer@stripped +3 -51
Sync Connector doc includes.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: Mike.Hillyer
# Host: www.openwin.org
# Root: /home/mysqldoc/mysqldoc
--- 1.5/refman-4.1/mysql-connectors.xml 2005-07-19 09:57:20 -06:00
+++ 1.6/refman-4.1/mysql-connectors.xml 2005-07-27 11:13:26 -06:00
@@ -7534,58 +7534,10 @@
</section>
- <section id="java-connector">
+ <xi:include href="../Docs/connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <title id='title-java-connector'>&title-java-connector;</title>
+ <xi:include href="../Docs/connector-j-en.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <indexterm type="concept">
- <primary>Java connectivity</primary>
- </indexterm>
-
- <indexterm type="concept">
- <primary>Connector/J</primary>
- </indexterm>
-
- <indexterm type="concept">
- <primary>JDBC</primary>
- </indexterm>
-
- <para>
- There are two supported JDBC drivers for MySQL:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- <literal>MySQL Connector/J</literal> from MySQL AB,
- implemented in 100% native Java. This product was formerly
- known as the <literal>mm.mysql</literal> driver. You can
- download <literal>MySQL Connector/J</literal> from
- <ulink url="http://dev.mysql.com/downloads/connector/j/"/>.
- </para>
- </listitem>
-
- <listitem>
- <para>
- The Resin JDBC driver, which can be found at
- <ulink url="http://www.caucho.com/projects/jdbc-mysql/index.xtp"/>.
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
- For more information, consult any general JDBC documentation, plus
- each driver's own documentation for MySQL-specific features.
- </para>
-
- <para>
- Documentation for <literal>MySQL Connector/J</literal> is
- available online at the MySQL AB Web site at
- <ulink url="http://dev.mysql.com/doc/"/>.
- </para>
-
- </section>
+ <xi:include href="../Docs/connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
--- 1.5/refman-5.0/mysql-connectors.xml 2005-07-19 09:57:31 -06:00
+++ 1.6/refman-5.0/mysql-connectors.xml 2005-07-27 11:13:26 -06:00
@@ -7534,58 +7534,10 @@
</section>
- <section id="java-connector">
+ <xi:include href="../Docs/connector-net.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <title id='title-java-connector'>&title-java-connector;</title>
+ <xi:include href="../Docs/connector-j-en.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <indexterm type="concept">
- <primary>Java connectivity</primary>
- </indexterm>
-
- <indexterm type="concept">
- <primary>Connector/J</primary>
- </indexterm>
-
- <indexterm type="concept">
- <primary>JDBC</primary>
- </indexterm>
-
- <para>
- There are two supported JDBC drivers for MySQL:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- <literal>MySQL Connector/J</literal> from MySQL AB,
- implemented in 100% native Java. This product was formerly
- known as the <literal>mm.mysql</literal> driver. You can
- download <literal>MySQL Connector/J</literal> from
- <ulink url="http://dev.mysql.com/downloads/connector/j/"/>.
- </para>
- </listitem>
-
- <listitem>
- <para>
- The Resin JDBC driver, which can be found at
- <ulink url="http://www.caucho.com/projects/jdbc-mysql/index.xtp"/>.
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
- For more information, consult any general JDBC documentation, plus
- each driver's own documentation for MySQL-specific features.
- </para>
-
- <para>
- Documentation for <literal>MySQL Connector/J</literal> is
- available online at the MySQL AB Web site at
- <ulink url="http://dev.mysql.com/doc/"/>.
- </para>
-
- </section>
+ <xi:include href="../Docs/connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (Mike.Hillyer:1.3118) | mhillyer | 27 Jul |
