vrana           Wed Apr 26 12:32:40 2006 UTC

  Modified files:              
    /phpdoc/en/reference/pdo_oci        reference.xml 
  Log:
  Use dbname with tnsnames.ora (bug #37110)
  charset element
  
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/pdo_oci/reference.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/pdo_oci/reference.xml
diff -u phpdoc/en/reference/pdo_oci/reference.xml:1.5 
phpdoc/en/reference/pdo_oci/reference.xml:1.6
--- phpdoc/en/reference/pdo_oci/reference.xml:1.5       Sun Sep 11 06:17:08 2005
+++ phpdoc/en/reference/pdo_oci/reference.xml   Wed Apr 26 12:32:40 2006
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- Purpose: database.vendors -->
 <!-- Membership: bundled, external, pecl -->
 
@@ -34,9 +34,7 @@
        <term>DSN prefix</term>
        <listitem>
         <para>
-        The DSN prefix is <userinput>oci:</userinput>. If you are connecting
-        to a database defined in <filename>tnsnames.ora</filename>, append the
-        name of the database to the DSN prefix and your DSN is complete.
+        The DSN prefix is <userinput>oci:</userinput>.
         </para>
        </listitem>
       </varlistentry>
@@ -46,6 +44,17 @@
         <para>
          The URI for the Oracle Instant Client connection takes the form of
          
<userinput>dbname=//<varname>hostname</varname>:<varname>port-number</varname>/<varname>database</varname></userinput>.
+         If you are connecting to a database defined in
+         <filename>tnsnames.ora</filename>, use only the name of the database:
+         <userinput>dbname=<varname>database</varname></userinput>.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><constant>charset</constant></term>
+       <listitem>
+        <para>
+         The client-side character set for the current environment handle.
         </para>
        </listitem>
       </varlistentry>

Reply via email to