diff --git a/reference/mysqli/functions/mysqli-get-client-stats.xml b/reference/mysqli/functions/mysqli-get-client-stats.xml
index b2dbcc5c2f..aa398609d2 100644
--- a/reference/mysqli/functions/mysqli-get-client-stats.xml
+++ b/reference/mysqli/functions/mysqli-get-client-stats.xml
@@ -14,8 +14,12 @@
   </methodsynopsis>
   <para>
    Returns client per-process statistics.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/get-connection-stats.xml b/reference/mysqli/mysqli/get-connection-stats.xml
index 304c0f56be..aa21ee97af 100644
--- a/reference/mysqli/mysqli/get-connection-stats.xml
+++ b/reference/mysqli/mysqli/get-connection-stats.xml
@@ -21,8 +21,12 @@
   </methodsynopsis>
   <para>
    Returns statistics about the client connection.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml
index 52071d5b3a..8e6e83737f 100644
--- a/reference/mysqli/mysqli/poll.xml
+++ b/reference/mysqli/mysqli/poll.xml
@@ -29,10 +29,14 @@
   </methodsynopsis>
   <para>
    Poll connections.
-   &mysqli.available.mysqlnd;
    The method can be used as
    <link linkend="language.oop5.static">static</link>.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli/reap-async-query.xml b/reference/mysqli/mysqli/reap-async-query.xml
index 0f61e33477..da4a0d413f 100644
--- a/reference/mysqli/mysqli/reap-async-query.xml
+++ b/reference/mysqli/mysqli/reap-async-query.xml
@@ -21,8 +21,12 @@
   </methodsynopsis>
   <para>
    Get result from async query.
-   &mysqli.available.mysqlnd;
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
diff --git a/reference/mysqli/mysqli_result/fetch-all.xml b/reference/mysqli/mysqli_result/fetch-all.xml
index f067e41402..e4439fb345 100644
--- a/reference/mysqli/mysqli_result/fetch-all.xml
+++ b/reference/mysqli/mysqli_result/fetch-all.xml
@@ -24,6 +24,11 @@
    Returns a two-dimensional array of all result rows 
    as an associative array, a numeric array, or both.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -53,14 +58,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/mysqli/mysqli_stmt/get-result.xml b/reference/mysqli/mysqli_stmt/get-result.xml
index ab099f6cae..dd27572d99 100644
--- a/reference/mysqli/mysqli_stmt/get-result.xml
+++ b/reference/mysqli/mysqli_stmt/get-result.xml
@@ -22,6 +22,11 @@
   <para>
     Call to return a result set from a prepared statement query.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -45,14 +50,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/mysqli/mysqli_stmt/more-results.xml b/reference/mysqli/mysqli_stmt/more-results.xml
index fd4a47b7f1..eac3a0e830 100644
--- a/reference/mysqli/mysqli_stmt/more-results.xml
+++ b/reference/mysqli/mysqli_stmt/more-results.xml
@@ -22,6 +22,11 @@
   <para>
    Checks if there are more query results from a multiple query.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -40,14 +45,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/mysqli/mysqli_stmt/next-result.xml b/reference/mysqli/mysqli_stmt/next-result.xml
index 812ab25ae4..08c97bf09c 100644
--- a/reference/mysqli/mysqli_stmt/next-result.xml
+++ b/reference/mysqli/mysqli_stmt/next-result.xml
@@ -22,6 +22,11 @@
   <para>
    Reads the next result from a multiple query.
   </para>
+  <note>
+   <para>
+    &mysqli.available.mysqlnd;
+   </para>
+  </note>
  </refsect1>
 
  <refsect1 role="parameters">
@@ -49,14 +54,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="mysqlnd">
-   &reftitle.mysqlnd;
-
-  <para>
-   &mysqli.available.mysqlnd;
-  </para>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>