Commit:    5ae8c51e688060d0a3263b67ff9fb24ba2c8c1d2
Author:    Christopher Jones <s...@php.net>         Thu, 10 Oct 2013 13:38:38 
-0700
Parents:   71a3c07843ca2d35e59cc165f37359fc7796aea9
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=5ae8c51e688060d0a3263b67ff9fb24ba2c8c1d2

Log:
OCI8: sync README and package.xml descriptions

Changed paths:
  M  ext/oci8/README
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/README b/ext/oci8/README
index af5beeb..d662072 100644
--- a/ext/oci8/README
+++ b/ext/oci8/README
@@ -1,13 +1,20 @@
 The OCI8 Extension
 ------------------
 
-Use the OCI8 extension to access Oracle Database.  
+Use the OCI8 extension to access Oracle Database.
 
 Documentation is at http://php.net/oci8
 
-The extension can be built with PHP versions 4.3.9 to 5.x using Oracle
-Database 9.2, 10, 11 or 12 client libraries.  Oracle's standard
-cross-version connectivity applies.  For example PHP linked with
-Oracle 11.2 client libraries can connect to Oracle Database 9.2
-onwards.  See Oracle's note "Oracle Client / Server Interoperability
-Support" (ID 207303.1) for details.
+The extension can be linked with Oracle client libraries from Oracle
+Database 10.2, 11, or 12.1.  These libraries are found in the database
+installation, or in the free Oracle Instant Client available from
+Oracle.
+
+Oracle's standard cross-version connectivity applies.  For example,
+PHP OCI8 linked with Instant Client 11.2 can connect to Oracle
+Database 9.2 onward.  See Oracle's note "Oracle Client / Server
+Interoperability Support" (ID 207303.1) for details.
+
+PHP OCI8 2.0 can be built with PHP 5.2 onward.  Use the older PHP OCI8
+1.4.10 when using PHP 4.3.9 through to PHP 5.1.x, or when only Oracle
+Database 9.2 client libraries are available.
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index d85faf0..f61def5 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -8,15 +8,17 @@ http://pear.php.net/dtd/package-2.0.xsd";>
  <summary>Extension for Oracle Database</summary>
 
  <description>
-The PHP OCI8 extension gives access to Oracle Database. The extension
-can be linked with Oracle client libraries from Oracle Database 10.2,
-11, or 12.1. These libraries are found in the database installation,
-or in the free Oracle Instant Client. Oracle's standard cross-version
-connectivity applies.  For example, PHP OCI8 linked with Instant
-Client 11.2 can connect to Oracle Database 9.2 onwards.  PHP OCI8 2.0
-can be built with PHP 5.2 onwards. Use the older PHP OCI8 1.4.10 when
-using PHP 4.3.9 through to PHP 5.1.x, or when only Oracle Database 9.2
-client libraries are available.
+Use the OCI8 extension to access Oracle Database.  The extension can
+be linked with Oracle client libraries from Oracle Database 10.2, 11,
+or 12.1.  These libraries are found in the database installation, or
+in the free Oracle Instant Client available from Oracle.  Oracle's
+standard cross-version connectivity applies.  For example, PHP OCI8
+linked with Instant Client 11.2 can connect to Oracle Database 9.2
+onward.  See Oracle's note "Oracle Client / Server Interoperability
+Support" (ID 207303.1) for details.  PHP OCI8 2.0 can be built with
+PHP 5.2 onward.  Use the older PHP OCI8 1.4.10 when using PHP 4.3.9
+through to PHP 5.1.x, or when only Oracle Database 9.2 client
+libraries are available.
  </description>
  <lead>
   <name>Christopher Jones</name>


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to