From 8c80a76d822b02eac5578d2f5df5f4d46331308d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A6=E7=94=B0=20=E6=86=B2=E5=A4=AA=E9=83=8E?=
 <takeda@youmind.jp>
Date: Wed, 28 Oct 2026 23:23:11 +0900
Subject: [PATCH] =?UTF-8?q?mbstring=20=E3=82=92=E5=8E=9F=E6=96=87=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E8=BF=BD=E5=BE=93=20(28=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mbstring/functions/mb-check-encoding.xml  |  8 ++++++-
 reference/mbstring/functions/mb-chr.xml       |  8 ++++++-
 .../mbstring/functions/mb-convert-case.xml    |  8 ++++++-
 .../mbstring/functions/mb-convert-kana.xml    |  4 +++-
 .../functions/mb-convert-variables.xml        | 17 +++++++------
 .../functions/mb-decode-numericentity.xml     |  4 +++-
 .../functions/mb-encode-numericentity.xml     |  4 +++-
 .../mbstring/functions/mb-http-output.xml     |  4 +++-
 reference/mbstring/functions/mb-ord.xml       |  8 ++++++-
 .../functions/mb-preferred-mime-name.xml      | 24 ++++++++++++++++++-
 .../mbstring/functions/mb-regex-encoding.xml  |  8 ++++++-
 reference/mbstring/functions/mb-scrub.xml     |  8 ++++++-
 reference/mbstring/functions/mb-str-split.xml |  8 ++++++-
 reference/mbstring/functions/mb-strcut.xml    |  8 ++++++-
 .../mbstring/functions/mb-strimwidth.xml      |  8 ++++++-
 reference/mbstring/functions/mb-stripos.xml   |  4 +++-
 reference/mbstring/functions/mb-stristr.xml   |  7 +++++-
 reference/mbstring/functions/mb-strpos.xml    |  4 +++-
 reference/mbstring/functions/mb-strrchr.xml   |  8 ++++++-
 reference/mbstring/functions/mb-strrichr.xml  |  7 +++++-
 reference/mbstring/functions/mb-strripos.xml  |  4 +++-
 reference/mbstring/functions/mb-strrpos.xml   |  6 +++--
 reference/mbstring/functions/mb-strstr.xml    |  7 +++++-
 .../mbstring/functions/mb-strtolower.xml      |  8 ++++++-
 .../mbstring/functions/mb-strtoupper.xml      | 24 ++++++++++++++++++-
 reference/mbstring/functions/mb-strwidth.xml  |  8 ++++++-
 .../mbstring/functions/mb-substr-count.xml    |  8 ++++++-
 reference/mbstring/functions/mb-substr.xml    |  8 ++++++-
 28 files changed, 197 insertions(+), 35 deletions(-)

diff --git a/reference/mbstring/functions/mb-check-encoding.xml b/reference/mbstring/functions/mb-check-encoding.xml
index 05ca6505077..5957c9fd310 100644
--- a/reference/mbstring/functions/mb-check-encoding.xml
+++ b/reference/mbstring/functions/mb-check-encoding.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d2ff0abe1650703e8974acaa7674c678e587a696 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.mb-check-encoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -62,6 +62,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -86,6 +91,7 @@
        <parameter>value</parameter> と <parameter>encoding</parameter> は、nullable になりました。
       </entry>
      </row>
+     &mbstring.changelog.encoding-invalid;
      <row>
       <entry>7.2.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-chr.xml b/reference/mbstring/functions/mb-chr.xml
index 180a6eed6ef..88d43cb910c 100644
--- a/reference/mbstring/functions/mb-chr.xml
+++ b/reference/mbstring/functions/mb-chr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 30c25e7d490278bb31b9d5df6107a3b300d7e10a Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: mumumu Status: ready -->
 
 <refentry xml:id="function.mb-chr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -56,6 +56,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -68,6 +73,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-convert-case.xml b/reference/mbstring/functions/mb-convert-case.xml
index 27826816d91..f33ca2ada5a 100644
--- a/reference/mbstring/functions/mb-convert-case.xml
+++ b/reference/mbstring/functions/mb-convert-case.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d6f54016d62904cfd8200604aadd5e3f0d9bad97 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.mb-convert-case" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -70,6 +70,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -92,6 +97,7 @@
         <constant>MB_CASE_TITLE_SIMPLE</constant> には適用されません。
        </entry>
       </row>
+      &mbstring.changelog.encoding-invalid;
       <row>
        <entry>7.3.0</entry>
        <entry>
diff --git a/reference/mbstring/functions/mb-convert-kana.xml b/reference/mbstring/functions/mb-convert-kana.xml
index 9290965f766..438094e8cf4 100644
--- a/reference/mbstring/functions/mb-convert-kana.xml
+++ b/reference/mbstring/functions/mb-convert-kana.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 34f90a65914c900173f9a42331acc45bc53d8eee Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.mb-convert-kana" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -174,6 +174,7 @@
    異なる <parameter>mode</parameter> の組み合わせが無効な場合 (例: <literal>"sS"</literal>) は、
    <classname>ValueError</classname> がスローされます。
   </para>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -195,6 +196,7 @@
        </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-convert-variables.xml b/reference/mbstring/functions/mb-convert-variables.xml
index 94f96db2a50..1d00b9c6665 100644
--- a/reference/mbstring/functions/mb-convert-variables.xml
+++ b/reference/mbstring/functions/mb-convert-variables.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 92f1b8b177eb5730382abf9f27bae868f1bb636f Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 2bc5ed7ad57629c4fbd299f352c38e57099cfedd Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-convert-variables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -46,12 +46,15 @@
     <varlistentry>
      <term><parameter>from_encoding</parameter></term>
      <listitem>
-      <para>
-       <parameter>from_encoding</parameter> には配列またはカンマ区切りの文字列を指定し、
-       <parameter>from-coding</parameter> からエンコーディングの検出を試みます。
-       <parameter>from_encoding</parameter>
-       が省略された場合、<literal>detect_order</literal> を使用します。
-      </para>
+      <simpara>
+       変数の現在のエンコーディング。
+       配列またはカンマ区切りの文字列とすることで、
+       複数のエンコーディングを指定できます。
+       この場合、指定したエンコーディングの中から検出します。
+       <literal>"auto"</literal> は、INI 設定
+       <link linkend="ini.mbstring.language">mbstring.language</link>
+       に従って展開されます。
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry>
diff --git a/reference/mbstring/functions/mb-decode-numericentity.xml b/reference/mbstring/functions/mb-decode-numericentity.xml
index 922fda9f971..c218a074a67 100644
--- a/reference/mbstring/functions/mb-decode-numericentity.xml
+++ b/reference/mbstring/functions/mb-decode-numericentity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 0bb8d1a0dda028c1086f07dbae25d320850d7a90 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,mumumu -->
 <refentry xml:id="function.mb-decode-numericentity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -69,6 +69,7 @@
    のいずれでもない値が含まれている場合、
    <exceptionname>ValueError</exceptionname> がスローされます。
   </simpara>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -91,6 +92,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-encode-numericentity.xml b/reference/mbstring/functions/mb-encode-numericentity.xml
index 086a3a549b8..ab58daf5664 100644
--- a/reference/mbstring/functions/mb-encode-numericentity.xml
+++ b/reference/mbstring/functions/mb-encode-numericentity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 0bb8d1a0dda028c1086f07dbae25d320850d7a90 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,mumumu -->
 <refentry xml:id="function.mb-encode-numericentity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -77,6 +77,7 @@
    のいずれでもない値が含まれている場合、
    <exceptionname>ValueError</exceptionname> がスローされます。
   </simpara>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -99,6 +100,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-http-output.xml b/reference/mbstring/functions/mb-http-output.xml
index 087179bbcef..93c72986ad6 100644
--- a/reference/mbstring/functions/mb-http-output.xml
+++ b/reference/mbstring/functions/mb-http-output.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: d553fa36940639b0889ec4358fa3bbb92f123b69 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-http-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -61,6 +61,7 @@
    <parameter>encoding</parameter> にヌルバイトが含まれている場合、
    <exceptionname>ValueError</exceptionname> がスローされます。
   </simpara>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -83,6 +84,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-ord.xml b/reference/mbstring/functions/mb-ord.xml
index 1a00869048c..bd6b4a03ba7 100644
--- a/reference/mbstring/functions/mb-ord.xml
+++ b/reference/mbstring/functions/mb-ord.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 62126c55f1c6ed444043e7272c4f9e233818a44b Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: mumumu Status: ready -->
 
 <refentry xml:id="function.mb-ord" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -52,6 +52,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -64,6 +69,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-preferred-mime-name.xml b/reference/mbstring/functions/mb-preferred-mime-name.xml
index 5908703fef9..af6abe4cae9 100644
--- a/reference/mbstring/functions/mb-preferred-mime-name.xml
+++ b/reference/mbstring/functions/mb-preferred-mime-name.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 92f1b8b177eb5730382abf9f27bae868f1bb636f Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-preferred-mime-name" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -45,6 +45,28 @@
   </para>
  </refsect1> 
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &mbstring.changelog.encoding-invalid;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mbstring/functions/mb-regex-encoding.xml b/reference/mbstring/functions/mb-regex-encoding.xml
index 86f107ffad0..1d59c923818 100644
--- a/reference/mbstring/functions/mb-regex-encoding.xml
+++ b/reference/mbstring/functions/mb-regex-encoding.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8cdc6621f9826d04abc3e50438c010804d7e8683 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-regex-encoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -44,6 +44,11 @@
   </simpara>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -57,6 +62,7 @@
      </thead>
      <tbody>
       &mbstring.changelog.encoding-nullable;
+      &mbstring.changelog.encoding-invalid;
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mbstring/functions/mb-scrub.xml b/reference/mbstring/functions/mb-scrub.xml
index 7fae73378b1..9ac826f6045 100644
--- a/reference/mbstring/functions/mb-scrub.xml
+++ b/reference/mbstring/functions/mb-scrub.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: eb10503592351cf78c25be21c60a9049784d57bb Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: mumumu Status: ready -->
 
 <refentry xml:id="function.mb-scrub" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -56,6 +56,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -68,6 +73,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-str-split.xml b/reference/mbstring/functions/mb-str-split.xml
index 3df7d7be54b..d660430da05 100644
--- a/reference/mbstring/functions/mb-str-split.xml
+++ b/reference/mbstring/functions/mb-str-split.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: bb66ce4d449049730d4967ce74fb68f15a138612 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: mumumu Status: ready -->
 
 <refentry xml:id="function.mb-str-split" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -68,6 +68,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -80,6 +85,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
      <row>
       <entry>8.0.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-strcut.xml b/reference/mbstring/functions/mb-strcut.xml
index 496338f63f2..c0adb1e904c 100644
--- a/reference/mbstring/functions/mb-strcut.xml
+++ b/reference/mbstring/functions/mb-strcut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 911fe79de766ef4475bf22446903667a0f3a24d3 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.mb-strcut" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -97,6 +97,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -115,6 +120,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strimwidth.xml b/reference/mbstring/functions/mb-strimwidth.xml
index ef72a177a3f..ac7e4f48b9f 100644
--- a/reference/mbstring/functions/mb-strimwidth.xml
+++ b/reference/mbstring/functions/mb-strimwidth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ca4b9d11a25fc9f8dde7561c504ed466ed1d6c63 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.mb-strimwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>mb_strimwidth</refname>
@@ -90,6 +90,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -109,6 +114,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
      <row>
       <entry>7.1.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-stripos.xml b/reference/mbstring/functions/mb-stripos.xml
index 9462882bd1e..c16f193bf84 100644
--- a/reference/mbstring/functions/mb-stripos.xml
+++ b/reference/mbstring/functions/mb-stripos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c62ef37e0d58067b393a6cf3a14aefed90bc0bff Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-stripos" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_stripos</refname>
@@ -86,6 +86,7 @@
     </simpara>
    </listitem>
   </itemizedlist>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -101,6 +102,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
      <row>
       <entry>7.1.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-stristr.xml b/reference/mbstring/functions/mb-stristr.xml
index 57ca2c466ac..927aea32863 100644
--- a/reference/mbstring/functions/mb-stristr.xml
+++ b/reference/mbstring/functions/mb-stristr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c62ef37e0d58067b393a6cf3a14aefed90bc0bff Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-stristr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_stristr</refname>
@@ -78,6 +78,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
 
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -92,6 +96,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strpos.xml b/reference/mbstring/functions/mb-strpos.xml
index 87db093fdbf..88be343adc6 100644
--- a/reference/mbstring/functions/mb-strpos.xml
+++ b/reference/mbstring/functions/mb-strpos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 97f8edc4efed4d8ab86c56f200a36aefb37fdf24 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.mb-strpos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -93,6 +93,7 @@
     </simpara>
    </listitem>
   </itemizedlist>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -108,6 +109,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
      <row>
       <entry>7.1.0</entry>
       <entry>
diff --git a/reference/mbstring/functions/mb-strrchr.xml b/reference/mbstring/functions/mb-strrchr.xml
index 1083c8a2796..00f12f950f8 100644
--- a/reference/mbstring/functions/mb-strrchr.xml
+++ b/reference/mbstring/functions/mb-strrchr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8c262f2df6f585b42b917611a029859c60539e5d Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-strrchr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strrchr</refname>
@@ -73,6 +73,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -86,6 +91,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strrichr.xml b/reference/mbstring/functions/mb-strrichr.xml
index 08db571bb0d..24c04abec75 100644
--- a/reference/mbstring/functions/mb-strrichr.xml
+++ b/reference/mbstring/functions/mb-strrichr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c62ef37e0d58067b393a6cf3a14aefed90bc0bff Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-strrichr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strrichr</refname>
@@ -78,6 +78,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
 
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -92,6 +96,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strripos.xml b/reference/mbstring/functions/mb-strripos.xml
index ae2d46be432..c5838bffee4 100644
--- a/reference/mbstring/functions/mb-strripos.xml
+++ b/reference/mbstring/functions/mb-strripos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c62ef37e0d58067b393a6cf3a14aefed90bc0bff Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-strripos" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strripos</refname>
@@ -89,6 +89,7 @@
     </simpara>
    </listitem>
   </itemizedlist>
+  &mbstring.errors.encoding-invalid;
  </refsect1>
 
  <refsect1 role="changelog">
@@ -104,6 +105,7 @@
     <tbody>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strrpos.xml b/reference/mbstring/functions/mb-strrpos.xml
index 2d39ffeed7e..cd589e253c9 100644
--- a/reference/mbstring/functions/mb-strrpos.xml
+++ b/reference/mbstring/functions/mb-strrpos.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 95d05546430b9e5db225dd42a0d285b870f0da42 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,mumumu -->
 <refentry xml:id="function.mb-strrpos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -89,7 +89,8 @@
    </simpara>
   </listitem>
  </itemizedlist>
-</refsect1>
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
 
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -111,6 +112,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strstr.xml b/reference/mbstring/functions/mb-strstr.xml
index 1eb1b894023..26764af9961 100644
--- a/reference/mbstring/functions/mb-strstr.xml
+++ b/reference/mbstring/functions/mb-strstr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 5c52e84d0ce157d8c22f9c582719a14228c5402a Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.mb-strstr" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>mb_strstr</refname>
@@ -73,6 +73,10 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
 
  <refsect1 role="changelog">
   &reftitle.changelog;
@@ -97,6 +101,7 @@
      </row>
      &mbstring.changelog.needle-empty;
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-strtolower.xml b/reference/mbstring/functions/mb-strtolower.xml
index bc1d46e59c1..a838e983dc4 100644
--- a/reference/mbstring/functions/mb-strtolower.xml
+++ b/reference/mbstring/functions/mb-strtolower.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 6c550e6d0c8139a0086095ef1db0ac6e08716e1f Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-strtolower" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -49,6 +49,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -67,6 +72,7 @@
         ギリシャ文字のシグマ向けに、条件付きのケースルールが実装されました。
        </entry>
       </row>
+      &mbstring.changelog.encoding-invalid;
      </tbody>
     </tgroup>
    </informaltable>
diff --git a/reference/mbstring/functions/mb-strtoupper.xml b/reference/mbstring/functions/mb-strtoupper.xml
index 0f4afb7e142..3c51f1bd2c7 100644
--- a/reference/mbstring/functions/mb-strtoupper.xml
+++ b/reference/mbstring/functions/mb-strtoupper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: b4afab59db15ea4b7c5dc2132d85932b4859bcf2 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-strtoupper" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -49,6 +49,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &mbstring.changelog.encoding-invalid;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/mbstring/functions/mb-strwidth.xml b/reference/mbstring/functions/mb-strwidth.xml
index 3ab64f9cbb1..51588e7bc8d 100644
--- a/reference/mbstring/functions/mb-strwidth.xml
+++ b/reference/mbstring/functions/mb-strwidth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 64f2f1c70d2f42507d9c624e09dcf486ceca7be5 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-strwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -97,6 +97,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -109,6 +114,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-substr-count.xml b/reference/mbstring/functions/mb-substr-count.xml
index 97619ad9e94..ab3ffd86cf5 100644
--- a/reference/mbstring/functions/mb-substr-count.xml
+++ b/reference/mbstring/functions/mb-substr-count.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 92f1b8b177eb5730382abf9f27bae868f1bb636f Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi -->
 <refentry xml:id="function.mb-substr-count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -62,6 +62,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -74,6 +79,7 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/mbstring/functions/mb-substr.xml b/reference/mbstring/functions/mb-substr.xml
index 6dd20e2b556..0864b0fbadf 100644
--- a/reference/mbstring/functions/mb-substr.xml
+++ b/reference/mbstring/functions/mb-substr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 5c52e84d0ce157d8c22f9c582719a14228c5402a Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 60bb5c739561b4f09e7274bce6f8504520519980 Maintainer: hirokawa Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.mb-substr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -82,6 +82,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors">
+  &reftitle.errors;
+  &mbstring.errors.encoding-invalid;
+ </refsect1>
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -108,6 +113,7 @@
       </entry>
      </row>
      &mbstring.changelog.encoding-nullable;
+     &mbstring.changelog.encoding-invalid;
     </tbody>
    </tgroup>
   </informaltable>