Fix grammar and typos in mysqli documentation.

Author: kamil-tekiela

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>

reference/mysqli/book.xml

@@ -29,10 +29,10 @@
    xlink:href="&url.mysql.docs;">&url.mysql.docs;</link>.
   </para>
 
-  <para>
-   Parts of this documentation included from MySQL manual with
-   permissions of Oracle Corporation.
-  </para>
+  <simpara>
+   Parts of this documentation were included from the MySQL manual with
+   permission of Oracle Corporation.
+  </simpara>
 
   <para>
    Examples use either the <link xlink:href="&url.mysql.example;">world</link>

reference/mysqli/configure.xml

@@ -35,14 +35,15 @@
    as your choice of client library for each extension.
   </para>
 
-  <para>
-   The MySQL Native Driver is the recommended client library option, as it
+  <simpara>
+   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
    Driver?</link> for a brief overview of the advantages of MySQL Native
    Driver.
-  </para>
+  </simpara>
 
   <para>
    The <literal>/path/to/mysql_config</literal> represents the location of
@@ -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">

reference/mysqli/constants.xml

@@ -448,9 +448,9 @@
      (<type>int</type>)
     </term>
     <listitem>
-     <para>
-      Field is part of an multi-index.
-     </para>
+     <simpara>
+      Field is part of a multi-index.
+     </simpara>
     </listitem>
    </varlistentry>
    <varlistentry xml:id="constant.mysqli-group-flag">

reference/mysqli/ini.xml

@@ -147,10 +147,10 @@
     <type>int</type>
    </term>
    <listitem>
-    <para>
-     Maximum of persistent connections that can be made. Set to 
+    <simpara>
+     The maximum number of persistent connections that can be made. Set to
      0 for unlimited.
-    </para>
+    </simpara>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="ini.mysqli.max-links">
@@ -159,9 +159,9 @@
     <type>int</type>
    </term>
    <listitem>
-    <para>
-     The maximum number of MySQL connections per process.
-    </para>
+    <simpara>
+     The maximum number of connections per process.
+    </simpara>
    </listitem>
   </varlistentry>
    <varlistentry xml:id="ini.mysqli.default-port">

reference/mysqli/mysqli/change-user.xml

@@ -31,12 +31,12 @@
    In comparison to <methodname>mysqli::connect</methodname>, this method will
    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
+  <simpara>
+   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>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -172,13 +172,13 @@ Default database:
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
-   <para>
+   <simpara>
     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.
-   </para>
+   </simpara>
   </note>
  </refsect1>
 

reference/mysqli/mysqli/dump-debug-info.xml

@@ -19,11 +19,11 @@
    <type>bool</type><methodname>mysqli_dump_debug_info</methodname>
    <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam>
   </methodsynopsis>
-  <para>
-   This function is designed to be executed by an user with the SUPER
+  <simpara>
+   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>
+  </simpara>
  </refsect1>
 
  <refsect1 role="parameters">

reference/mysqli/mysqli/errno.xml

@@ -33,10 +33,10 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
-   An error code value for the last call, if it failed. zero means no error
-   occurred.
-  </para>
+  <simpara>
+   An error code value for the last call, if it failed.
+   <literal>0</literal> means no error occurred.
+  </simpara>
  </refsect1>
 
  <refsect1 role="examples">

reference/mysqli/mysqli/init.xml

@@ -25,11 +25,11 @@
    <function>mysqli_options</function> and <function>mysqli_real_connect</function>.
   </para>
   <note>
-   <para>
-    Any subsequent calls to any mysqli function (except <function>mysqli_options</function>
+   <simpara>
+    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.
-   </para>
+    will fail until <function>mysqli_real_connect</function> is called.
+   </simpara>
   </note>
  </refsect1>
 

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>