diff --git a/reference/mbstring/functions/mb-decode-numericentity.xml b/reference/mbstring/functions/mb-decode-numericentity.xml
index 405bea681f01..2ec638bc0060 100644
--- a/reference/mbstring/functions/mb-decode-numericentity.xml
+++ b/reference/mbstring/functions/mb-decode-numericentity.xml
@@ -70,7 +70,8 @@
   &reftitle.errors;
   <simpara>
    Throws a <exceptionname>ValueError</exceptionname> if
-   <parameter>map</parameter> is not a list of &integer;s.
+   <parameter>map</parameter> contains any value that is not an
+   &integer;, &float;, &boolean;, &null;, or a <link linkend="language.types.numeric-strings">numeric string</link>.
   </simpara>
  </refsect1>
 
@@ -88,9 +89,10 @@
      <row>
       <entry>8.4.0</entry>
       <entry>
-       <function>mb_decode_numericentity</function> now throws a
+       The <function>mb_decode_numericentity</function> function now throws a
        <exceptionname>ValueError</exceptionname> if <parameter>map</parameter>
-       is not a list of &integer;s.
+       contains any value that is not an
+       &integer;, &float;, &boolean;, &null;, or a <link linkend="language.types.numeric-strings">numeric string</link>.
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
@@ -104,7 +106,7 @@
   <para>
    <example>
     <title><parameter>map</parameter> example</title>
-    <programlisting>
+    <programlisting role="php">
 <![CDATA[
 <?php
 $convmap = array (
diff --git a/reference/mbstring/functions/mb-encode-numericentity.xml b/reference/mbstring/functions/mb-encode-numericentity.xml
index 9537bb0dd4b2..bced7bd21320 100644
--- a/reference/mbstring/functions/mb-encode-numericentity.xml
+++ b/reference/mbstring/functions/mb-encode-numericentity.xml
@@ -73,7 +73,8 @@
   &reftitle.errors;
   <simpara>
    Throws a <exceptionname>ValueError</exceptionname> if
-   <parameter>map</parameter> is not a list of &integer;s.
+   <parameter>map</parameter> contains any value that is not an
+   &integer;, &float;, &boolean;, &null;, or a <link linkend="language.types.numeric-strings">numeric string</link>.
   </simpara>
  </refsect1>
 
@@ -91,9 +92,10 @@
      <row>
       <entry>8.4.0</entry>
       <entry>
-       <function>mb_encode_numericentity</function> now throws a
+       The <function>mb_encode_numericentity</function> function now throws a
        <exceptionname>ValueError</exceptionname> if <parameter>map</parameter>
-       is not a list of &integer;s.
+       contains any value that is not an
+       &integer;, &float;, &boolean;, &null;, or a <link linkend="language.types.numeric-strings">numeric string</link>.
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
@@ -107,7 +109,7 @@
   <para>
    <example>
     <title><parameter>map</parameter> example</title>
-    <programlisting>
+    <programlisting role="php">
 <![CDATA[
 <?php
 $convmap = array (