Author: shinz
Date: 2006-02-15 12:13:08 +0100 (Wed, 15 Feb 2006)
New Revision: 1326
Log:
Add Connector/PHP section to Connectors chapter
Added:
trunk/refman-4.1/connector-php.xml
trunk/refman-5.0/connector-php.xml
trunk/refman-5.1/connector-php.xml
Modified:
trunk/refman-4.1/Makefile
trunk/refman-4.1/apis.xml
trunk/refman-4.1/connectors.xml
trunk/refman-5.0/Makefile
trunk/refman-5.0/connectors.xml
trunk/refman-5.1/Makefile
trunk/refman-5.1/apis.xml
trunk/refman-5.1/connectors.xml
trunk/refman-common/titles.en.ent
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-4.1/Makefile 2006-02-15 11:13:08 UTC (rev 1326)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn!
-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn!
-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-4.1/apis.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -12994,9 +12994,17 @@
<para>
The PHP distribution and documentation are available from the
- <ulink url="http://www.php.net/">PHP Web site</ulink>.
+ <ulink url="http://www.php.net/">PHP Web site</ulink>. MySQL
+ provides the <literal>mysql</literal> and
+ <literal>mysqli</literal> extensions for the Windows operating
+ system on
+ <ulink
+ url="http://dev.mysql.com/downloads/connector/php/"></ulink>.
+ You can find information why you should preferably use the
+ extensions provided by MySQL on that page. Note that the
+ extensions provided by MySQL work only for MySQL as of version 4.1.
</para>
-
+
<section id="php-problems">
<title>&title-php-problems;</title>
Added: trunk/refman-4.1/connector-php.xml
===================================================================
--- trunk/refman-4.1/connector-php.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-4.1/connector-php.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
+ %fixedchars.entities;
+ <!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
+ %title.entities;
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
+ %versions.entities;
+]>
+<section id="connector-php">
+
+ <title>&title-connector-php;</title>
+
+ <para>
+ The PHP distribution and documentation are available from the PHP Web site.
+ MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
+ extensions for the Windows operating system on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
+ You can find
+ information why you should preferably use the extensions provided by MySQL
+ on that page. For platforms other than Windows, you should use the
+ <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
+ with the PHP sources. See
+ <ulink url="http://dev.mysql.com/doc/refman/5.0/en/php.html"/>.
+ </para>
+
+</section>
Property changes on: trunk/refman-4.1/connector-php.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/refman-4.1/connectors.xml
===================================================================
--- trunk/refman-4.1/connectors.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-4.1/connectors.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -39,4 +39,6 @@
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</chapter>
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.0/Makefile 2006-02-15 11:13:08 UTC (rev 1326)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/myds!
n-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/myds!
n-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Added: trunk/refman-5.0/connector-php.xml
===================================================================
--- trunk/refman-5.0/connector-php.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.0/connector-php.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
+ %fixedchars.entities;
+ <!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
+ %title.entities;
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
+ %versions.entities;
+]>
+<section id="connector-php">
+
+ <title>&title-connector-php;</title>
+
+ <para>
+ The PHP distribution and documentation are available from the PHP Web site.
+ MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
+ extensions for the Windows operating system on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
+ You can find
+ information why you should preferably use the extensions provided by MySQL
+ on that page. For platforms other than Windows, you should use the
+ <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
+ with the PHP sources. See
+ <ulink url="http://dev.mysql.com/doc/refman/5.0/en/php.html"/>.
+ </para>
+
+</section>
Property changes on: trunk/refman-5.0/connector-php.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/refman-5.0/connectors.xml
===================================================================
--- trunk/refman-5.0/connectors.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.0/connectors.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -39,4 +39,6 @@
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</chapter>
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.1/Makefile 2006-02-15 11:13:08 UTC (rev 1326)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml view!
s.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-li!
cense-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml view!
s.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-com!
mon/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.1/apis.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -12951,16 +12951,16 @@
<para>
The PHP distribution and documentation are available from the
- <ulink url="http://www.php.net/">PHP Web site</ulink>.
-
-<!-- MySQL provides the <literal>mysql</literal> and
+ <ulink url="http://www.php.net/">PHP Web site</ulink>. MySQL
+ provides the <literal>mysql</literal> and
<literal>mysqli</literal> extensions for the Windows operating
- system on <ulink
+ system on
+ <ulink
url="http://dev.mysql.com/downloads/connector/php/"></ulink>.
You can find information why you should preferably use the
- extensions provided by MySQL on that page. -->
+ extensions provided by MySQL on that page.
</para>
-
+
<section id="php-problems">
<title>&title-php-problems;</title>
Added: trunk/refman-5.1/connector-php.xml
===================================================================
--- trunk/refman-5.1/connector-php.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.1/connector-php.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
+ %fixedchars.entities;
+ <!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
+ %title.entities;
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
+ %versions.entities;
+]>
+<section id="connector-php">
+
+ <title>&title-connector-php;</title>
+
+ <para>
+ The PHP distribution and documentation are available from the PHP Web site.
+ MySQL provides the <literal>mysql</literal> and <literal>mysqli</literal>
+ extensions for the Windows operating system on
+ <ulink url="http://dev.mysql.com/downloads/connector/php/"/>.
+ You can find
+ information why you should preferably use the extensions provided by MySQL
+ on that page. For platforms other than Windows, you should use the
+ <literal>mysql</literal> or <literal>mysqli</literal> extensions shipped
+ with the PHP sources. See
+ <ulink url="http://dev.mysql.com/doc/refman/5.0/en/php.html"/>.
+ </para>
+
+</section>
Property changes on: trunk/refman-5.1/connector-php.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/refman-5.1/connectors.xml
===================================================================
--- trunk/refman-5.1/connectors.xml 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-5.1/connectors.xml 2006-02-15 11:13:08 UTC (rev 1326)
@@ -38,5 +38,7 @@
<xi:include href="connector-j.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="connector-mxj.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+ <xi:include href="connector-php.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</chapter>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-02-15 10:17:40 UTC (rev 1325)
+++ trunk/refman-common/titles.en.ent 2006-02-15 11:13:08 UTC (rev 1326)
@@ -247,6 +247,7 @@
<!ENTITY title-connection-parameters "Connection Parameters">
<!ENTITY title-connection-pool "INFO: About ODBC Connection Pooling">
<!ENTITY title-connector-odbc "What is Connector/ODBC?">
+<!ENTITY title-connector-php "Connector/PHP">
<!ENTITY title-connectors "Connectors">
<!ENTITY title-constraint-enum "<literal>ENUM</literal> and <literal>SET</literal> Constraints">
<!ENTITY title-constraint-invalid-data "Constraints on Invalid Data">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1326 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-common | stefan | 15 Feb |
