danbeck Tue Jul 3 11:36:36 2001 EDT
Modified files:
/phpdoc/en/functions session.xml uodbc.xml
Log:
correcting "make test" errors in session and uodbc
reformated weird spacing in uodbc
Index: phpdoc/en/functions/session.xml
diff -u phpdoc/en/functions/session.xml:1.43 phpdoc/en/functions/session.xml:1.44
--- phpdoc/en/functions/session.xml:1.43 Tue Jul 3 02:58:35 2001
+++ phpdoc/en/functions/session.xml Tue Jul 3 11:36:35 2001
@@ -564,9 +564,9 @@
expect the connection to still be valid the next time the
session is restored. PHP functions that return a resource are
identified by having a return type of
- <literal>resource</literal> in their function definitions.
- You may also find a list of resource-creating fonctions in
- the <link linkend="resources">appendices</link>.
+ <literal>resource</literal> in their function definitions. A
+ list of functions that return resources are available in the
+ <link linkend="resource">resource types</link> appendix.
</para>
</note>
<note>
Index: phpdoc/en/functions/uodbc.xml
diff -u phpdoc/en/functions/uodbc.xml:1.19 phpdoc/en/functions/uodbc.xml:1.20
--- phpdoc/en/functions/uodbc.xml:1.19 Thu Jun 28 11:54:29 2001
+++ phpdoc/en/functions/uodbc.xml Tue Jul 3 11:36:35 2001
@@ -506,56 +506,61 @@
array. The array will contain the column values starting at array
index 0.
</para>
- <para>
- <example>
- <title><function>odbc_fetch_into</function> pre 4.0.6 example </title>
- <programlisting role="php">
+ <para>
+ <example>
+ <title><function>odbc_fetch_into</function> pre 4.0.6 example </title>
+ <programlisting role="php">
$rc = odbc_fetch_into($res_id, $my_array);
- </programlisting>
- or
- <programlisting role="php">
+ </programlisting>
+ <para>
+ or
+ </para>
+ <programlisting role="php">
$rc = odbc_fetch_into($res_id, $row, $my_array);
-
+
$rc = odbc_fetch_into($res_id, 1, $my_array);
- </programlisting>
- </example>
- </para>
- <para>
- As of PHP 4.0.5 the <parameter>result_array</parameter> does not need
- to be passed by reference any longer.
- </para>
- <para>
- As of PHP 4.0.6 the <parameter>rownumber</parameter> cannot be passed
- as a constant, but rather as a variable.
- </para>
- <para>
- <example>
- <title><function>odbc_fetch_into</function> 4.0.6 example</title>
- <programlisting role="php">
+ </programlisting>
+ </example>
+ </para>
+ <para>
+ As of PHP 4.0.5 the <parameter>result_array</parameter> does not
+ need to be passed by reference any longer.
+ </para>
+ <para>
+ As of PHP 4.0.6 the <parameter>rownumber</parameter> cannot be
+ passed as a constant, but rather as a variable.
+ </para>
+ <para>
+ <example>
+ <title><function>odbc_fetch_into</function> 4.0.6 example</title>
+ <programlisting role="php">
$rc = odbc_fetch_into($res_id, $my_array);
- </programlisting>
- or
- <programlisting role="php">
+ </programlisting>
+ <para>
+ or
+ </para>
+ <programlisting role="php">
$row = 1;
$rc = odbc_fetch_into($res_id, $row, $my_array);
- </programlisting>
- </example>
- </para>
- <para>
- Future: In PHP 4.1, this function will be moved to the following format:
- <funcsynopsis>
- <funcprototype>
- <funcdef>int <function>odbc_fetch_into</function></funcdef>
- <paramdef>int <parameter>result_id</parameter></paramdef>
- <paramdef>array <parameter>result_array</parameter></paramdef>
- <paramdef>int <parameter><optional>rownumber</optional></parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- Please note, that <parameter>rownumber</parameter> will be optional,
- while <parameter>result_array</parameter> is not.
- </para>
- </refsect1>
- </refentry>
+ </programlisting>
+ </example>
+ </para>
+ <para>
+ Future: In PHP 4.1, this function will be moved to the following
+ format:
+ <funcsynopsis>
+ <funcprototype>
+ <funcdef>int <function>odbc_fetch_into</function></funcdef>
+ <paramdef>int <parameter>result_id</parameter></paramdef>
+ <paramdef>array <parameter>result_array</parameter></paramdef>
+ <paramdef>int <parameter><optional>rownumber</optional></parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ Please note, that <parameter>rownumber</parameter> will be optional,
+ while <parameter>result_array</parameter> is not.
+ </para>
+ </refsect1>
+ </refentry>
<refentry id="function.odbc-fetch-row">
<refnamediv>
