From 664ad5ad0aa38a002d78171bdd1f49712d85bf78 Mon Sep 17 00:00:00 2001
From: Stefan Roehrich <sr@php.net>
Date: Fri, 3 Sep 1999 09:47:13 +0000
Subject: [PATCH] Added comment about connecting via tnsnames.ora. Changed
 OCI{N,P}Logon parameters from conn to user, pass, db.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@12440 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/oci8.sgml | 62 ++++++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/functions/oci8.sgml b/functions/oci8.sgml
index 25248664a9..2f2fd56cc0 100644
--- a/functions/oci8.sgml
+++ b/functions/oci8.sgml
@@ -208,15 +208,21 @@ OCILogoff($conn);
      <funcdef>int <function>OCILogon</function></funcdef>
      <paramdef>string <parameter>username</parameter></paramdef>
      <paramdef>string <parameter>password</parameter></paramdef>
-     <paramdef>string <parameter><optional>ORACLE_SID</optional></parameter></paramdef>
+     <paramdef>string <parameter><optional>db</optional></parameter></paramdef>
     </funcsynopsis>
     <para>
-     <function>OCILogon</function> returns an connection identified
-	 needed for most other OCI calls.  If the optional third parameter is not specified,
-	 PHP uses the environment variable ORACLE_SID to determine which database to connect 
-	 to.  Connections are shared at the page level when using <function>OCILogon</function>.  
-     This means that commits and rollbacks apply to all open transactions in the page, 
-     even if you have created multiple  connections.
+     <function>OCILogon</function> returns an connection identifier
+     needed for most other OCI calls.  The optional third parameter
+     can either contain the name of the local Oracle instance or the
+     name of the entry in tnsnames.ora to which you want to connect.
+     If the optional third parameter is not specified, PHP uses the
+     environment variables ORACLE_SID (Oracle instance) or TWO_TASK
+     (tnsnames.ora) to determine which database to connect to.
+    </para>
+    <para>Connections are shared at the page level when using
+     <function>OCILogon</function>.  This means that commits and
+     rollbacks apply to all open transactions in the page, even if you
+     have created multiple connections.
     </para>
     <para>
      This example demonstrates how the connections are shared.
@@ -319,12 +325,18 @@ print "&lt;/PRE>&lt;/HTML>";
     <title>Description</title>
     <funcsynopsis>
      <funcdef>int <function>OCIPLogon</function></funcdef>
-     <paramdef>int <parameter>conn</parameter></paramdef>
+     <paramdef>string <parameter>username</parameter></paramdef>
+     <paramdef>string <parameter>password</parameter></paramdef>
+     <paramdef>string <parameter><optional>db</optional></parameter></paramdef>
     </funcsynopsis>
     <para>
-     <function>OCIPLogon</function> Creates a persistent connection to an Oracle 8 database 
-     and logs on.  If the optional third parameter is not specified, PHP uses the environment
-     variable ORACLE_SID to determine which database to connect to.
+     <function>OCIPLogon</function> creates a persistent connection to
+     an Oracle 8 database and logs on.  The optional third parameter
+     can either contain the name of the local Oracle instance or the
+     name of the entry in tnsnames.ora to which you want to connect.
+     If the optional third parameter is not specified, PHP uses the
+     environment variables ORACLE_SID (Oracle instance) or TWO_TASK
+     (tnsnames.ora) to determine which database to connect to.
     </para>
     <simpara>
      See also <function>OCILogon</function> and
@@ -341,17 +353,27 @@ print "&lt;/PRE>&lt;/HTML>";
     <title>Description</title>
     <funcsynopsis>
      <funcdef>int <function>OCINLogon</function></funcdef>
-     <paramdef>int <parameter>conn</parameter></paramdef>
+     <paramdef>string <parameter>username</parameter></paramdef>
+     <paramdef>string <parameter>password</parameter></paramdef>
+     <paramdef>string <parameter><optional>db</optional></parameter></paramdef>
     </funcsynopsis>
     <para>
-     <function>OCINLogon</function> Creates a new connection to an Oracle 8 database 
-     and logs on.  If the optional third parameter is not specified, PHP uses the environment
-     variable ORACLE_SID to determine which database to connect to.  <function>OCINLogon</function> 
-     forces a new connection.  This is should be used if you need to isolate a set of transactions.
-     By default, connections are shared at the page level if using <function>OCILogon</function> 
-     or at the web server process level if using <function>OCIPLogon</function>.  If you have 
-     multiple connections open using <function>OCINLogon</function>, all commits and 
-     rollbacks apply to the specified connection only..
+     <function>OCINLogon</function> creates a new connection to an
+     Oracle 8 database and logs on.  The optional third parameter can
+     either contain the name of the local Oracle instance or the name
+     of the entry in tnsnames.ora to which you want to connect.  If
+     the optional third parameter is not specified, PHP uses the
+     environment variables ORACLE_SID (Oracle instance) or TWO_TASK
+     (tnsnames.ora) to determine which database to connect to.
+    </para>
+    <para>
+     <function>OCINLogon</function> forces a new connection.  This
+     should be used if you need to isolate a set of transactions.  By
+     default, connections are shared at the page level if using
+     <function>OCILogon</function> or at the web server process level
+     if using <function>OCIPLogon</function>.  If you have multiple
+     connections open using <function>OCINLogon</function>, all
+     commits and rollbacks apply to the specified connection only.
     </para>
     <para>
      This example demonstrates how the connections are separated.