cvs: phpdoc /en/reference/oci8/functions oci-connect.xml oci-new-connect.xml oci-pconnect.xml ocilogon.xml ocinlogon.xml ociplogon.xml

tony2001 Mon Jul 5 04:58:50 2004 EDT Modified files: /phpdoc/en/reference/oci8/functions oci-connect.xml oci-new-connect.xml oci-pconnect.xml ocilogon.xml ocinlogon.xml ociplogon.xml Log: fix #29011 (missing charset parameter description)

http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-connect.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/oci8/functions/oci-connect.xml diff -u phpdoc/en/reference/oci8/functions/oci-connect.xml:1.3 phpdoc/en/reference/oci8/functions/oci-connect.xml:1.4 --- phpdoc/en/reference/oci8/functions/oci-connect.xml:1.3 Thu Apr 1 03:11:26 2004 +++ phpdoc/en/reference/oci8/functions/oci-connect.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry id="function.oci-connect"> <refnamediv> <refname>oci_connect</refname> @@ -12,6 +12,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>oci_connect</function> returns a connection identifier @@ -35,6 +36,12 @@ connection, use <function>oci_new_connect</function>. </simpara> </note> + <para> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. + </para> <para> <example> <title><function>oci_connect</function> example</title> http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-new-connect.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/oci8/functions/oci-new-connect.xml diff -u phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.3 phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.4 --- phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.3 Thu Apr 1 03:11:28 2004 +++ phpdoc/en/reference/oci8/functions/oci-new-connect.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry id="function.oci-new-connect"> <refnamediv> <refname>oci_new_connect</refname> @@ -12,6 +12,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>oci_new_connect</function> creates a new connection to an Oracle @@ -21,6 +22,12 @@ PHP uses environment variables <literal>ORACLE_SID</literal> and <literal>TWO_TASK</literal> to determine the name of local Oracle instance and location of <filename>tnsnames.ora</filename> accordingly. + </para> + <para> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. </para> <para> <function>oci_new_connect</function> forces the creation of a new connection. http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-pconnect.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/oci8/functions/oci-pconnect.xml diff -u phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.4 phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.5 --- phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.4 Thu Apr 1 03:11:29 2004 +++ phpdoc/en/reference/oci8/functions/oci-pconnect.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <refentry id="function.oci-pconnect"> <refnamediv> <refname>oci_pconnect</refname> @@ -12,6 +12,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>oci_pconnect</function> creates a new persistent connection to @@ -21,6 +22,12 @@ PHP uses environment variables <literal>ORACLE_SID</literal> and <literal>TWO_TASK</literal> to determine the name of local Oracle instance and location of <filename>tnsnames.ora</filename> accordingly. + </para> + <para> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. </para> <para> <function>oci_pconnect</function> returns connection identifier or http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/ocilogon.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/oci8/functions/ocilogon.xml diff -u phpdoc/en/reference/oci8/functions/ocilogon.xml:1.12 phpdoc/en/reference/oci8/functions/ocilogon.xml:1.13 --- phpdoc/en/reference/oci8/functions/ocilogon.xml:1.12 Thu Apr 15 07:54:42 2004 +++ phpdoc/en/reference/oci8/functions/ocilogon.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <!-- DO NOT TRANSLATE THIS FILE. @@ -20,6 +20,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>ocilogon</function> returns an connection identifier @@ -30,6 +31,12 @@ environment variables ORACLE_SID (Oracle instance) or TWO_TASK (tnsnames.ora) to determine which database to connect to. </para> + <para> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. + </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 http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/ocinlogon.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc/en/reference/oci8/functions/ocinlogon.xml diff -u phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.11 phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.12 --- phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.11 Thu Apr 15 07:54:42 2004 +++ phpdoc/en/reference/oci8/functions/ocinlogon.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- DO NOT TRANSLATE THIS FILE. @@ -20,6 +20,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>ocinlogon</function> creates a new connection to an @@ -38,6 +39,12 @@ 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> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. </para> <para> This example demonstrates how the connections are separated. http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/ociplogon.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/oci8/functions/ociplogon.xml diff -u phpdoc/en/reference/oci8/functions/ociplogon.xml:1.7 phpdoc/en/reference/oci8/functions/ociplogon.xml:1.8 --- phpdoc/en/reference/oci8/functions/ociplogon.xml:1.7 Thu Apr 15 07:54:42 2004 +++ phpdoc/en/reference/oci8/functions/ociplogon.xml Mon Jul 5 04:58:49 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- DO NOT TRANSLATE THIS FILE. @@ -22,6 +22,7 @@ <methodparam><type>string</type><parameter>username</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>db</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>charset</parameter></methodparam> </methodsynopsis> <para> <function>ociplogon</function> creates a persistent connection to @@ -32,6 +33,12 @@ environment variables <varname>ORACLE_SID</varname> (Oracle instance) or <varname>TWO_TASK</varname> (tnsnames.ora) to determine which database to connect to. + </para> + <para> + Using Oracle server version 9.2 and greater, you can indicate + <parameter>charset</parameter> parameter, which will be used in the new + connection. If you're using Oracle server < 9.2, this parameter will be + ignored and NLS_LANG environment variable will be used instead. </para> <note> <para>