diff --git a/language-defs.ent b/language-defs.ent
index 930f98117..108292f44 100644
--- a/language-defs.ent
+++ b/language-defs.ent
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 5097918a78b2d1de0839a48bd30912d498ac5850 Maintainer: yincheng Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: a6621a4baf56fd78a842dfd684f5c981991bddcd Maintainer: yincheng Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <!-- Part titles used mostly in manual.xml itself -->
 <!ENTITY PHPManual           "PHP 手册">
 <!ENTITY Seealso             "参见">
@@ -45,7 +45,7 @@
 <!ENTITY UIExtensions                             "图形用户界面(GUI) 扩展">
 <!ENTITY Appendices                         "附录">
 <!ENTITY PEAR                               "PEAR：PHP 扩展与应用资源库">
-<!ENTITY FAQ                                "FAQ：常见问题">
+<!ENTITY FAQ                                "常见问题">
 <!ENTITY FAQabbrev                          "FAQ">
 <!ENTITY Internals                          "PHP 和 Zend 引擎内部资料">
 <!ENTITY Internals2                         "PHP 核心：骇客指南">
diff --git a/language-snippets.ent b/language-snippets.ent
index c7b7d082a..4cf523d70 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: ffd2ef754b37526c0b96e94859d57ce06acfbf41 Maintainer: Gregory Status: ready -->
+<!-- EN-Revision: cb573d7f33644962dcf32003e5898cf4d67be6ac Maintainer: Gregory Status: ready -->
 <!-- CREDITS: dallas, mowangjuanzi, Luffy -->
 <!-- 请保持此文件与英文文件中相应的每个 ENTITY 行号一一对应以便于对照，修改与更新！ -->
 
@@ -233,6 +233,9 @@ PHP 版本中发生变化而不另行通知。使用本扩展应自行承担风
 
 
 
+<!ENTITY deprecated.function '此函数已废弃。'>
+<!ENTITY removed.function '此函数已移除。'>
+
 <!ENTITY warn.deprecated.feature-5-3-0 '<warning xmlns="http://docbook.org/ns/docbook"><simpara>自 PHP 5.3.0
 起，已经<emphasis>废弃</emphasis>此特性。强烈建议不要应用此特性。</simpara></warning>'>
 
@@ -1456,11 +1459,11 @@ linkend="memcached.expiration" xmlns="http://docbook.org/ns/docbook">到期时
 
 <!-- RNP -->
 
-<!ENTITY rnp.parameter.ffi-description 'The FFI object returned by rnp_ffi_create.'>
+<!ENTITY rnp.parameter.ffi-description 'The FFI object returned by <function xmlns="http://docbook.org/ns/docbook">rnp_ffi_create</function>.'>
 
 <!ENTITY rnp.parameter.key-format 'The key format of the data (GPG, KBX, G10).'>
 
-<!ENTITY rnp.parameter.loadsave-flags 'See RNP_LOAD_SAVE_* flags description.'>
+<!ENTITY rnp.parameter.loadsave-flags 'See <constant xmlns="http://docbook.org/ns/docbook">RNP_LOAD_SAVE_<replaceable>*</replaceable></constant> flags description.'>
 
 <!-- socket entities -->
 
@@ -1743,6 +1746,28 @@ It is strongly recommended to avoid timezone abbreviations.
   of the <link linkend="libxml.constants">libxml option constants</link>.
 </para>'>
 
+<!ENTITY dom.parameter.compliant.options '&dom.parameter.options;
+ <simpara xmlns="http://docbook.org/ns/docbook">
+  It is also possible to pass <constant>Dom\HTML_NO_DEFAULT_NS</constant>
+  to disable the use of the HTML namespace and the template element.
+  This should only be used if the implications are properly understood.
+</simpara>'>
+
+<!ENTITY dom.parameter.compliant.encoding '<simpara xmlns="http://docbook.org/ns/docbook">
+ The encoding that the document was created in.
+ If not provided, it will attempt to determine the encoding that is most likely used.
+</simpara>'>
+
+<!ENTITY dom.parser.compliant.note.whitespace '<refsect1 role="notes" xmlns="http://docbook.org/ns/docbook">
+ &reftitle.notes;
+ <note>
+  <simpara>
+   Whitespace in the <literal>html</literal> and <literal>head</literal> tags
+   is not considered significant and may lose formatting.
+  </simpara>
+ </note>
+</refsect1>'>
+
 <!ENTITY dom.parameters.register_node_ns '<varlistentry xmlns="http://docbook.org/ns/docbook">
  <term><parameter>registerNodeNS</parameter></term>
  <listitem>
@@ -1754,6 +1779,14 @@ It is strongly recommended to avoid timezone abbreviations.
  </listitem>
 </varlistentry>'>
 
+<!ENTITY dom.parameters.serialize.options '<simpara xmlns="http://docbook.org/ns/docbook">
+ Additional Options.
+ The <constant>LIBXML_NOEMPTYTAG</constant>
+ and <constant>LIBXML_NOXMLDECL</constant> options are supported.
+ Prior to PHP 8.3.0, only the <constant>LIBXML_NOEMPTYTAG</constant>
+ option is supported.
+</simpara>'>
+
 <!ENTITY dom.errors.hierarchy.parent '<varlistentry xmlns="http://docbook.org/ns/docbook">
  <term><constant>DOM_HIERARCHY_REQUEST_ERR</constant></term>
   <listitem>
@@ -1786,6 +1819,27 @@ It is strongly recommended to avoid timezone abbreviations.
  </listitem>
 </varlistentry>'>
 
+<!ENTITY dom.errors.compliant.wrong_document '<listitem xmlns="http://docbook.org/ns/docbook">
+ <simpara>
+  Throws a <exceptionname>Dom\DOMException</exceptionname> with code
+  <constant>Dom\WRONG_DOCUMENT_ERR</constant> if <parameter>node</parameter>
+  is from another document.
+ </simpara>
+</listitem>'>
+
+<!ENTITY dom.errors.compliant.common '<listitem xmlns="http://docbook.org/ns/docbook">
+ <simpara>
+  Throws a <exceptionname>ValueError</exceptionname> if
+  <parameter>options</parameter> contains an invalid option.
+ </simpara>
+</listitem>
+<listitem>
+ <simpara>
+  Throws a <exceptionname>ValueError</exceptionname> if
+  <parameter>overrideEncoding</parameter> is an unknown encoding.
+ </simpara>
+</listitem>'>
+
 <!ENTITY dom.changelog.previous_hierarchy_exception 'Previously this threw a
  <classname xmlns="http://docbook.org/ns/docbook">DOMException</classname> with code
  <constant xmlns="http://docbook.org/ns/docbook">DOM_HIERARCHY_REQUEST_ERR</constant>.'>
@@ -1883,6 +1937,33 @@ It is strongly recommended to avoid timezone abbreviations.
   </entry>
  </row>'>
 
+<!ENTITY odbc.changelog.credential-params '<row xmlns="http://docbook.org/ns/docbook">
+  <entry>8.4.0</entry>
+  <entry>
+   <parameter>user</parameter> and <parameter>password</parameter> are now nullable,
+   they are now also optional and default to &null;.
+  </entry>
+ </row>
+ <row xmlns="http://docbook.org/ns/docbook">
+  <entry>8.4.0</entry>
+  <entry>
+   Previously, using an empty string for <parameter>password</parameter> would not include
+   <literal>pwd</literal> in the generated connection string for <parameter>dsn</parameter>.
+   It is now generated to include a <literal>pwd</literal> which has an empty string as its value.
+   To restore the previous behaviour <parameter>password</parameter> can now be set to &null;.
+  </entry>
+ </row>
+ <row xmlns="http://docbook.org/ns/docbook">
+  <entry>8.4.0</entry>
+  <entry>
+   Previously, if <parameter>dsn</parameter> contained <literal>uid</literal> or <literal>pwd</literal>
+   both <parameter>user</parameter> and <parameter>password</parameter> parameters were ignored.
+   Now <parameter>user</parameter> is only ignored if <parameter>dsn</parameter> contains
+   <literal>uid</literal>, and <parameter>password</parameter>  is only ignored if
+   <parameter>dsn</parameter> contains <literal>pwd</literal>.
+  </entry>
+ </row>'>
+
 <!ENTITY odbc.changelog.result-param '<row xmlns="http://docbook.org/ns/docbook">
  <entry>8.4.0</entry>
  <entry>
@@ -2214,19 +2295,6 @@ while <constant>PGSQL_BOTH</constant> will return both numerical and associative
 
 <!ENTITY sqlsafemode '<link xmlns="http://docbook.org/ns/docbook" linkend="ini.sql.safe-mode">SQL 安全模式</link>'>
 
-<!-- BCMath Notes -->
-<!ENTITY bc.scale.description '<varlistentry xmlns="http://docbook.org/ns/docbook">
- <term><parameter>scale</parameter></term>
- <listitem>
-  <simpara>
-   此参数用于设置结果中的小数位数。如果为 &null;，则使用 <function>bcscale</function>
-   设置的默认小数位数，或者回退到 <link linkend="ini.bcmath.scale"><literal>bcmath.scale</literal></link>
-   INI 指令的值。
-  </simpara>
- </listitem>
-</varlistentry>'>
-
-
 <!-- CTYPE Notes -->
 <!ENTITY note.ctype.parameter.integer '<note xmlns="http://docbook.org/ns/docbook"><para>
 如果给出一个 -128 到 255 之间(含)的<type>int</type>, 将会被解释为该值对应的ASCII字符 (负值将加上 256 以支持扩展ASCII字符).
@@ -3170,6 +3238,11 @@ local: {
        <entry>string</entry>
        <entry>Optional. Host with optional port.</entry>
       </row>
+      <row>
+       <entry>delegated</entry>
+       <entry>bool</entry>
+       <entry>Optional. If true, this key should be decrypted by the KMIP server.</entry>
+      </row>
      </tbody>
     </tgroup>
    </table>
diff --git a/reference/bc/functions/bcadd.xml b/reference/bc/functions/bcadd.xml
index b23599763..d857a7f25 100644
--- a/reference/bc/functions/bcadd.xml
+++ b/reference/bc/functions/bcadd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c7e83fbbbcde9f54affc09424d032c38492a3ff4 Maintainer: jakquan Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 3295741565f760edd22e305bd10e37f243e9e194 Maintainer: jakquan Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.bcadd" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>bcadd</refname>
@@ -41,7 +41,16 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <varlistentry xml:id="function.bcadd..parameters.scale">
+     <term><parameter>scale</parameter></term>
+     <listitem>
+      <simpara>
+       此参数用于设置结果小数点后的位数。
+       如果为 &null;，则默认为使用 <function>bcscale</function> 设置的默认精度，
+       或者回退到 <link linkend="ini.bcmath.scale"><literal>bcmath.scale</literal></link> INI 指令的值。
+      </simpara>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
@@ -89,7 +98,7 @@
    </tgroup>
   </informaltable>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -109,7 +118,7 @@ echo bcadd($a, $b, 4);  // 6.2340
    </programlisting>
   </example>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/bc/functions/bcdiv.xml b/reference/bc/functions/bcdiv.xml
index 6581a6edf..caae5e660 100644
--- a/reference/bc/functions/bcdiv.xml
+++ b/reference/bc/functions/bcdiv.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c7e83fbbbcde9f54affc09424d032c38492a3ff4 Maintainer: jakquan Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 3295741565f760edd22e305bd10e37f243e9e194 Maintainer: jakquan Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.bcdiv" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcdiv</refname>
@@ -41,7 +41,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
@@ -88,7 +88,7 @@
    </tgroup>
   </informaltable>
  </refsect1>
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -104,7 +104,7 @@ echo bcdiv('105', '6.55957', 3);  // 16.007
    </programlisting>
   </example>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/bc/functions/bcpow.xml b/reference/bc/functions/bcpow.xml
index 12cfbe1d5..312e01ca2 100644
--- a/reference/bc/functions/bcpow.xml
+++ b/reference/bc/functions/bcpow.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c7e83fbbbcde9f54affc09424d032c38492a3ff4 Maintainer: jakquan Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
-<refentry xml:id="function.bcpow" xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 3295741565f760edd22e305bd10e37f243e9e194 Maintainer: jakquan Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
+<refentry xml:id="function.bcpow" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcpow</refname>
   <refpurpose>任意精度数字的乘方</refpurpose>
@@ -42,7 +42,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>
@@ -84,7 +84,7 @@
      <row>
       <entry>8.4.0</entry>
       <entry>
-       <literal>0</literal> 的负幂以前返回 0，但现在会引发 <exceptionname>DivisionByZeroError</exceptionname> 异常。
+       <literal>0</literal> 的负幂以前返回 <literal>0</literal>，但现在会引发 <exceptionname>DivisionByZeroError</exceptionname> 异常。
       </entry>
      </row>
      <row>
@@ -104,7 +104,7 @@
    </tgroup>
   </informaltable>
  </refsect1><!-- }}} -->
- 
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -140,7 +140,7 @@ echo bcpow('5', '2', 2);     // 打印 "25" 而不是 "25.00"
    </para>
   </note>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/bc/functions/bcsqrt.xml b/reference/bc/functions/bcsqrt.xml
index 2c9b12b13..7680b4d26 100644
--- a/reference/bc/functions/bcsqrt.xml
+++ b/reference/bc/functions/bcsqrt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c7e83fbbbcde9f54affc09424d032c38492a3ff4 Maintainer: jakquan Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
-<refentry xml:id="function.bcsqrt" xmlns="http://docbook.org/ns/docbook">
+<!-- EN-Revision: 3295741565f760edd22e305bd10e37f243e9e194 Maintainer: jakquan Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
+<refentry xml:id="function.bcsqrt" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
  <refnamediv>
   <refname>bcsqrt</refname>
   <refpurpose>任意精度数字的二次方根</refpurpose>
@@ -32,7 +32,7 @@
       </para>
      </listitem>
     </varlistentry>
-    &bc.scale.description;
+    <xi:include xpointer="function.bcadd..parameters.scale" />
    </variablelist>
   </para>
  </refsect1>