diff --git a/language-snippets.ent b/language-snippets.ent
index fcf2afe88160..a45302b1f6d4 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1820,9 +1820,15 @@ that is typically created using <function>fopen</function>.</para>'>
 <!ENTITY haru.error '<para xmlns="http://docbook.org/ns/docbook">Throws a <classname>HaruException</classname> on error.</para>'>
 
 <!-- ODBC -->
-<!ENTITY odbc.connection.id '<para xmlns="http://docbook.org/ns/docbook">The ODBC connection identifier,
+<!ENTITY odbc.connection.id '<para xmlns="http://docbook.org/ns/docbook">The ODBC connection object,
 see <function>odbc_connect</function> for details.</para>'>
 
+<!ENTITY odbc.result.object 'The ODBC result object'>
+
+<!ENTITY odbc.result.object-return 'Returns an ODBC result object'>
+
+<!ENTITY odbc.result.object-return-falseforfailure '&odbc.result.object-return;&return.falseforfailure;.'>
+
 <!ENTITY odbc.parameter.catalog 'The catalog (&apos;qualifier&apos; in ODBC 2 parlance).'>
 
 <!ENTITY odbc.parameter.schema 'The schema (&apos;owner&apos; in ODBC 2 parlance).'>
@@ -1833,6 +1839,39 @@ and <literal xmlns="http://docbook.org/ns/docbook">_</literal> to match a single
 
 <!ENTITY odbc.result.driver-specific 'Drivers can report additional columns.'>
 
+<!ENTITY odbc.changelog.connection-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.4.0</entry>
+ <entry>
+  <parameter>odbc</parameter> expects an <classname>Odbc\Connection</classname>
+  instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
+<!ENTITY odbc.changelog.connection-return '&odbc.changelog.connection-param;
+ <row xmlns="http://docbook.org/ns/docbook">
+  <entry>8.4.0</entry>
+  <entry>
+   This function returns a <classname>Odbc\Connection</classname> instance now;
+   previously, a <type>resource</type> was returned.
+  </entry>
+ </row>'>
+
+<!ENTITY odbc.changelog.result-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.4.0</entry>
+ <entry>
+  <parameter>statement</parameter> expects an <classname>Odbc\Result</classname>
+  instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
+<!ENTITY odbc.changelog.result-return '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.4.0</entry>
+ <entry>
+  This function returns an <classname>Odbc\Result</classname>
+  instance now; previously, a <type>resource</type> was returned.
+ </entry>
+</row>'>
+
 <!-- OAUTH -->
 <!ENTITY oauth.callback.error 'Emits an <constant xmlns="http://docbook.org/ns/docbook">E_ERROR</constant> level
 error if the callback function cannot be called, or was not specified.'>
diff --git a/reference/uodbc/functions/odbc-autocommit.xml b/reference/uodbc/functions/odbc-autocommit.xml
index 32728ed89025..71cf41edf6df 100644
--- a/reference/uodbc/functions/odbc-autocommit.xml
+++ b/reference/uodbc/functions/odbc-autocommit.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>bool</type></type><methodname>odbc_autocommit</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>enable</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -69,6 +69,7 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
      <row>
       <entry>8.3.0</entry>
       <entry>
diff --git a/reference/uodbc/functions/odbc-binmode.xml b/reference/uodbc/functions/odbc-binmode.xml
index 6396d1fa1a5c..78e1672eb0f8 100644
--- a/reference/uodbc/functions/odbc-binmode.xml
+++ b/reference/uodbc/functions/odbc-binmode.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>true</type><methodname>odbc_binmode</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -92,11 +92,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
-      </para>
-      <para>
-       If <parameter>statement</parameter> is <literal>0</literal>, the
-       settings apply as default for new results.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -140,6 +136,23 @@
    &return.true.always;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-close.xml b/reference/uodbc/functions/odbc-close.xml
index 9f69d5b50a45..f5f25b31a987 100644
--- a/reference/uodbc/functions/odbc-close.xml
+++ b/reference/uodbc/functions/odbc-close.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>void</type><methodname>odbc_close</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
   </methodsynopsis>
   <para>
    Closes down the connection to the database server.
@@ -34,6 +34,24 @@
    &return.void;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-columnprivileges.xml b/reference/uodbc/functions/odbc-columnprivileges.xml
index 6079cb45040b..a4f233294f01 100644
--- a/reference/uodbc/functions/odbc-columnprivileges.xml
+++ b/reference/uodbc/functions/odbc-columnprivileges.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_columnprivileges</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_columnprivileges</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
@@ -70,8 +70,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier&return.falseforfailure;.
-   This result identifier can be used to fetch a list of columns and
+   &odbc.result.object-return-falseforfailure;
+   This result object can be used to fetch a list of columns and
    associated privileges.
   </para>
   <para>
@@ -94,6 +94,23 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="odbc-columnprivileges.example.basic">
diff --git a/reference/uodbc/functions/odbc-columns.xml b/reference/uodbc/functions/odbc-columns.xml
index 338646f6c592..d43930c83d64 100644
--- a/reference/uodbc/functions/odbc-columns.xml
+++ b/reference/uodbc/functions/odbc-columns.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_columns</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_columns</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table</parameter><initializer>&null;</initializer></methodparam>
@@ -70,7 +70,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -113,6 +113,7 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/uodbc/functions/odbc-commit.xml b/reference/uodbc/functions/odbc-commit.xml
index c85dfab3c97c..ede1389758e7 100644
--- a/reference/uodbc/functions/odbc-commit.xml
+++ b/reference/uodbc/functions/odbc-commit.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_commit</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
   </methodsynopsis>
   <para>
    Commits all pending transactions on the connection.
@@ -34,6 +34,23 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-connect.xml b/reference/uodbc/functions/odbc-connect.xml
index 92d5b481e542..e5df5a0d0ba9 100644
--- a/reference/uodbc/functions/odbc-connect.xml
+++ b/reference/uodbc/functions/odbc-connect.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_connect</methodname>
+   <type class="union"><type>Odbc\Connection</type><type>false</type></type><methodname>odbc_connect</methodname>
    <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
    <methodparam><type>string</type><parameter>user</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
@@ -103,6 +103,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-cursor.xml b/reference/uodbc/functions/odbc-cursor.xml
index 35951bdea510..4174501e0f2c 100644
--- a/reference/uodbc/functions/odbc-cursor.xml
+++ b/reference/uodbc/functions/odbc-cursor.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>odbc_cursor</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the cursorname for the given result_id.
@@ -23,7 +23,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -36,6 +36,23 @@
    Returns the cursor name, as a string, &return.falseforfailure;.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-data-source.xml b/reference/uodbc/functions/odbc-data-source.xml
index 0e7950846712..00f8be07d321 100644
--- a/reference/uodbc/functions/odbc-data-source.xml
+++ b/reference/uodbc/functions/odbc-data-source.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>odbc_data_source</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type>int</type><parameter>fetch_type</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -49,6 +49,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="odbc-data-source.example.basic">
diff --git a/reference/uodbc/functions/odbc-error.xml b/reference/uodbc/functions/odbc-error.xml
index 59d3d6275192..c1be6463fb05 100644
--- a/reference/uodbc/functions/odbc-error.xml
+++ b/reference/uodbc/functions/odbc-error.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>odbc_error</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>odbc</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>Odbc\Connection</type><type>null</type></type><parameter>odbc</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <simpara>
    Returns a six-digit ODBC state, or an empty string if there has been no
@@ -53,10 +53,11 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
-       <parameter>odbc</parameter> is nullable now.
+       <parameter>odbc</parameter> is now nullable.
       </entry>
      </row>
     </tbody>
diff --git a/reference/uodbc/functions/odbc-errormsg.xml b/reference/uodbc/functions/odbc-errormsg.xml
index 2f4475d5eba4..66378b2477a0 100644
--- a/reference/uodbc/functions/odbc-errormsg.xml
+++ b/reference/uodbc/functions/odbc-errormsg.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>odbc_errormsg</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>odbc</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>Odbc\Connection</type><type>null</type></type><parameter>odbc</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <simpara>
    Returns a string containing the last ODBC error message, or an empty
@@ -53,10 +53,11 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
-       <parameter>odbc</parameter> is nullable now.
+       <parameter>odbc</parameter> is now nullable.
       </entry>
      </row>
     </tbody>
diff --git a/reference/uodbc/functions/odbc-exec.xml b/reference/uodbc/functions/odbc-exec.xml
index e702a9b07bb0..1c06ca67442c 100644
--- a/reference/uodbc/functions/odbc-exec.xml
+++ b/reference/uodbc/functions/odbc-exec.xml
@@ -8,8 +8,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_exec</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_exec</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type>string</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -40,7 +40,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier if the SQL command was executed
+   &odbc.result.object-return; if the SQL command was executed
    successfully, or &false; on error.
   </para>
  </refsect1>
@@ -55,6 +55,8 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/uodbc/functions/odbc-execute.xml b/reference/uodbc/functions/odbc-execute.xml
index 727508e1b531..be35c1fe0a73 100644
--- a/reference/uodbc/functions/odbc-execute.xml
+++ b/reference/uodbc/functions/odbc-execute.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_execute</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>params</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result id <type>resource</type>, from <function>odbc_prepare</function>.
+       &odbc.result.object; from <function>odbc_prepare</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -66,6 +66,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-return;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       The unused <parameter>flags</parameter> parameter was removed.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-fetch-array.xml b/reference/uodbc/functions/odbc-fetch-array.xml
index 1bc3962f672e..400cc371b3a5 100644
--- a/reference/uodbc/functions/odbc-fetch-array.xml
+++ b/reference/uodbc/functions/odbc-fetch-array.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>array</type><type>false</type></type><methodname>odbc_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter><initializer>-1</initializer></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>row</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Fetch an associative <type>array</type> from an ODBC query.
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result resource from <function>odbc_exec</function>.
+       &odbc.result.object; from <function>odbc_exec</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -50,6 +50,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       <parameter>row</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-fetch-into.xml b/reference/uodbc/functions/odbc-fetch-into.xml
index 92840d21e47e..3642c9c89335 100644
--- a/reference/uodbc/functions/odbc-fetch-into.xml
+++ b/reference/uodbc/functions/odbc-fetch-into.xml
@@ -10,9 +10,9 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>false</type></type><methodname>odbc_fetch_into</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>row</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Fetch one result row into <type>array</type>.
@@ -27,7 +27,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result <type>resource</type>.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -62,6 +62,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       <parameter>row</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-fetch-object.xml b/reference/uodbc/functions/odbc-fetch-object.xml
index 8cca2605cf88..318446855c96 100644
--- a/reference/uodbc/functions/odbc-fetch-object.xml
+++ b/reference/uodbc/functions/odbc-fetch-object.xml
@@ -10,8 +10,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>stdClass</type><type>false</type></type><methodname>odbc_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter><initializer>-1</initializer></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>row</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    Fetch an <type>object</type> from an ODBC query.
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result resource from <function>odbc_exec</function>.
+       &odbc.result.object; from <function>odbc_exec</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -50,6 +50,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       <parameter>row</parameter> is now nullable.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-fetch-row.xml b/reference/uodbc/functions/odbc-fetch-row.xml
index ac0aa6a50ac0..b28c57023036 100644
--- a/reference/uodbc/functions/odbc-fetch-row.xml
+++ b/reference/uodbc/functions/odbc-fetch-row.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>row</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -27,7 +27,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -72,10 +72,11 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.result-param;
      <row>
       <entry>8.0.0</entry>
       <entry>
-       <parameter>row</parameter> is nullable now.
+       <parameter>row</parameter> is now nullable.
       </entry>
      </row>
     </tbody>
diff --git a/reference/uodbc/functions/odbc-field-len.xml b/reference/uodbc/functions/odbc-field-len.xml
index 759a51fb5a9e..26e00f989c69 100644
--- a/reference/uodbc/functions/odbc-field-len.xml
+++ b/reference/uodbc/functions/odbc-field-len.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>false</type></type><methodname>odbc_field_len</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -46,6 +46,24 @@
    Returns the field length, or &false; on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/uodbc/functions/odbc-field-name.xml b/reference/uodbc/functions/odbc-field-name.xml
index a34c465e32ba..b55dea09d308 100644
--- a/reference/uodbc/functions/odbc-field-name.xml
+++ b/reference/uodbc/functions/odbc-field-name.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>odbc_field_name</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the name of the field occupying the given column number in the given
-   result identifier.
+   result object.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -46,6 +46,23 @@
    Returns the field name as a string, or &false; on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-field-num.xml b/reference/uodbc/functions/odbc-field-num.xml
index 246d4f1ec25f..f34fb21078b7 100644
--- a/reference/uodbc/functions/odbc-field-num.xml
+++ b/reference/uodbc/functions/odbc-field-num.xml
@@ -9,12 +9,12 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>false</type></type><methodname>odbc_field_num</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>string</type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the number of the column slot that corresponds to the named field in
-   the given result identifier.
+   the given result object.
   </para>
  </refsect1>
  <refsect1 role="parameters">
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -47,6 +47,23 @@
    Field numbering starts at 1.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-field-scale.xml b/reference/uodbc/functions/odbc-field-scale.xml
index d8d1aefe72e0..2228413ea774 100644
--- a/reference/uodbc/functions/odbc-field-scale.xml
+++ b/reference/uodbc/functions/odbc-field-scale.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>int</type><type>false</type></type><methodname>odbc_field_scale</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -46,6 +46,23 @@
    Returns the field scale as a integer, or &false; on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-field-type.xml b/reference/uodbc/functions/odbc-field-type.xml
index 23a5f575e16e..b6985c5db554 100644
--- a/reference/uodbc/functions/odbc-field-type.xml
+++ b/reference/uodbc/functions/odbc-field-type.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>false</type></type><methodname>odbc_field_type</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -46,6 +46,23 @@
    Returns the field type as a string, or &false; on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-foreignkeys.xml b/reference/uodbc/functions/odbc-foreignkeys.xml
index 4c7360eab8bd..792789f71f34 100644
--- a/reference/uodbc/functions/odbc-foreignkeys.xml
+++ b/reference/uodbc/functions/odbc-foreignkeys.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_foreignkeys</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_foreignkeys</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>pk_catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>pk_schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>pk_table</parameter></methodparam>
@@ -90,7 +90,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -142,6 +142,24 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/uodbc/functions/odbc-free-result.xml b/reference/uodbc/functions/odbc-free-result.xml
index 00acc215e237..ff323b9213bb 100644
--- a/reference/uodbc/functions/odbc-free-result.xml
+++ b/reference/uodbc/functions/odbc-free-result.xml
@@ -3,16 +3,16 @@
 <refentry xml:id="function.odbc-free-result" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>odbc_free_result</refname>
-  <refpurpose>Free resources associated with a result</refpurpose>
+  <refpurpose>Free objects associated with a result</refpurpose>
  </refnamediv>
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>true</type><methodname>odbc_free_result</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Free resources associated with a result.
+   Free objects associated with a result.
   </para>
   <para>
    <function>odbc_free_result</function> only needs to be called if you are
@@ -28,7 +28,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -41,6 +41,24 @@
    &return.true.always;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-gettypeinfo.xml b/reference/uodbc/functions/odbc-gettypeinfo.xml
index ffa4df569ba6..5571eb1382a2 100644
--- a/reference/uodbc/functions/odbc-gettypeinfo.xml
+++ b/reference/uodbc/functions/odbc-gettypeinfo.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_gettypeinfo</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_gettypeinfo</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>data_type</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -44,8 +44,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier or
-   &false; on failure.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -72,6 +71,24 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-longreadlen.xml b/reference/uodbc/functions/odbc-longreadlen.xml
index 7fdf8ef1090d..b85776719ed8 100644
--- a/reference/uodbc/functions/odbc-longreadlen.xml
+++ b/reference/uodbc/functions/odbc-longreadlen.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>true</type><methodname>odbc_longreadlen</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type>int</type><parameter>length</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -49,6 +49,24 @@
    &return.true.always;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-next-result.xml b/reference/uodbc/functions/odbc-next-result.xml
index 35d8331e960f..dfee00c71ba1 100644
--- a/reference/uodbc/functions/odbc-next-result.xml
+++ b/reference/uodbc/functions/odbc-next-result.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_next_result</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
    Checks if there are more result sets available as well as allowing access
@@ -25,7 +25,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -38,6 +38,24 @@
    Returns &true; if there are more result sets, &false; otherwise.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-num-fields.xml b/reference/uodbc/functions/odbc-num-fields.xml
index 421992bc4060..d1ba06367944 100644
--- a/reference/uodbc/functions/odbc-num-fields.xml
+++ b/reference/uodbc/functions/odbc-num-fields.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>odbc_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the number of fields (columns) in an ODBC result.
@@ -23,7 +23,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier returned by <function>odbc_exec</function>.
+       &odbc.result.object; returned by <function>odbc_exec</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -36,6 +36,23 @@
    Returns the number of fields, or -1 on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-num-rows.xml b/reference/uodbc/functions/odbc-num-rows.xml
index 38f9004ab104..4cb84481ea2c 100644
--- a/reference/uodbc/functions/odbc-num-rows.xml
+++ b/reference/uodbc/functions/odbc-num-rows.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>odbc_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the number of rows in a result. For INSERT, UPDATE and DELETE
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier returned by <function>odbc_exec</function>.
+       &odbc.result.object; returned by <function>odbc_exec</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -40,6 +40,24 @@
    This function will return -1 on error.
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.result-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-pconnect.xml b/reference/uodbc/functions/odbc-pconnect.xml
index 183cf824643d..f51794d255cb 100644
--- a/reference/uodbc/functions/odbc-pconnect.xml
+++ b/reference/uodbc/functions/odbc-pconnect.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_pconnect</methodname>
+   <type class="union"><type>Odbc\Connection</type><type>false</type></type><methodname>odbc_pconnect</methodname>
    <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
    <methodparam><type>string</type><parameter>user</parameter></methodparam>
    <methodparam><type>string</type><parameter>password</parameter></methodparam>
@@ -41,10 +41,26 @@
   &reftitle.returnvalues;
   <para>
    Returns an ODBC connection, &return.falseforfailure;.
-   error.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/uodbc/functions/odbc-prepare.xml b/reference/uodbc/functions/odbc-prepare.xml
index 9bae7f7f6dcc..5ae3a3edb36c 100644
--- a/reference/uodbc/functions/odbc-prepare.xml
+++ b/reference/uodbc/functions/odbc-prepare.xml
@@ -9,12 +9,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_prepare</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_prepare</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type>string</type><parameter>query</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Prepares a statement for execution. The result identifier can be used
+   Prepares a statement for execution. &odbc.result.object; can be used
    later to execute the statement with <function>odbc_execute</function>.
   </para>
   <para>
@@ -50,11 +50,29 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier if the SQL command was prepared
+   &odbc.result.object-return; if the SQL command was prepared
    successfully. Returns &false; on error.
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-primarykeys.xml b/reference/uodbc/functions/odbc-primarykeys.xml
index 87029c856816..e1c8d96177f9 100644
--- a/reference/uodbc/functions/odbc-primarykeys.xml
+++ b/reference/uodbc/functions/odbc-primarykeys.xml
@@ -8,14 +8,14 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_primarykeys</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_primarykeys</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns a result identifier that can be used to fetch the column names
+   Returns a result object that can be used to fetch the column names
    that comprise the primary key for a table.
   </para>
  </refsect1>
@@ -58,7 +58,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -78,6 +78,24 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="odbc-primarykeys.example.basic">
diff --git a/reference/uodbc/functions/odbc-procedurecolumns.xml b/reference/uodbc/functions/odbc-procedurecolumns.xml
index e739ed08d341..6be8fc20e2b9 100644
--- a/reference/uodbc/functions/odbc-procedurecolumns.xml
+++ b/reference/uodbc/functions/odbc-procedurecolumns.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_procedurecolumns</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_procedurecolumns</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>procedure</parameter><initializer>&null;</initializer></methodparam>
@@ -75,7 +75,7 @@
   <para>
    Returns the list of input and output parameters, as well as the
    columns that make up the result set for the specified procedures. 
-   Returns an ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -119,6 +119,8 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/uodbc/functions/odbc-procedures.xml b/reference/uodbc/functions/odbc-procedures.xml
index 59cbfa58aaed..ef4e9e204f7d 100644
--- a/reference/uodbc/functions/odbc-procedures.xml
+++ b/reference/uodbc/functions/odbc-procedures.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_procedures</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_procedures</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>procedure</parameter><initializer>&null;</initializer></methodparam>
@@ -63,8 +63,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC
-   result identifier containing the information&return.falseforfailure;.
+   &odbc.result.object-return; containing the information&return.falseforfailure;.
   </para>
   <para>
    The result set has the following columns:
@@ -97,6 +96,8 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/uodbc/functions/odbc-result-all.xml b/reference/uodbc/functions/odbc-result-all.xml
index c8eb04e77a88..95c0470d6ee1 100644
--- a/reference/uodbc/functions/odbc-result-all.xml
+++ b/reference/uodbc/functions/odbc-result-all.xml
@@ -15,11 +15,11 @@
   <methodsynopsis>
    <modifier role="attribute">#[\Deprecated]</modifier>
    <type class="union"><type>int</type><type>false</type></type><methodname>odbc_result_all</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>format</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Prints all rows from a result identifier produced by
+   Prints all rows from a result object produced by
    <function>odbc_exec</function>. The result is printed in HTML table format.
    The data is <emphasis>not</emphasis> escaped.
   </para>
@@ -36,7 +36,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The result identifier.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -70,6 +70,7 @@
       </row>
      </thead>
      <tbody>
+      &odbc.changelog.result-param;
       <row>
        <entry>8.1.0</entry>
        <entry>
diff --git a/reference/uodbc/functions/odbc-result.xml b/reference/uodbc/functions/odbc-result.xml
index 7539404981fa..170a5cfd6d27 100644
--- a/reference/uodbc/functions/odbc-result.xml
+++ b/reference/uodbc/functions/odbc-result.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>bool</type><type>null</type></type><methodname>odbc_result</methodname>
-   <methodparam><type>resource</type><parameter>statement</parameter></methodparam>
+   <methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>field</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -26,7 +26,7 @@
      <term><parameter>statement</parameter></term>
      <listitem>
       <para>
-       The ODBC <type>resource</type>.
+       &odbc.result.object;.
       </para>
      </listitem>
     </varlistentry>
@@ -52,6 +52,25 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      &odbc.changelog.result-param;
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-rollback.xml b/reference/uodbc/functions/odbc-rollback.xml
index d24437bb5246..08db70dc440b 100644
--- a/reference/uodbc/functions/odbc-rollback.xml
+++ b/reference/uodbc/functions/odbc-rollback.xml
@@ -9,7 +9,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_rollback</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
   </methodsynopsis>
   <para>
    Rolls back all pending statements on the connection.
@@ -34,6 +34,23 @@
    &return.success;
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/uodbc/functions/odbc-setoption.xml b/reference/uodbc/functions/odbc-setoption.xml
index f40e1afe494f..d43da1343831 100644
--- a/reference/uodbc/functions/odbc-setoption.xml
+++ b/reference/uodbc/functions/odbc-setoption.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>odbc_setoption</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <methodparam><type class="union"><type>Odbc\Connection</type><type>Odbc\Result</type></type><parameter>odbc</parameter></methodparam>
    <methodparam><type>int</type><parameter>which</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
    <methodparam><type>int</type><parameter>value</parameter></methodparam>
@@ -88,6 +88,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       <parameter>odbc</parameter> expects an <classname>Odbc\Connection</classname>
+       or an <classname>Odbc\Result</classname> instance now; previously, a
+       <type>resource</type> was expected.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/uodbc/functions/odbc-specialcolumns.xml b/reference/uodbc/functions/odbc-specialcolumns.xml
index 2b73ccdf61ad..5c8147599f62 100644
--- a/reference/uodbc/functions/odbc-specialcolumns.xml
+++ b/reference/uodbc/functions/odbc-specialcolumns.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_specialcolumns</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_specialcolumns</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type>int</type><parameter>type</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>schema</parameter></methodparam>
@@ -101,8 +101,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier or &false; on
-   failure.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -123,6 +122,24 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/uodbc/functions/odbc-statistics.xml b/reference/uodbc/functions/odbc-statistics.xml
index dd1ea84ae4c4..87638c7ac669 100644
--- a/reference/uodbc/functions/odbc-statistics.xml
+++ b/reference/uodbc/functions/odbc-statistics.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_statistics</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_statistics</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
@@ -82,7 +82,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -109,6 +109,24 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="odbc-statistics.example.basic">
diff --git a/reference/uodbc/functions/odbc-tableprivileges.xml b/reference/uodbc/functions/odbc-tableprivileges.xml
index 70aa54cfe7f7..f6c2e77654c5 100644
--- a/reference/uodbc/functions/odbc-tableprivileges.xml
+++ b/reference/uodbc/functions/odbc-tableprivileges.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_tableprivileges</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_tableprivileges</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
    <methodparam><type>string</type><parameter>schema</parameter></methodparam>
    <methodparam><type>string</type><parameter>table</parameter></methodparam>
@@ -64,7 +64,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An ODBC result identifier&return.falseforfailure;.
+   &odbc.result.object-return-falseforfailure;
   </para>
   <para>
    The result set has the following columns:
@@ -85,6 +85,24 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example xml:id="odbc-tableprivileges.example.basic">
diff --git a/reference/uodbc/functions/odbc-tables.xml b/reference/uodbc/functions/odbc-tables.xml
index ea8d66af1c58..19eb4794bfc9 100644
--- a/reference/uodbc/functions/odbc-tables.xml
+++ b/reference/uodbc/functions/odbc-tables.xml
@@ -9,8 +9,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>odbc_tables</methodname>
-   <methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
+   <type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_tables</methodname>
+   <methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table</parameter><initializer>&null;</initializer></methodparam>
@@ -117,7 +117,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an ODBC result identifier containing the information 
+   &odbc.result.object-return; containing the information
    &return.falseforfailure;.
   </para>
   <para>
@@ -148,6 +148,8 @@
      </row>
     </thead>
     <tbody>
+     &odbc.changelog.connection-param;
+     &odbc.changelog.result-return;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/uodbc/setup.xml b/reference/uodbc/setup.xml
index 9e49ec1f24bb..8412ffd389ae 100644
--- a/reference/uodbc/setup.xml
+++ b/reference/uodbc/setup.xml
@@ -26,7 +26,7 @@
  <section xml:id="uodbc.resources">
   &reftitle.resources;
   <para>
-   This extension defines two resource types: an ODBC connection identifier
+   Prior to PHP 8.4.0, this extension defined two resource types: an ODBC connection identifier
    and an ODBC result identifier.
   </para>
  </section>