dmytton Mon Feb 26 20:11:52 2007 UTC
Modified files: /phpdoc/en/reference/uodbc reference.xml /phpdoc/entities global.ent Log: Reworded description about iODBC to make it clearer. Closes #39453 http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/uodbc/reference.xml?r1=1.9&r2=1.10&diff_format=u Index: phpdoc/en/reference/uodbc/reference.xml diff -u phpdoc/en/reference/uodbc/reference.xml:1.9 phpdoc/en/reference/uodbc/reference.xml:1.10 --- phpdoc/en/reference/uodbc/reference.xml:1.9 Sun Sep 4 19:39:30 2005 +++ phpdoc/en/reference/uodbc/reference.xml Mon Feb 26 20:11:52 2007 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- Purpose: database.abstract --> <!-- Membership: bundled, external --> @@ -28,14 +28,15 @@ </para> <note> <para> - There is no ODBC involved when connecting to the above - databases. The functions that you use to speak natively to them - just happen to share the same names and syntax as the ODBC - functions. The exception to this is iODBC. Building PHP with iODBC - support enables you to use any ODBC-compliant drivers with your PHP - applications. iODBC is maintained by <ulink url="&url.openlink;"> - OpenLink Software</ulink>. More information on iODBC, as well as a - HOWTO, is available at <ulink url="&url.iodbc;">www.iodbc.org</ulink>. + With the exception of iODBC, there is no ODBC involved when + connecting to the above databases. The functions that you + use to speak natively to them just happen to share the same + names and syntax as the ODBC functions. However, building PHP + with iODBC support enables you to use any ODBC-compliant + drivers with your PHP applications. More information on iODBC, + is available at <ulink url="&url.iodbc;">www.iodbc.org</ulink> + with the alternative unixODBC available at + <ulink url="&url.unixodbc;">www.unixodbc.org</ulink>. </para> </note> </section> http://cvs.php.net/viewvc.cgi/phpdoc/entities/global.ent?r1=1.286&r2=1.287&diff_format=u Index: phpdoc/entities/global.ent diff -u phpdoc/entities/global.ent:1.286 phpdoc/entities/global.ent:1.287 --- phpdoc/entities/global.ent:1.286 Sun Feb 25 21:14:25 2007 +++ phpdoc/entities/global.ent Mon Feb 26 20:11:52 2007 @@ -1,6 +1,6 @@ <!-- -*- SGML -*- - $Id: global.ent,v 1.286 2007/02/25 21:14:25 philip Exp $ + $Id: global.ent,v 1.287 2007/02/26 20:11:52 dmytton Exp $ Contains global "macros" for all the XML documents. @@ -366,6 +366,7 @@ <!ENTITY url.ultimatezip "http://www.ultimatezip.com/"> <!ENTITY url.unicode "http://www.unicode.org/"> <!ENTITY url.unicode.reports "http://www.unicode.org/unicode/reports/tr21/"> +<!ENTITY url.unixodbc "http://www.unixodbc.org/"> <!ENTITY url.userlandnaming.cs "http://cvs.php.net/viewvc.cgi/php-src/CODING_STANDARDS?view=co"> <!ENTITY url.vb4linux "http://sourceforge.net/projects/vb4linux/"> <!ENTITY url.vlife "http://www.vodafone.jp/english/live/">