summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-03-27 11:54:05 -0700
committerChristopher Jones <sixd@php.net>2012-03-27 11:54:05 -0700
commit00b486216742b5909712507398c1279b22aba15f (patch)
tree6548ded12a27e97e427786d18a30a8e88ac9cf2e
parentc447704f98654e906a15cbe96052d62c009e0590 (diff)
parentc8ced8c0a33921abc974d2b6ec4f0756104bf715 (diff)
downloadphp-git-00b486216742b5909712507398c1279b22aba15f.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Update README
-rw-r--r--ext/oci8/README15
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/oci8/README b/ext/oci8/README
index db7db57fed..420d5dac58 100644
--- a/ext/oci8/README
+++ b/ext/oci8/README
@@ -1,12 +1,13 @@
The OCI8 Extension
------------------
-The OCI8 extension allows PHP to access Oracle Database. It can be
-built using Oracle 9.2, 10, or 11 client libraries. It allows
-Oracle's standard cross-version connectivity. For example PHP linked
-with Oracle 10.2 libraries can connect to Oracle Database 9.2 onwards.
+Use the OCI8 extension to access Oracle Database.
-This release of OCI8 can be used with PHP versions 4.3.9 to 5.x.
+Documentation is at http://php.net/oci8
-OCI8 installation instructions and documentation is available at
-http://www.php.net/oci8
+The extension can be built with PHP versions 4.3.9 to 5.x using Oracle
+9.2, 10, or 11 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.