From 94e6bafdbe56ce64780c5f97c124dd3a6bdc2de7 Mon Sep 17 00:00:00 2001
From: Grant Croker <grantc@php.net>
Date: Mon, 26 Jan 2009 15:57:20 +0000
Subject: [PATCH] Update function parameters for 2.0 api

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@274639 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../functions/ingres-field-length.xml         | 21 +++++++++----------
 .../ingres-ii/functions/ingres-field-name.xml | 21 +++++++++----------
 .../functions/ingres-field-nullable.xml       | 21 +++++++++----------
 .../functions/ingres-field-precision.xml      | 21 +++++++++----------
 .../functions/ingres-field-scale.xml          | 21 +++++++++----------
 .../ingres-ii/functions/ingres-field-type.xml | 21 +++++++++----------
 .../ingres-ii/functions/ingres-num-fields.xml |  9 ++++----
 .../ingres-ii/functions/ingres-num-rows.xml   |  9 ++++----
 8 files changed, 68 insertions(+), 76 deletions(-)

diff --git a/reference/ingres-ii/functions/ingres-field-length.xml b/reference/ingres-ii/functions/ingres-field-length.xml
index 9c33deb7d6..b7144a8e6c 100644
--- a/reference/ingres-ii/functions/ingres-field-length.xml
+++ b/reference/ingres-ii/functions/ingres-field-length.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <refentry xml:id="function.ingres-field-length" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_length</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ingres_field_length</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ingres_field_length</function> returns the length of a
@@ -25,6 +25,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -35,15 +43,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-field-name.xml b/reference/ingres-ii/functions/ingres-field-name.xml
index 5e13dd08cc..7c35e825f1 100644
--- a/reference/ingres-ii/functions/ingres-field-name.xml
+++ b/reference/ingres-ii/functions/ingres-field-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <refentry xml:id="function.ingres-field-name" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_name</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>ingres_field_name</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ingres_field_name</function> returns the name of a field
@@ -23,6 +23,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -33,15 +41,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-field-nullable.xml b/reference/ingres-ii/functions/ingres-field-nullable.xml
index f458592bd4..0e3dbedd41 100644
--- a/reference/ingres-ii/functions/ingres-field-nullable.xml
+++ b/reference/ingres-ii/functions/ingres-field-nullable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-field-nullable" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_nullable</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>ingres_field_nullable</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    Test if a field is nullable.
@@ -22,6 +22,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -32,15 +40,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-field-precision.xml b/reference/ingres-ii/functions/ingres-field-precision.xml
index 0f47a02e18..4b4e13f511 100644
--- a/reference/ingres-ii/functions/ingres-field-precision.xml
+++ b/reference/ingres-ii/functions/ingres-field-precision.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-field-precision" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_precision</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ingres_field_precision</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ingres_field_precision</function> returns the precision
@@ -25,6 +25,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -35,15 +43,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-field-scale.xml b/reference/ingres-ii/functions/ingres-field-scale.xml
index 82943ce849..09d812c201 100644
--- a/reference/ingres-ii/functions/ingres-field-scale.xml
+++ b/reference/ingres-ii/functions/ingres-field-scale.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-field-scale" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_scale</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ingres_field_scale</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ingres_field_scale</function> returns the scale of a
@@ -25,6 +25,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -35,15 +43,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-field-type.xml b/reference/ingres-ii/functions/ingres-field-type.xml
index 0566bd51e8..0a0929c00e 100644
--- a/reference/ingres-ii/functions/ingres-field-type.xml
+++ b/reference/ingres-ii/functions/ingres-field-type.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-field-type" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_field_type</refname>
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>ingres_field_type</methodname>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
    <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
   </methodsynopsis>
   <para>
    Get the type of a field in a query result.
@@ -22,6 +22,14 @@
   &reftitle.parameters;
   <para>
    <variablelist>
+    <varlistentry>
+     <term><parameter>result</parameter></term>
+     <listitem>
+      <para>
+       The query result identifier.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>index</parameter></term>
      <listitem>
@@ -32,15 +40,6 @@
       </para>
      </listitem>
     </varlistentry>
-    <varlistentry>
-     <term><parameter>link</parameter></term>
-     <listitem>
-      <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
diff --git a/reference/ingres-ii/functions/ingres-num-fields.xml b/reference/ingres-ii/functions/ingres-num-fields.xml
index 17fd3ed892..55fdea6771 100644
--- a/reference/ingres-ii/functions/ingres-num-fields.xml
+++ b/reference/ingres-ii/functions/ingres-num-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-num-fields" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_num_fields</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ingres_num_fields</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>ingres_num_fields</function> returns the number of
@@ -24,11 +24,10 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>link</parameter></term>
+     <term><parameter>result</parameter></term>
      <listitem>
       <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
+       The query result identifier.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/ingres-ii/functions/ingres-num-rows.xml b/reference/ingres-ii/functions/ingres-num-rows.xml
index 3cc5482106..f705e467cd 100644
--- a/reference/ingres-ii/functions/ingres-num-rows.xml
+++ b/reference/ingres-ii/functions/ingres-num-rows.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <refentry xml:id="function.ingres-num-rows" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ingres_num_rows</refname>
-  <refpurpose>Get the number of rows affected or returned by the last query</refpurpose>
+  <refpurpose>Get the number of rows affected or returned by a query</refpurpose>
  </refnamediv>
  
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>ingres_num_rows</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link</parameter></methodparam>
+   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
   </methodsynopsis>
   <para>
    This function is mainly meant to get the number of rows
@@ -35,8 +35,7 @@
      <term><parameter>link</parameter></term>
      <listitem>
       <para>
-       The connection link identifier. If not specified, the last opened link
-       is used.
+       The result identifier for a query.
       </para>
      </listitem>
     </varlistentry>