nlopess Thu Jul 8 06:05:05 2004 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/reference/oci8/functions oci-connect.xml
oci-new-connect.xml
oci-pconnect.xml ocilogon.xml
ocinlogon.xml ociplogon.xml
Log:
fix build and move oci paragraph to entities
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.102&r2=1.103&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.102 phpdoc/en/language-snippets.ent:1.103
--- phpdoc/en/language-snippets.ent:1.102 Fri Jun 18 13:10:46 2004
+++ phpdoc/en/language-snippets.ent Thu Jul 8 06:05:05 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.102 $ -->
+<!-- $Revision: 1.103 $ -->
<!-- Keep 'em sorted -->
@@ -186,6 +186,11 @@
a file successfully opened by <function>fopen</function> or
<function>fsockopen</function>.</para>'>
+<!-- Oracle -->
+<!ENTITY oci.charset "<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>">
<!-- PCNTL Notes -->
<!ENTITY pcntl.parameter.status '<para>The parameter
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-connect.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-connect.xml
diff -u phpdoc/en/reference/oci8/functions/oci-connect.xml:1.4
phpdoc/en/reference/oci8/functions/oci-connect.xml:1.5
--- phpdoc/en/reference/oci8/functions/oci-connect.xml:1.4 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/oci-connect.xml Thu Jul 8 06:05:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry id="function.oci-connect">
<refnamediv>
<refname>oci_connect</refname>
@@ -36,12 +36,7 @@
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>
+ &oci.charset;
<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.4&r2=1.5&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-new-connect.xml
diff -u phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.4
phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.5
--- phpdoc/en/reference/oci8/functions/oci-new-connect.xml:1.4 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/oci-new-connect.xml Thu Jul 8 06:05:05
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry id="function.oci-new-connect">
<refnamediv>
<refname>oci_new_connect</refname>
@@ -23,12 +23,7 @@
<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>
+ &oci.charset;
<para>
<function>oci_new_connect</function> forces the creation of a new connection.
This should be used if you need to isolate a set of transactions. By
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/oci-pconnect.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/oci8/functions/oci-pconnect.xml
diff -u phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.5
phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.6
--- phpdoc/en/reference/oci8/functions/oci-pconnect.xml:1.5 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/oci-pconnect.xml Thu Jul 8 06:05:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.oci-pconnect">
<refnamediv>
<refname>oci_pconnect</refname>
@@ -23,12 +23,7 @@
<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>
+ &oci.charset;
<para>
<function>oci_pconnect</function> returns connection identifier or
&false; on error.
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/ocilogon.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/oci8/functions/ocilogon.xml
diff -u phpdoc/en/reference/oci8/functions/ocilogon.xml:1.13
phpdoc/en/reference/oci8/functions/ocilogon.xml:1.14
--- phpdoc/en/reference/oci8/functions/ocilogon.xml:1.13 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/ocilogon.xml Thu Jul 8 06:05:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@@ -31,12 +31,7 @@
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>
+ &oci.charset;
<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.12&r2=1.13&ty=u
Index: phpdoc/en/reference/oci8/functions/ocinlogon.xml
diff -u phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.12
phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.13
--- phpdoc/en/reference/oci8/functions/ocinlogon.xml:1.12 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/ocinlogon.xml Thu Jul 8 06:05:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@@ -40,12 +40,7 @@
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>
+ &oci.charset;
<para>
This example demonstrates how the connections are separated.
<example>
http://cvs.php.net/diff.php/phpdoc/en/reference/oci8/functions/ociplogon.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/oci8/functions/ociplogon.xml
diff -u phpdoc/en/reference/oci8/functions/ociplogon.xml:1.8
phpdoc/en/reference/oci8/functions/ociplogon.xml:1.9
--- phpdoc/en/reference/oci8/functions/ociplogon.xml:1.8 Mon Jul 5 04:58:49
2004
+++ phpdoc/en/reference/oci8/functions/ociplogon.xml Thu Jul 8 06:05:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!--
DO NOT TRANSLATE THIS FILE.
@@ -34,12 +34,7 @@
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>
+ &oci.charset;
<note>
<para>
This function was renamed to <function>oci_pconnect</function>
