Fix grammar and typos in mysqli documentation.

kamil-tekiela · kamil-tekiela · commit 1fc24c0357e5 · 2026-07-25T20:54:19.000+01:00
diff --git a/appendices/migration83/other-changes.xml b/appendices/migration83/other-changes.xml
@@ -266,7 +266,7 @@
     <function>mysqli_fetch_object</function> now raises a
     <classname>ValueError</classname> instead of an <classname>Exception</classname>
     when the <parameter>constructor_args</parameter> argument is non empty with
-    the class not having constructor.
+    the class not having a constructor.
    </simpara>
 
    <simpara>
@@ -300,7 +300,7 @@
     <function>pg_fetch_object</function> now raises a
     <classname>ValueError</classname> instead of an <classname>Exception</classname>
     when the <parameter>constructor_args</parameter> argument is non empty with
-    the class not having constructor.
+    the class not having a constructor.
    </simpara>
 
    <para>
diff --git a/reference/mysqli/book.xml b/reference/mysqli/book.xml
@@ -30,8 +30,8 @@
   </para>
 
   <para>
-   Parts of this documentation included from MySQL manual with
-   permissions of Oracle Corporation.
+   Parts of this documentation were included from the MySQL manual with
+   permission of Oracle Corporation.
   </para>
   
   <para>
diff --git a/reference/mysqli/configure.xml b/reference/mysqli/configure.xml
@@ -36,7 +36,8 @@
   </para>
 
   <para>
-   The MySQL Native Driver is the recommended client library option, as it
+   The MySQL Native Driver is the recommended client library option,
+   and as of PHP 8.2.0 the only option, as it
    results in improved performance and gives access to features not
    available when using the MySQL Client Library. Refer to
    <link linkend="mysqli.overview.mysqlnd">What is PHP's MySQL Native
@@ -64,7 +65,14 @@
     </thead>
     <tbody>
      <row>
-      <entry>5.4.x and above</entry>
+      <entry>8.2.0 and later</entry>
+      <entry>mysqlnd</entry>
+      <entry><option role="configure">--with-mysqli</option></entry>
+      <entry>libmysqlclient is not supported</entry>
+      <entry>mysqlnd is the only option</entry>
+     </row>
+     <row>
+      <entry>5.4.0 through 8.1.x</entry>
       <entry>mysqlnd</entry>
       <entry><option role="configure">--with-mysqli</option></entry>
       <entry><option role="configure">--with-mysqli=/path/to/mysql_config</option></entry>
@@ -88,15 +96,6 @@
    </tgroup>
   </table>
 
-  <para>
-   Note that it is possible to freely mix MySQL extensions and client
-   libraries. For example, it is possible to enable the MySQL extension
-   to use the MySQL Client Library (libmysqlclient), while configuring the
-   <literal>mysqli</literal> extension to use the MySQL Native Driver.
-   However, all permutations of extension and client library are
-   possible.
-  </para>
-
  </section>
 
  <section xml:id="mysqli.installation.windows">
diff --git a/reference/mysqli/constants.xml b/reference/mysqli/constants.xml
@@ -449,7 +449,7 @@
     </term>
     <listitem>
      <para>
-      Field is part of an multi-index.
+      Field is part of a multi-index.
      </para>
     </listitem>
    </varlistentry>
diff --git a/reference/mysqli/ini.xml b/reference/mysqli/ini.xml
@@ -148,7 +148,7 @@
    </term>
    <listitem>
     <para>
-     Maximum of persistent connections that can be made. Set to 
+     The maximum number of persistent connections that can be made. Set to 
      0 for unlimited.
     </para>
    </listitem>
@@ -160,7 +160,7 @@
    </term>
    <listitem>
     <para>
-     The maximum number of MySQL connections per process.
+     The maximum number of connections per process.
     </para>
    </listitem>
   </varlistentry>
diff --git a/reference/mysqli/mysqli/change-user.xml b/reference/mysqli/mysqli/change-user.xml
@@ -32,8 +32,8 @@
    not disconnect the current connection if the new connection cannot be opened.
   </para>
   <para>
-   In order to successfully change users a valid <parameter>username</parameter> and
-   <parameter>password</parameter> parameters must be provided and that user must have
+   In order to successfully change users, a valid <parameter>username</parameter> and
+   <parameter>password</parameter> must be provided, and that user must have
    sufficient permissions to access the desired database. If for any reason authorization
    fails, the current user authentication will remain.
   </para>
@@ -174,7 +174,7 @@ Default database:
   <note>
    <para>
     Using this command will always cause the current database connection to
-    behave as if was a completely new database connection, regardless of if
+    behave as if it was a completely new database connection, regardless of if
     the operation was completed successfully. This reset includes performing
     a rollback on any active transactions, closing all temporary tables, and
     unlocking all locked tables.
diff --git a/reference/mysqli/mysqli/dump-debug-info.xml b/reference/mysqli/mysqli/dump-debug-info.xml
@@ -20,7 +20,7 @@
    <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
   </methodsynopsis>
   <para>
-   This function is designed to be executed by an user with the SUPER
+   This function is designed to be executed by a user with the SUPER
    privilege and is used to dump debugging information into the log for the
    MySQL Server relating to the connection.
   </para>
diff --git a/reference/mysqli/mysqli/errno.xml b/reference/mysqli/mysqli/errno.xml
@@ -34,8 +34,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   An error code value for the last call, if it failed. zero means no error
-   occurred.
+   An error code value for the last call, if it failed.
+   <literal>0</literal> means no error occurred.
   </para>
  </refsect1>
  
diff --git a/reference/mysqli/mysqli/init.xml b/reference/mysqli/mysqli/init.xml
@@ -26,9 +26,9 @@
   </para>
   <note>
    <para>
-    Any subsequent calls to any mysqli function (except <function>mysqli_options</function>
+    Any subsequent call to any mysqli function (except <function>mysqli_options</function>
     and <function>mysqli_ssl_set</function>)
-    will fail until <function>mysqli_real_connect</function> was called.
+    will fail until <function>mysqli_real_connect</function> is called.
    </para>
   </note>
  </refsect1>
diff --git a/reference/mysqli/mysqli/multi-query.xml b/reference/mysqli/mysqli/multi-query.xml
@@ -28,7 +28,7 @@
    Queries are sent in a single call to the database and processed sequentially.
    <methodname>mysqli_multi_query</methodname> waits for the first query to
    complete before returning control to PHP. In the meantime, the MySQL server
-   will continue processing the remaining queries asynchronously of PHP and make
+   will continue processing the remaining queries asynchronously from PHP and make
    the results available for fetching.
   </para>
   <para>
diff --git a/reference/mysqli/mysqli/options.xml b/reference/mysqli/mysqli/options.xml
@@ -75,7 +75,7 @@
           </row>
           <row>
            <entry><constant>MYSQLI_INIT_COMMAND</constant></entry>
-           <entry>Command to execute after when connecting to MySQL server</entry>
+           <entry>Command to execute after establishing a connection to the MySQL server</entry>
           </row>
           <row>
            <entry><constant>MYSQLI_SET_CHARSET_NAME</constant></entry>
diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml
@@ -80,8 +80,8 @@
       <entry>
        Both <methodname>mysqli::ping</methodname> and
        <function>mysqli_ping</function> are now deprecated.
-       The <literal>reconnect</literal> feature has not been available
-       as of PHP 8.2.0, making this function obsolete.
+       As of PHP 8.2.0, the <literal>reconnect</literal> feature is no longer
+       available, making this function obsolete.
       </entry>
      </row>
     </tbody>
diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml
@@ -64,8 +64,8 @@
      <term><parameter>reject</parameter></term>
      <listitem>
       <para>
-      List of connections rejected because no asynchronous query
-      has been run on for which the function could poll results.
+      List of connections rejected because no pending asynchronous query exists
+      to poll.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/mysqli/mysqli/rollback.xml b/reference/mysqli/mysqli/rollback.xml
@@ -23,7 +23,7 @@
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Rollbacks the current transaction for the database.
+   Rolls back the current transaction for the database.
   </para>
  </refsect1>
 
diff --git a/reference/mysqli/mysqli/select-db.xml b/reference/mysqli/mysqli/select-db.xml
@@ -27,7 +27,7 @@
   <note>
    <para>
     This function should only be used to change the default database for the
-    connection. You can select the default database with 4th parameter in 
+    connection. You can select the default database with the 4th parameter in 
     <function>mysqli_connect</function>.
    </para>
   </note>
diff --git a/reference/mysqli/mysqli/sqlstate.xml b/reference/mysqli/mysqli/sqlstate.xml
@@ -24,7 +24,7 @@
   </para>
   <note>
    <para>
-    Note that not all MySQL errors are yet mapped to SQLSTATE's.
+    Note that not all MySQL errors are yet mapped to SQLSTATEs.
     The value <literal>HY000</literal> (general error) is used for unmapped errors.
    </para>
   </note>
diff --git a/reference/mysqli/mysqli/stmt-init.xml b/reference/mysqli/mysqli/stmt-init.xml
@@ -25,8 +25,8 @@
   </para>
   <note>
    <para>
-    Any subsequent calls to any mysqli_stmt function
-    will fail until <function>mysqli_stmt_prepare</function> was called.
+    Any subsequent call to any <classname>mysqli_stmt</classname> method
+    will fail until <function>mysqli_stmt_prepare</function> is called.
    </para>
   </note>
  </refsect1>
@@ -43,7 +43,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an object.
+   Returns a <classname>mysqli_stmt</classname> object.
   </para>
  </refsect1>
 
diff --git a/reference/mysqli/mysqli/use-result.xml b/reference/mysqli/mysqli/use-result.xml
@@ -33,7 +33,7 @@
   <note>
    <para>
     The <function>mysqli_use_result</function> function does not transfer
-    the entire result set from the database and hence cannot be used functions
+    the entire result set from the database and hence cannot be used with functions
     such as <function>mysqli_data_seek</function> to move to a particular
     row within the set. To use this functionality, the result set must be
     stored using <function>mysqli_store_result</function>. One should not
diff --git a/reference/mysqli/mysqli_driver.xml b/reference/mysqli/mysqli_driver.xml
@@ -11,7 +11,7 @@
    &reftitle.intro;
    <para>
     The <classname>mysqli_driver</classname> class is an instance of the monostate
-    pattern, i.e. there is only one driver which can be accessed though an arbitrary
+    pattern, i.e. there is only one driver which can be accessed through an arbitrary
     amount of <classname>mysqli_driver</classname> instances.
    </para>
   </section>
diff --git a/reference/mysqli/mysqli_result/fetch-fields.xml b/reference/mysqli/mysqli_result/fetch-fields.xml
@@ -89,7 +89,7 @@
       <entry>length</entry>
       <entry>
        The width of the field in bytes. For string columns,
-       the length value varies on the connection character set. For example,
+       the length value depends on the connection character set. For example,
        if the character set is <literal>latin1</literal>, a single-byte character set,
        the length value for a <literal>SELECT 'abc'</literal> query is 3.
        If the character set is <literal>utf8mb4</literal>, a multibyte character
diff --git a/reference/mysqli/mysqli_result/fetch-object.xml b/reference/mysqli/mysqli_result/fetch-object.xml
@@ -86,7 +86,7 @@
   &reftitle.errors;
   <para>
    A <classname>ValueError</classname> is thrown when
-   the <parameter>constructor_args</parameter> is non-empty with the class not having constructor.
+   the <parameter>constructor_args</parameter> is non-empty with the class not having a constructor.
   </para>
  </refsect1>
 
@@ -105,7 +105,7 @@
       <entry>8.3.0</entry>
       <entry>
        Now throws a <classname>ValueError</classname> exception when
-       the <parameter>constructor_args</parameter> is non-empty with the class not having constructor;
+       the <parameter>constructor_args</parameter> is non-empty with the class not having a constructor;
        previously an <classname>Exception</classname> was thrown.
       </entry>
      </row>
diff --git a/reference/mysqli/mysqli_result/num-rows.xml b/reference/mysqli/mysqli_result/num-rows.xml
@@ -97,7 +97,7 @@ Result set has 239 rows.
   <note>
    <para>
     In contrast to the <function>mysqli_stmt_num_rows</function> function,
-    this function doesn't have object-oriented method variant.
+    this function doesn't have an object-oriented method variant.
     In the object-oriented style, use the getter property.
    </para>
   </note>
diff --git a/reference/mysqli/mysqli_sql_exception/getsqlstate.xml b/reference/mysqli/mysqli_sql_exception/getsqlstate.xml
@@ -20,7 +20,7 @@
   </para>
   <note>
    <para>
-    Note that not all MySQL errors are yet mapped to SQLSTATE's.
+    Note that not all MySQL errors are yet mapped to SQLSTATEs.
     The value <literal>HY000</literal> (general error) is used for unmapped errors.
    </para>
   </note>
diff --git a/reference/mysqli/mysqli_stmt/affected-rows.xml b/reference/mysqli/mysqli_stmt/affected-rows.xml
@@ -19,7 +19,7 @@
    <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Returns the number of rows affected by <literal>INSERT</literal>,
+   Returns the number of rows affected by the <literal>INSERT</literal>,
    <literal>UPDATE</literal>, or <literal>DELETE</literal> query. 
    Works like <function>mysqli_stmt_num_rows</function> for
    <literal>SELECT</literal> statements.
@@ -49,7 +49,7 @@
   </para>
   <note>
    <para>
-    If the number of affected rows is greater than maximum PHP int value, the
+    If the number of affected rows is greater than the maximum PHP int value, the
     number of affected rows will be returned as a string value.
    </para>
   </note>
diff --git a/reference/mysqli/mysqli_stmt/bind-result.xml b/reference/mysqli/mysqli_stmt/bind-result.xml
@@ -50,7 +50,7 @@
   </note>
   <tip>
    <para>
-    This function is useful for simple results. To retrieve iterable result
+    This function is useful for simple results. To retrieve an iterable result
     set, or fetch each row as an array or object,
     use <function>mysqli_stmt_get_result</function>.
    </para>
diff --git a/reference/mysqli/mysqli_stmt/execute.xml b/reference/mysqli/mysqli_stmt/execute.xml
@@ -21,7 +21,7 @@
    <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>params</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   Executes previously prepared statement. The statement must be successfully 
+   Executes a previously prepared statement. The statement must be successfully 
    prepared prior to execution, using either
    the <function>mysqli_prepare</function> or
    <function>mysqli_stmt_prepare</function> function, or by passing the second
diff --git a/reference/mysqli/mysqli_stmt/reset.xml b/reference/mysqli/mysqli_stmt/reset.xml
@@ -20,7 +20,7 @@
    <methodparam><type>mysqli_stmt</type><parameter>statement</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Resets a prepared statement on client and server to state after prepare.
+   Resets a prepared statement on client and server to the state after prepare.
   </para>
   <para>
     It resets the statement on the server, data sent using <function>mysqli_stmt_send_long_data</function>, 
diff --git a/reference/mysqli/mysqli_stmt/send-long-data.xml b/reference/mysqli/mysqli_stmt/send-long-data.xml
@@ -23,7 +23,7 @@
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
   </methodsynopsis>
   <para>
-   Allows to send parameter data to the server in pieces (or chunks), e.g. if the
+   Allows sending parameter data to the server in pieces (or chunks), e.g. if the
    size of a blob exceeds the size of <literal>max_allowed_packet</literal>.
    This function can be called multiple times to send the parts of a character or
    binary data value for a column, which must be one of the TEXT or BLOB datatypes.
diff --git a/reference/mysqli/mysqli_stmt/sqlstate.xml b/reference/mysqli/mysqli_stmt/sqlstate.xml
@@ -134,7 +134,7 @@ Error: 42S02.
   &reftitle.notes;
   <note>
    <para>
-    Note that not all MySQL errors are yet mapped to SQLSTATE's.
+    Note that not all MySQL errors are yet mapped to SQLSTATEs.
     The value <literal>HY000</literal> (general error) is used for unmapped errors.
    </para>
   </note>
diff --git a/reference/mysqli/overview.xml b/reference/mysqli/overview.xml
@@ -82,7 +82,7 @@
 
   <para>
     Sometimes people use the terms connector and driver interchangeably,
-    this can be confusing. In the MySQL-related documentation the term 
+    which can be confusing. In the MySQL-related documentation the term 
     <quote>driver</quote> is reserved for software that provides
     the database-specific part of a connector package.
   </para>
@@ -308,7 +308,7 @@
   </para>
 
   <para>
-    Both, the <literal>mysqli</literal> extension and the PDO MySQL driver can
+    Both the <literal>mysqli</literal> extension and the PDO MySQL driver can
     each be individually configured to use either
     <literal>libmysqlclient</literal> or <literal>mysqlnd</literal>. As
     <literal>mysqlnd</literal> is designed specifically to be utilised
diff --git a/reference/mysqli/quickstart.xml b/reference/mysqli/quickstart.xml
diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml
diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml
diff --git a/reference/pgsql/functions/pg-fetch-object.xml b/reference/pgsql/functions/pg-fetch-object.xml
diff --git a/reference/tidy/tidy/parsefile.xml b/reference/tidy/tidy/parsefile.xml
diff --git a/reference/tidy/tidy/parsestring.xml b/reference/tidy/tidy/parsestring.xml
